diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index e1ad903..912944c 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -55,6 +55,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.dir/audio"/>
             </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
 
         <!-- Settings package stubs -->
@@ -70,6 +79,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter android:priority="-1">
+                <action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter android:priority="-1">
                 <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/car-bugreportd/main.cpp b/car-bugreportd/main.cpp
index ebb2d5f..581bb03 100644
--- a/car-bugreportd/main.cpp
+++ b/car-bugreportd/main.cpp
@@ -61,9 +61,10 @@
 constexpr const int kMaxDumpstateConnectAttempts = 20;
 // Wait time between connect attempts
 constexpr const int kWaitTimeBetweenConnectAttemptsInSec = 1;
-// Wait time for dumpstate. No timeout in dumpstate is longer than 60 seconds. Choose
-// a value that is twice longer.
-constexpr const int kDumpstateTimeoutInSec = 120;
+// Wait time for dumpstate. Set a timeout so that if nothing is read in 10 minutes, we'll stop
+// reading and quit. No timeout in dumpstate is longer than 60 seconds, so this gives lots of leeway
+// in case of unforeseen time outs.
+constexpr const int kDumpstateTimeoutInSec = 600;
 // The prefix for screenshot filename in the generated zip file.
 constexpr const char* kScreenshotPrefix = "/screenshot";
 
@@ -197,6 +198,7 @@
 bool copyFile(const std::string& zip_path, int output_socket) {
     android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(zip_path.c_str(), O_RDONLY)));
     if (fd == -1) {
+        ALOGE("Failed to open zip file %s.", zip_path.c_str());
         return false;
     }
     while (1) {
@@ -206,6 +208,7 @@
             break;
         }
         if (bytes_copied == -1) {
+            ALOGE("Failed to copy zip file %s to the output_socket.", zip_path.c_str());
             return false;
         }
     }
@@ -239,13 +242,14 @@
 
     std::string line;
     std::string last_nonempty_line;
+    char buffer[65536];
     while (true) {
-        char buffer[65536];
         ssize_t bytes_read = copyTo(s, progress_socket, buffer, sizeof(buffer));
         if (bytes_read == 0) {
             break;
         }
         if (bytes_read == -1) {
+            ALOGE("Failed to copy progress to the progress_socket.");
             return false;
         }
         // Process the buffer line by line. this is needed for the filename.
@@ -468,12 +472,12 @@
     bool ret_val = doBugreport(progress_socket, &bytes_written, &zip_path);
     close(progress_socket);
 
-    int output_socket = openSocket(kCarBrOutputSocket);
-    if (output_socket != -1 && ret_val) {
-        ret_val = copyFile(zip_path, output_socket);
-    }
-    if (output_socket != -1) {
-        close(output_socket);
+    if (ret_val) {
+        int output_socket = openSocket(kCarBrOutputSocket);
+        if (output_socket != -1) {
+            ret_val = copyFile(zip_path, output_socket);
+            close(output_socket);
+        }
     }
 
     int extra_output_socket = openSocket(kCarBrExtraOutputSocket);
diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 8c5c4e3..b8d4639 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -56,6 +56,12 @@
     srcs: ["src/android/car/navigation/navigation_state.proto"]
 }
 
+// library to access settings from CarSettings
+java_library {
+    name: "android.car.settings",
+    srcs: ["src/android/car/settings/CarSettings.java"]
+}
+
 java_library {
     name: "android.car",
     srcs: [
@@ -210,14 +216,12 @@
     },
 }
 
-java_library_static {
+java_library {
     name: "android.car-stubs",
     srcs: [
         ":android.car-stub-docs",
     ],
-    libs: [
-        "android.car",
-    ],
+    sdk_version: "current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -229,14 +233,13 @@
     }
 }
 
-java_library_static {
+java_library {
     name: "android.car-system-stubs",
     srcs: [
         ":android.car-system-stubs-docs",
+        "src_stub/**/*.java",
     ],
-    libs: [
-        "android.car",
-    ],
+    sdk_version: "system_current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -248,18 +251,19 @@
     }
 }
 
-java_library_static {
+java_library {
     name: "android.car-test-stubs",
     srcs: [
         ":android.car-test-stubs-docs",
     ],
-    libs: [
-        "android.car",
-    ],
+    sdk_version: "test_current",
     product_variables: {
         pdk: {
             enabled: false,
         },
     },
     compile_dex: true,
+    dist: {
+        targets: ["dist_files"],
+    }
 }
diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index e3c3b6e..086e5c8 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -16,11 +16,16 @@
 
 package android.car;
 
+import static android.car.CarLibLog.TAG_CAR;
+
 import android.annotation.IntDef;
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemApi;
+import android.app.Activity;
+import android.app.Service;
 import android.car.cluster.CarInstrumentClusterManager;
 import android.car.cluster.ClusterActivityState;
 import android.car.content.pm.CarPackageManager;
@@ -44,21 +49,28 @@
 import android.car.vms.VmsSubscriberManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.TransactionTooLargeException;
 import android.os.UserHandle;
 import android.util.Log;
 
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.Preconditions;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.HashMap;
 
 /**
@@ -67,6 +79,13 @@
  *   Calling this API on a device with no such feature will lead to an exception.
  */
 public final class Car {
+
+    /**
+     * Binder service name of car service registered to service manager.
+     *
+     * @hide
+     */
+    public static final String CAR_SERVICE_BINDER_SERVICE_NAME = "car_service";
     /**
      * Service name for {@link CarSensorManager}, to be used in {@link #getCarManager(String)}.
      *
@@ -538,8 +557,8 @@
     /**
      * Activity Action: Provide media playing through a media template app.
      * <p>Input: String extra mapped by {@link android.app.SearchManager#QUERY} is the query
-     * used to start the media. String extra mapped by {@link #CAR_EXTRA_MEDIA_PACKAGE} is the
-     * package name of the media app which user wants to play media on.
+     * used to start the media. String extra mapped by {@link #CAR_EXTRA_MEDIA_COMPONENT} is the
+     * component name of the media app which user wants to play media on.
      * <p>Output: nothing.
      */
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
@@ -548,10 +567,30 @@
 
     /**
      * Used as a string extra field with {@link #CAR_INTENT_ACTION_MEDIA_TEMPLATE} to specify the
+     * MediaBrowserService that user wants to start the media on.
+     *
+     * @hide
+     */
+    public static final String CAR_EXTRA_MEDIA_COMPONENT =
+            "android.car.intent.extra.MEDIA_COMPONENT";
+
+    /**
+     * Used as a string extra field with {@link #CAR_INTENT_ACTION_MEDIA_TEMPLATE} to specify the
      * media app that user wants to start the media on. Note: this is not the templated media app.
+     *
+     * This is being deprecated. Use {@link #CAR_EXTRA_MEDIA_COMPONENT} instead.
      */
     public static final String CAR_EXTRA_MEDIA_PACKAGE = "android.car.intent.extra.MEDIA_PACKAGE";
 
+    /**
+     * Used as a string extra field of media session to specify the service corresponding to the
+     * session.
+     *
+     * @hide
+     */
+    public static final String CAR_EXTRA_BROWSE_SERVICE_FOR_SESSION =
+            "android.media.session.BROWSE_SERVICE";
+
     /** @hide */
     public static final String CAR_SERVICE_INTERFACE_NAME = "android.car.ICar";
 
@@ -579,19 +618,86 @@
     public static final String CAR_EXTRA_CLUSTER_ACTIVITY_STATE =
             "android.car.cluster.ClusterActivityState";
 
+
+    /**
+     * Callback to notify the Lifecycle of car service.
+     *
+     * <p>Access to car service should happen
+     * after {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} call with
+     * {@code ready} set {@code true}.</p>
+     *
+     * <p>When {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} is
+     * called with ready set to false, access to car service should stop until car service is ready
+     * again from {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} call
+     * with {@code ready} set to {@code true}.</p>
+     * @hide
+     */
+    public interface CarServiceLifecycleListener {
+        /**
+         * Car service has gone through status change.
+         *
+         * <p>This is always called in the main thread context.</p>
+         *
+         * @param car {@code Car} object that was originally associated with this lister from
+         *            {@link #createCar(Context, Handler, long, Car.CarServiceLifecycleListener)}
+         *            call.
+         * @param ready When {@code true, car service is ready and all accesses are ok.
+         *              Otherwise car service has crashed or killed and will be restarted.
+         */
+        void onLifecycleChanged(@NonNull Car car, boolean ready);
+    }
+
+    /**
+     * {@link #createCar(Context, Handler, long, CarServiceLifecycleListener)}'s
+     * waitTimeoutMs value to use to wait forever inside the call until car service is ready.
+     * @hide
+     */
+    public static final long CAR_WAIT_TIMEOUT_WAIT_FOREVER = -1;
+
+    /**
+     * {@link #createCar(Context, Handler, long, CarServiceLifecycleListener)}'s
+     * waitTimeoutMs value to use to skip any waiting inside the call.
+     * @hide
+     */
+    public static final long CAR_WAIT_TIMEOUT_DO_NOT_WAIT = 0;
+
     private static final long CAR_SERVICE_BIND_RETRY_INTERVAL_MS = 500;
     private static final long CAR_SERVICE_BIND_MAX_RETRY = 20;
 
-    private final Context mContext;
-    @GuardedBy("this")
-    private ICar mService;
-    private final boolean mOwnsService;
+    private static final long CAR_SERVICE_BINDER_POLLING_INTERVAL_MS = 50;
+    private static final long CAR_SERVICE_BINDER_POLLING_MAX_RETRY = 100;
+
     private static final int STATE_DISCONNECTED = 0;
     private static final int STATE_CONNECTING = 1;
     private static final int STATE_CONNECTED = 2;
-    @GuardedBy("this")
+
+    /** @hide */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef(prefix = "STATE_", value = {
+            STATE_DISCONNECTED,
+            STATE_CONNECTING,
+            STATE_CONNECTED,
+    })
+    @Target({ElementType.TYPE_USE})
+    public @interface StateTypeEnum {}
+
+    private static final boolean DBG = false;
+
+    private final Context mContext;
+
+    private final Exception mConstructionStack;
+
+    private final Object mLock = new Object();
+
+    @GuardedBy("mLock")
+    private ICar mService;
+    @GuardedBy("mLock")
+    private boolean mServiceBound;
+
+    @GuardedBy("mLock")
+    @StateTypeEnum
     private int mConnectionState;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private int mConnectionRetryCount;
 
     private final Runnable mConnectionRetryRunnable = new Runnable() {
@@ -611,29 +717,56 @@
 
     private final ServiceConnection mServiceConnectionListener =
             new ServiceConnection () {
+        @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
-            synchronized (Car.this) {
-                mService = ICar.Stub.asInterface(service);
-                mConnectionState = STATE_CONNECTED;
-            }
-            mServiceConnectionListenerClient.onServiceConnected(name, service);
-        }
-
-        public void onServiceDisconnected(ComponentName name) {
-            synchronized (Car.this) {
-                if (mConnectionState  == STATE_DISCONNECTED) {
+            synchronized (mLock) {
+                ICar newService = ICar.Stub.asInterface(service);
+                if (newService == null) {
+                    Log.wtf(TAG_CAR, "null binder service", new RuntimeException());
+                    return;  // should not happen.
+                }
+                if (mService != null && mService.asBinder().equals(newService.asBinder())) {
+                    // already connected.
                     return;
                 }
+                mConnectionState = STATE_CONNECTED;
+                mService = newService;
             }
-            // unbind explicitly and set connectionState to STATE_DISCONNECTED here.
-            disconnect();
-            mServiceConnectionListenerClient.onServiceDisconnected(name);
+            if (mStatusChangeCallback != null) {
+                mStatusChangeCallback.onLifecycleChanged(Car.this, true);
+            } else if (mServiceConnectionListenerClient != null) {
+                mServiceConnectionListenerClient.onServiceConnected(name, service);
+            }
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            synchronized (mLock) {
+                if (mConnectionState  == STATE_DISCONNECTED) {
+                    // can happen when client calls disconnect before onServiceDisconnected call.
+                    return;
+                }
+                handleCarDisconnectLocked();
+            }
+            if (mStatusChangeCallback != null) {
+                mStatusChangeCallback.onLifecycleChanged(Car.this, false);
+            } else if (mServiceConnectionListenerClient != null) {
+                mServiceConnectionListenerClient.onServiceDisconnected(name);
+            } else {
+                // This client does not handle car service restart, so should be terminated.
+                finishClient();
+            }
         }
     };
 
+    @Nullable
     private final ServiceConnection mServiceConnectionListenerClient;
-    private final Object mCarManagerLock = new Object();
-    @GuardedBy("mCarManagerLock")
+
+    /** Can be added after ServiceManager.getService call */
+    @Nullable
+    private final CarServiceLifecycleListener mStatusChangeCallback;
+
+    @GuardedBy("mLock")
     private final HashMap<String, CarManagerBase> mServiceMap = new HashMap<>();
 
     /** Handler for generic event dispatching. */
@@ -643,7 +776,9 @@
 
     /**
      * A factory method that creates Car instance for all Car API access.
-     * @param context
+     * @param context App's Context. This should not be null. If you are passing
+     *                {@link ContextWrapper}, make sure that its base Context is non-null as well.
+     *                Otherwise it will throw {@link java.lang.NullPointerException}.
      * @param serviceConnectionListener listener for monitoring service connection.
      * @param handler the handler on which the callback should execute, or null to execute on the
      * service's main thread. Note: the service connection listener will be always on the main
@@ -655,14 +790,16 @@
     @Deprecated
     public static Car createCar(Context context, ServiceConnection serviceConnectionListener,
             @Nullable Handler handler) {
+        assertNonNullContext(context);
         if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
-            Log.e(CarLibLog.TAG_CAR, "FEATURE_AUTOMOTIVE not declared while android.car is used");
+            Log.e(TAG_CAR, "FEATURE_AUTOMOTIVE not declared while android.car is used");
             return null;
         }
         try {
-          return new Car(context, serviceConnectionListener, handler);
+            return new Car(context, /* service= */ null , serviceConnectionListener,
+                    /* statusChangeListener= */ null, handler);
         } catch (IllegalArgumentException e) {
-          // Expected when car service loader is not available.
+            // Expected when car service loader is not available.
         }
         return null;
     }
@@ -695,7 +832,9 @@
     /**
      * Creates new {@link Car} object which connected synchronously to Car Service and ready to use.
      *
-     * @param context application's context
+     * @param context App's Context. This should not be null. If you are passing
+     *                {@link ContextWrapper}, make sure that its base Context is non-null as well.
+     *                Otherwise it will throw {@link java.lang.NullPointerException}.
      * @param handler the handler on which the manager's callbacks will be executed, or null to
      * execute on the application's main thread.
      *
@@ -703,38 +842,235 @@
      */
     @Nullable
     public static Car createCar(Context context, @Nullable Handler handler) {
-        IBinder service = ServiceManager.getService("car_service");
-        if (service == null) {
-            return null;
+        assertNonNullContext(context);
+        Car car = null;
+        IBinder service = null;
+        boolean started = false;
+        int retryCount = 0;
+        while (true) {
+            service = ServiceManager.getService(CAR_SERVICE_BINDER_SERVICE_NAME);
+            if (car == null) {
+                // service can be still null. The constructor is safe for null service.
+                car = new Car(context, ICar.Stub.asInterface(service),
+                        null /*serviceConnectionListener*/, null /*statusChangeListener*/, handler);
+            }
+            if (service != null) {
+                if (!started) {  // specialization for most common case.
+                    // Do this to crash client when car service crashes.
+                    car.startCarService();
+                    return car;
+                }
+                break;
+            }
+            if (!started) {
+                car.startCarService();
+                started = true;
+            }
+            retryCount++;
+            if (retryCount > CAR_SERVICE_BINDER_POLLING_MAX_RETRY) {
+                Log.e(TAG_CAR, "cannot get car_service, waited for car service (ms):"
+                                + CAR_SERVICE_BINDER_POLLING_INTERVAL_MS
+                                * CAR_SERVICE_BINDER_POLLING_MAX_RETRY,
+                        new RuntimeException());
+                return null;
+            }
+            try {
+                Thread.sleep(CAR_SERVICE_BINDER_POLLING_INTERVAL_MS);
+            } catch (InterruptedException e) {
+                Log.e(CarLibLog.TAG_CAR, "interrupted while waiting for car_service",
+                        new RuntimeException());
+                return null;
+            }
         }
-        return new Car(context, ICar.Stub.asInterface(service), handler);
+        // Can be accessed from mServiceConnectionListener in main thread.
+        synchronized (car) {
+            if (car.mService == null) {
+                car.mService = ICar.Stub.asInterface(service);
+                Log.w(TAG_CAR,
+                        "waited for car_service (ms):"
+                                + CAR_SERVICE_BINDER_POLLING_INTERVAL_MS * retryCount,
+                        new RuntimeException());
+            }
+            car.mConnectionState = STATE_CONNECTED;
+        }
+        return car;
     }
 
-    private Car(Context context, ServiceConnection serviceConnectionListener,
+    /**
+     * Creates new {@link Car} object with {@link CarServiceLifecycleListener}.
+     *
+     * <p> If car service is ready inside this call and if the caller is running in the main thread,
+     * {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} will be called
+     * with ready set to be true. Otherwise,
+     * {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} will be called
+     * from the main thread later. </p>
+     *
+     * <p>This call can block up to specified waitTimeoutMs to wait for car service to be ready.
+     * If car service is not ready within the given time, it will return a Car instance in
+     * disconnected state. Blocking main thread forever can lead into getting ANR (Application Not
+     * Responding) killing from system and should not be used if the app is supposed to survive
+     * across the crash / restart of car service. It can be still useful in case the app cannot do
+     * anything without car service being ready. In any waiting, if the thread is getting
+     * interrupted, it will return immediately.
+     * </p>
+     *
+     * <p>Note that returned {@link Car} object is not guaranteed to be connected when there is
+     * a limited timeout. Regardless of returned car being connected or not, it is recommended to
+     * implement all car related initialization inside
+     * {@link CarServiceLifecycleListener#onLifecycleChanged(Car, boolean)} and avoid the
+     * needs to check if returned {@link Car} is connected or not from returned {@link Car}.</p>
+     *
+     * @param context App's Context. This should not be null. If you are passing
+     *                {@link ContextWrapper}, make sure that its base Context is non-null as well.
+     *                Otherwise it will throw {@link java.lang.NullPointerException}.
+     * @param handler dispatches all Car*Manager events to this Handler. Exception is
+     *                {@link CarServiceLifecycleListener} which will be always dispatched to main
+     *                thread. Passing null leads into dispatching all Car*Manager callbacks to main
+     *                thread as well.
+     * @param waitTimeoutMs Setting this to {@link #CAR_WAIT_TIMEOUT_DO_NOT_WAIT} will guarantee
+     *                      that the API does not wait for the car service at all. Setting this to
+     *                      to {@link #CAR_WAIT_TIMEOUT_WAIT_FOREVER} will block the call forever
+     *                      until the car service is ready. Setting any positive value will be
+     *                      interpreted as timeout value.
+     *
+     * @hide
+     */
+    @NonNull
+    public static Car createCar(@NonNull Context context,
+            @Nullable Handler handler, long waitTimeoutMs,
+            @NonNull CarServiceLifecycleListener statusChangeListener) {
+        assertNonNullContext(context);
+        Preconditions.checkNotNull(statusChangeListener);
+        Car car = null;
+        IBinder service = null;
+        boolean started = false;
+        int retryCount = 0;
+        long maxRetryCount = 0;
+        if (waitTimeoutMs > 0) {
+            maxRetryCount = waitTimeoutMs / CAR_SERVICE_BINDER_POLLING_INTERVAL_MS;
+            // at least wait once if it is positive value.
+            if (maxRetryCount == 0) {
+                maxRetryCount = 1;
+            }
+        }
+        boolean isMainThread = Looper.myLooper() == Looper.getMainLooper();
+        while (true) {
+            service = ServiceManager.getService(CAR_SERVICE_BINDER_SERVICE_NAME);
+            if (car == null) {
+                // service can be still null. The constructor is safe for null service.
+                car = new Car(context, ICar.Stub.asInterface(service), null, statusChangeListener,
+                        handler);
+            }
+            if (service != null) {
+                if (!started) {  // specialization for most common case : car service already ready
+                    car.dispatchCarReadyToMainThread(isMainThread);
+                    // Needs this for CarServiceLifecycleListener. Note that ServiceConnection
+                    // will skip the callback as valid mService is set already.
+                    car.startCarService();
+                    return car;
+                }
+                // service available after starting.
+                break;
+            }
+            if (!started) {
+                car.startCarService();
+                started = true;
+            }
+            retryCount++;
+            if (waitTimeoutMs < 0 && retryCount >= CAR_SERVICE_BINDER_POLLING_MAX_RETRY
+                    && retryCount % CAR_SERVICE_BINDER_POLLING_MAX_RETRY == 0) {
+                // Log warning if car service is not alive even for waiting forever case.
+                Log.w(TAG_CAR, "car_service not ready, waited for car service (ms):"
+                                + retryCount * CAR_SERVICE_BINDER_POLLING_INTERVAL_MS,
+                        new RuntimeException());
+            } else if (waitTimeoutMs >= 0 && retryCount > maxRetryCount) {
+                if (waitTimeoutMs > 0) {
+                    Log.w(TAG_CAR, "car_service not ready, waited for car service (ms):"
+                                    + waitTimeoutMs,
+                            new RuntimeException());
+                }
+                return car;
+            }
+
+            try {
+                Thread.sleep(CAR_SERVICE_BINDER_POLLING_INTERVAL_MS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                Log.w(TAG_CAR, "interrupted", new RuntimeException());
+                return car;
+            }
+        }
+        // Can be accessed from mServiceConnectionListener in main thread.
+        synchronized (car.mLock) {
+            Log.w(TAG_CAR,
+                    "waited for car_service (ms):"
+                            + retryCount * CAR_SERVICE_BINDER_POLLING_INTERVAL_MS,
+                    new RuntimeException());
+            // ServiceConnection has handled everything.
+            if (car.mService != null) {
+                return car;
+            }
+            // mService check in ServiceConnection prevents calling
+            // onLifecycleChanged. So onLifecycleChanged should be called explicitly
+            // but do it outside lock.
+            car.mService = ICar.Stub.asInterface(service);
+            car.mConnectionState = STATE_CONNECTED;
+        }
+        car.dispatchCarReadyToMainThread(isMainThread);
+        return car;
+    }
+
+    private static void assertNonNullContext(Context context) {
+        Preconditions.checkNotNull(context);
+        if (context instanceof ContextWrapper
+                && ((ContextWrapper) context).getBaseContext() == null) {
+            throw new NullPointerException(
+                    "ContextWrapper with null base passed as Context, forgot to set base Context?");
+        }
+    }
+
+    private void dispatchCarReadyToMainThread(boolean isMainThread) {
+        if (isMainThread) {
+            mStatusChangeCallback.onLifecycleChanged(this, true);
+        } else {
+            // should dispatch to main thread.
+            mMainThreadEventHandler.post(
+                    () -> mStatusChangeCallback.onLifecycleChanged(this, true));
+        }
+    }
+
+    private Car(Context context, @Nullable ICar service,
+            @Nullable ServiceConnection serviceConnectionListener,
+            @Nullable CarServiceLifecycleListener statusChangeListener,
             @Nullable Handler handler) {
         mContext = context;
         mEventHandler = determineEventHandler(handler);
         mMainThreadEventHandler = determineMainThreadEventHandler(mEventHandler);
 
-        mService = null;
-        mOwnsService = true;
+        mService = service;
+        if (service != null) {
+            mConnectionState = STATE_CONNECTED;
+        } else {
+            mConnectionState = STATE_DISCONNECTED;
+        }
         mServiceConnectionListenerClient = serviceConnectionListener;
+        mStatusChangeCallback = statusChangeListener;
+        // Store construction stack so that client can get help when it crashes when car service
+        // crashes.
+        if (serviceConnectionListener == null && statusChangeListener == null) {
+            mConstructionStack = new RuntimeException();
+        } else {
+            mConstructionStack = null;
+        }
     }
 
-
     /**
-     * Car constructor when ICar binder is already available.
+     * Car constructor when ICar binder is already available. The binder can be null.
      * @hide
      */
-    public Car(Context context, ICar service, @Nullable Handler handler) {
-        mContext = context;
-        mEventHandler = determineEventHandler(handler);
-        mMainThreadEventHandler = determineMainThreadEventHandler(mEventHandler);
-
-        mService = service;
-        mOwnsService = false;
-        mConnectionState = STATE_CONNECTED;
-        mServiceConnectionListenerClient = null;
+    public Car(Context context, @Nullable ICar service, @Nullable Handler handler) {
+        this(context, service, null /*serviceConnectionListener*/, null /*statusChangeListener*/,
+                handler);
     }
 
     private static Handler determineMainThreadEventHandler(Handler eventHandler) {
@@ -760,7 +1096,7 @@
      */
     @Deprecated
     public void connect() throws IllegalStateException {
-        synchronized (this) {
+        synchronized (mLock) {
             if (mConnectionState != STATE_DISCONNECTED) {
                 throw new IllegalStateException("already connected or connecting");
             }
@@ -769,25 +1105,30 @@
         }
     }
 
+    private void handleCarDisconnectLocked() {
+        if (mConnectionState == STATE_DISCONNECTED) {
+            // can happen when client calls disconnect with onServiceDisconnected already called.
+            return;
+        }
+        mEventHandler.removeCallbacks(mConnectionRetryRunnable);
+        mMainThreadEventHandler.removeCallbacks(mConnectionRetryFailedRunnable);
+        mConnectionRetryCount = 0;
+        tearDownCarManagersLocked();
+        mService = null;
+        mConnectionState = STATE_DISCONNECTED;
+    }
+
     /**
      * Disconnect from car service. This can be called while disconnected. Once disconnect is
      * called, all Car*Managers from this instance becomes invalid, and
      * {@link Car#getCarManager(String)} will return different instance if it is connected again.
      */
     public void disconnect() {
-        synchronized (this) {
-            if (mConnectionState == STATE_DISCONNECTED) {
-                return;
-            }
-            mEventHandler.removeCallbacks(mConnectionRetryRunnable);
-            mMainThreadEventHandler.removeCallbacks(mConnectionRetryFailedRunnable);
-            mConnectionRetryCount = 0;
-            tearDownCarManagers();
-            mService = null;
-            mConnectionState = STATE_DISCONNECTED;
-
-            if (mOwnsService) {
+        synchronized (mLock) {
+            handleCarDisconnectLocked();
+            if (mServiceBound) {
                 mContext.unbindService(mServiceConnectionListener);
+                mServiceBound = false;
             }
         }
     }
@@ -798,7 +1139,7 @@
      * @return
      */
     public boolean isConnected() {
-        synchronized (this) {
+        synchronized (mLock) {
             return mService != null;
         }
     }
@@ -808,11 +1149,17 @@
      * @return
      */
     public boolean isConnecting() {
-        synchronized (this) {
+        synchronized (mLock) {
             return mConnectionState == STATE_CONNECTING;
         }
     }
 
+    /** @hide */
+    @VisibleForTesting
+    public ServiceConnection getServiceConnectionListener() {
+        return mServiceConnectionListener;
+    }
+
     /**
      * Get car specific service as in {@link Context#getSystemService(String)}. Returned
      * {@link Object} should be type-casted to the desired service.
@@ -824,27 +1171,29 @@
     @Nullable
     public Object getCarManager(String serviceName) {
         CarManagerBase manager;
-        ICar service = getICarOrThrow();
-        synchronized (mCarManagerLock) {
+        synchronized (mLock) {
+            if (mService == null) {
+                Log.w(TAG_CAR, "getCarManager not working while car service not ready");
+                return null;
+            }
             manager = mServiceMap.get(serviceName);
             if (manager == null) {
                 try {
-                    IBinder binder = service.getCarService(serviceName);
+                    IBinder binder = mService.getCarService(serviceName);
                     if (binder == null) {
-                        Log.w(CarLibLog.TAG_CAR, "getCarManager could not get binder for service:" +
-                                serviceName);
+                        Log.w(TAG_CAR, "getCarManager could not get binder for service:"
+                                + serviceName);
                         return null;
                     }
                     manager = createCarManager(serviceName, binder);
                     if (manager == null) {
-                        Log.w(CarLibLog.TAG_CAR,
-                                "getCarManager could not create manager for service:" +
-                                        serviceName);
+                        Log.w(TAG_CAR, "getCarManager could not create manager for service:"
+                                        + serviceName);
                         return null;
                     }
                     mServiceMap.put(serviceName, manager);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
             }
         }
@@ -860,84 +1209,163 @@
         return CONNECTION_TYPE_EMBEDDED;
     }
 
+    /** @hide */
+    Context getContext() {
+        return mContext;
+    }
+
+    /** @hide */
+    Handler getEventHandler() {
+        return mEventHandler;
+    }
+
+    /** @hide */
+    <T> T handleRemoteExceptionFromCarService(RemoteException e, T returnValue) {
+        handleRemoteExceptionFromCarService(e);
+        return returnValue;
+    }
+
+    /** @hide */
+    void handleRemoteExceptionFromCarService(RemoteException e) {
+        if (e instanceof TransactionTooLargeException) {
+            Log.w(TAG_CAR, "Car service threw TransactionTooLargeException", e);
+            throw new CarTransactionException(e, "Car service threw TransactionTooLargException");
+        } else {
+            Log.w(TAG_CAR, "Car service has crashed", e);
+        }
+    }
+
+
+    private void finishClient() {
+        if (mContext == null) {
+            throw new IllegalStateException("Car service has crashed, null Context");
+        }
+        if (mContext instanceof Activity) {
+            Activity activity = (Activity) mContext;
+            if (!activity.isFinishing()) {
+                Log.w(TAG_CAR,
+                        "Car service crashed, client not handling it, finish Activity, created "
+                                + "from " + mConstructionStack);
+                activity.finish();
+            }
+            return;
+        } else if (mContext instanceof Service) {
+            Service service = (Service) mContext;
+            killClient(service.getPackageName() + "," + service.getClass().getSimpleName());
+        } else {
+            killClient(/* clientInfo= */ null);
+        }
+    }
+
+    private void killClient(@Nullable String clientInfo) {
+        Log.w(TAG_CAR, "**Car service has crashed. Client(" + clientInfo + ") is not handling it."
+                        + " Client should use Car.createCar(..., CarServiceLifecycleListener, .."
+                        + ".) to handle it properly. Check pritned callstack to check where other "
+                        + "version of Car.createCar() was called. Killing the client process**",
+                mConstructionStack);
+        Process.killProcess(Process.myPid());
+    }
+
+    /** @hide */
+    public static <T> T handleRemoteExceptionFromCarService(Service service, RemoteException e,
+            T returnValue) {
+        handleRemoteExceptionFromCarService(service, e);
+        return returnValue;
+    }
+
+    /** @hide */
+    public static  void handleRemoteExceptionFromCarService(Service service, RemoteException e) {
+        if (e instanceof TransactionTooLargeException) {
+            Log.w(TAG_CAR, "Car service threw TransactionTooLargeException, client:"
+                    + service.getPackageName() + ","
+                    + service.getClass().getSimpleName(), e);
+            throw new CarTransactionException(e, "Car service threw TransactionTooLargeException, "
+                + "client: %s, %s", service.getPackageName(), service.getClass().getSimpleName());
+        } else {
+            Log.w(TAG_CAR, "Car service has crashed, client:"
+                    + service.getPackageName() + ","
+                    + service.getClass().getSimpleName(), e);
+            service.stopSelf();
+        }
+    }
+
     @Nullable
     private CarManagerBase createCarManager(String serviceName, IBinder binder) {
         CarManagerBase manager = null;
         switch (serviceName) {
             case AUDIO_SERVICE:
-                manager = new CarAudioManager(binder, mContext, mEventHandler);
+                manager = new CarAudioManager(this, binder);
                 break;
             case SENSOR_SERVICE:
-                manager = new CarSensorManager(binder, mContext, mEventHandler);
+                manager = new CarSensorManager(this, binder);
                 break;
             case INFO_SERVICE:
-                manager = new CarInfoManager(binder);
+                manager = new CarInfoManager(this, binder);
                 break;
             case APP_FOCUS_SERVICE:
-                manager = new CarAppFocusManager(binder, mEventHandler);
+                manager = new CarAppFocusManager(this, binder);
                 break;
             case PACKAGE_SERVICE:
-                manager = new CarPackageManager(binder, mContext);
+                manager = new CarPackageManager(this, binder);
                 break;
             case CAR_NAVIGATION_SERVICE:
-                manager = new CarNavigationStatusManager(binder);
+                manager = new CarNavigationStatusManager(this, binder);
                 break;
             case CABIN_SERVICE:
-                manager = new CarCabinManager(binder, mContext, mEventHandler);
+                manager = new CarCabinManager(this, binder);
                 break;
             case DIAGNOSTIC_SERVICE:
-                manager = new CarDiagnosticManager(binder, mContext, mEventHandler);
+                manager = new CarDiagnosticManager(this, binder);
                 break;
             case HVAC_SERVICE:
-                manager = new CarHvacManager(binder, mContext, mEventHandler);
+                manager = new CarHvacManager(this, binder);
                 break;
             case POWER_SERVICE:
-                manager = new CarPowerManager(binder, mContext, mEventHandler);
+                manager = new CarPowerManager(this, binder);
                 break;
             case PROJECTION_SERVICE:
-                manager = new CarProjectionManager(binder, mEventHandler);
+                manager = new CarProjectionManager(this, binder);
                 break;
             case PROPERTY_SERVICE:
-                manager = new CarPropertyManager(ICarProperty.Stub.asInterface(binder),
-                    mEventHandler);
+                manager = new CarPropertyManager(this, ICarProperty.Stub.asInterface(binder));
                 break;
             case VENDOR_EXTENSION_SERVICE:
-                manager = new CarVendorExtensionManager(binder, mEventHandler);
+                manager = new CarVendorExtensionManager(this, binder);
                 break;
             case CAR_INSTRUMENT_CLUSTER_SERVICE:
-                manager = new CarInstrumentClusterManager(binder, mEventHandler);
+                manager = new CarInstrumentClusterManager(this, binder);
                 break;
             case TEST_SERVICE:
                 /* CarTestManager exist in static library. So instead of constructing it here,
                  * only pass binder wrapper so that CarTestManager can be constructed outside. */
-                manager = new CarTestManagerBinderWrapper(binder);
+                manager = new CarTestManagerBinderWrapper(this, binder);
                 break;
             case VMS_SUBSCRIBER_SERVICE:
-                manager = new VmsSubscriberManager(binder);
+                manager = new VmsSubscriberManager(this, binder);
                 break;
             case BLUETOOTH_SERVICE:
-                manager = new CarBluetoothManager(binder, mContext);
+                manager = new CarBluetoothManager(this, binder);
                 break;
             case STORAGE_MONITORING_SERVICE:
-                manager = new CarStorageMonitoringManager(binder, mEventHandler);
+                manager = new CarStorageMonitoringManager(this, binder);
                 break;
             case CAR_DRIVING_STATE_SERVICE:
-                manager = new CarDrivingStateManager(binder, mContext, mEventHandler);
+                manager = new CarDrivingStateManager(this, binder);
                 break;
             case CAR_UX_RESTRICTION_SERVICE:
-                manager = new CarUxRestrictionsManager(binder, mContext, mEventHandler);
+                manager = new CarUxRestrictionsManager(this, binder);
                 break;
             case CAR_CONFIGURATION_SERVICE:
-                manager = new CarConfigurationManager(binder);
+                manager = new CarConfigurationManager(this, binder);
                 break;
             case CAR_TRUST_AGENT_ENROLLMENT_SERVICE:
-                manager = new CarTrustAgentEnrollmentManager(binder, mContext, mEventHandler);
+                manager = new CarTrustAgentEnrollmentManager(this, binder);
                 break;
             case CAR_MEDIA_SERVICE:
-                manager = new CarMediaManager(binder);
+                manager = new CarMediaManager(this, binder);
                 break;
             case CAR_BUGREPORT_SERVICE:
-                manager = new CarBugreportManager(binder, mContext);
+                manager = new CarBugreportManager(this, binder);
                 break;
             default:
                 break;
@@ -951,33 +1379,30 @@
         intent.setAction(Car.CAR_SERVICE_INTERFACE_NAME);
         boolean bound = mContext.bindServiceAsUser(intent, mServiceConnectionListener,
                 Context.BIND_AUTO_CREATE, UserHandle.CURRENT_OR_SELF);
-        if (!bound) {
-            mConnectionRetryCount++;
-            if (mConnectionRetryCount > CAR_SERVICE_BIND_MAX_RETRY) {
-                Log.w(CarLibLog.TAG_CAR, "cannot bind to car service after max retry");
-                mMainThreadEventHandler.post(mConnectionRetryFailedRunnable);
+        synchronized (mLock) {
+            if (!bound) {
+                mConnectionRetryCount++;
+                if (mConnectionRetryCount > CAR_SERVICE_BIND_MAX_RETRY) {
+                    Log.w(TAG_CAR, "cannot bind to car service after max retry");
+                    mMainThreadEventHandler.post(mConnectionRetryFailedRunnable);
+                } else {
+                    mEventHandler.postDelayed(mConnectionRetryRunnable,
+                            CAR_SERVICE_BIND_RETRY_INTERVAL_MS);
+                }
             } else {
-                mEventHandler.postDelayed(mConnectionRetryRunnable,
-                        CAR_SERVICE_BIND_RETRY_INTERVAL_MS);
+                mEventHandler.removeCallbacks(mConnectionRetryRunnable);
+                mMainThreadEventHandler.removeCallbacks(mConnectionRetryFailedRunnable);
+                mConnectionRetryCount = 0;
+                mServiceBound = true;
             }
-        } else {
-            mConnectionRetryCount = 0;
         }
     }
 
-    private synchronized ICar getICarOrThrow() throws IllegalStateException {
-        if (mService == null) {
-            throw new IllegalStateException("not connected");
+    private void tearDownCarManagersLocked() {
+        // All disconnected handling should be only doing its internal cleanup.
+        for (CarManagerBase manager: mServiceMap.values()) {
+            manager.onCarDisconnected();
         }
-        return mService;
-    }
-
-    private void tearDownCarManagers() {
-        synchronized (mCarManagerLock) {
-            for (CarManagerBase manager: mServiceMap.values()) {
-                manager.onCarDisconnected();
-            }
-            mServiceMap.clear();
-        }
+        mServiceMap.clear();
     }
 }
diff --git a/car-lib/src/android/car/CarAppFocusManager.java b/car-lib/src/android/car/CarAppFocusManager.java
index ff0c25d..b8936af 100644
--- a/car-lib/src/android/car/CarAppFocusManager.java
+++ b/car-lib/src/android/car/CarAppFocusManager.java
@@ -17,7 +17,6 @@
 package android.car;
 
 import android.annotation.IntDef;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 
@@ -35,7 +34,7 @@
  * should run in the system, and other app setting the flag for the matching app should
  * lead into other app to stop.
  */
-public final class CarAppFocusManager implements CarManagerBase {
+public final class CarAppFocusManager extends CarManagerBase {
     /**
      * Listener to get notification for app getting information on application type status changes.
      */
@@ -114,7 +113,6 @@
     public @interface AppFocusRequestResult {}
 
     private final IAppFocus mService;
-    private final Handler mHandler;
     private final Map<OnAppFocusChangedListener, IAppFocusListenerImpl> mChangeBinders =
             new HashMap<>();
     private final Map<OnAppFocusOwnershipCallback, IAppFocusOwnershipCallbackImpl>
@@ -123,9 +121,9 @@
     /**
      * @hide
      */
-    CarAppFocusManager(IBinder service, Handler handler) {
+    CarAppFocusManager(Car car, IBinder service) {
+        super(car);
         mService = IAppFocus.Stub.asInterface(service);
-        mHandler = handler;
     }
 
     /**
@@ -149,7 +147,7 @@
         try {
             mService.registerFocusListener(binder, appType);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -169,7 +167,8 @@
         try {
             mService.unregisterFocusListener(binder, appType);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
+            // continue for local clean-up
         }
         synchronized (this) {
             binder.removeAppType(appType);
@@ -197,7 +196,7 @@
                 mService.unregisterFocusListener(binder, appType);
             }
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -209,7 +208,7 @@
         try {
             return mService.getActiveAppTypes();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, new int[0]);
         }
     }
 
@@ -229,7 +228,7 @@
         try {
             return mService.isOwningFocus(binder, appType);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -261,7 +260,7 @@
         try {
             return mService.requestAppFocus(binder, appType);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, APP_FOCUS_REQUEST_FAILED);
         }
     }
 
@@ -286,7 +285,8 @@
         try {
             mService.abandonAppFocus(binder, appType);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
+            // continue for local clean-up
         }
         synchronized (this) {
             binder.removeAppType(appType);
@@ -314,7 +314,7 @@
                 mService.abandonAppFocus(binder, appType);
             }
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -359,11 +359,8 @@
             if (manager == null || listener == null) {
                 return;
             }
-            manager.mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    listener.onAppFocusChanged(appType, active);
-                }
+            manager.getEventHandler().post(() -> {
+                listener.onAppFocusChanged(appType, active);
             });
         }
     }
@@ -403,11 +400,8 @@
             if (manager == null || callback == null) {
                 return;
             }
-            manager.mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onAppFocusOwnershipLost(appType);
-                }
+            manager.getEventHandler().post(() -> {
+                callback.onAppFocusOwnershipLost(appType);
             });
         }
 
@@ -418,11 +412,8 @@
             if (manager == null || callback == null) {
                 return;
             }
-            manager.mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onAppFocusOwnershipGranted(appType);
-                }
+            manager.getEventHandler().post(() -> {
+                callback.onAppFocusOwnershipGranted(appType);
             });
         }
     }
diff --git a/car-lib/src/android/car/CarBluetoothManager.java b/car-lib/src/android/car/CarBluetoothManager.java
index c85cec7..c8e46ca 100644
--- a/car-lib/src/android/car/CarBluetoothManager.java
+++ b/car-lib/src/android/car/CarBluetoothManager.java
@@ -17,7 +17,6 @@
 
 import android.Manifest;
 import android.annotation.RequiresPermission;
-import android.content.Context;
 import android.os.IBinder;
 import android.os.RemoteException;
 
@@ -26,9 +25,8 @@
  *
  * @hide
  */
-public final class CarBluetoothManager implements CarManagerBase {
+public final class CarBluetoothManager extends CarManagerBase {
     private static final String TAG = "CarBluetoothManager";
-    private final Context mContext;
     private final ICarBluetooth mService;
 
     /**
@@ -50,7 +48,7 @@
         try {
             mService.connectDevices();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -59,8 +57,8 @@
      *
      * @hide
      */
-    public CarBluetoothManager(IBinder service, Context context) {
-        mContext = context;
+    public CarBluetoothManager(Car car, IBinder service) {
+        super(car);
         mService = ICarBluetooth.Stub.asInterface(service);
     }
 
diff --git a/car-lib/src/android/car/CarBugreportManager.java b/car-lib/src/android/car/CarBugreportManager.java
index f5d3b1d..99f2c7c 100644
--- a/car-lib/src/android/car/CarBugreportManager.java
+++ b/car-lib/src/android/car/CarBugreportManager.java
@@ -20,7 +20,6 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.RequiresPermission;
-import android.content.Context;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
@@ -39,10 +38,9 @@
  *
  * @hide
  */
-public final class CarBugreportManager implements CarManagerBase {
+public final class CarBugreportManager extends CarManagerBase {
 
     private final ICarBugreportService mService;
-    private Handler mHandler;
 
     /**
      * Callback from carbugreport manager. Callback methods are always called on the main thread.
@@ -153,9 +151,9 @@
      *
      * Should not be obtained directly by clients, use {@link Car#getCarManager(String)} instead.
      */
-    public CarBugreportManager(IBinder service, Context context) {
+    public CarBugreportManager(Car car, IBinder service) {
+        super(car);
         mService = ICarBugreportService.Stub.asInterface(service);
-        mHandler = new Handler(context.getMainLooper());
     }
 
     /**
@@ -185,10 +183,10 @@
         Preconditions.checkNotNull(callback);
         try {
             CarBugreportManagerCallbackWrapper wrapper =
-                    new CarBugreportManagerCallbackWrapper(callback, mHandler);
+                    new CarBugreportManagerCallbackWrapper(callback, getEventHandler());
             mService.requestBugreport(output, extraOutput, wrapper);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         } finally {
             IoUtils.closeQuietly(output);
             IoUtils.closeQuietly(extraOutput);
diff --git a/car-lib/src/android/car/CarInfoManager.java b/car-lib/src/android/car/CarInfoManager.java
index bf09495..e9a170d 100644
--- a/car-lib/src/android/car/CarInfoManager.java
+++ b/car-lib/src/android/car/CarInfoManager.java
@@ -29,7 +29,7 @@
  * Utility to retrieve various static information from car. Each data are grouped as {@link Bundle}
  * and relevant data can be checked from {@link Bundle} using pre-specified keys.
  */
-public final class CarInfoManager implements CarManagerBase{
+public final class CarInfoManager extends CarManagerBase {
 
     private final CarPropertyManager mCarPropertyMgr;
     /**
@@ -261,9 +261,10 @@
     }
 
     /** @hide */
-    CarInfoManager(IBinder service) {
+    CarInfoManager(Car car, IBinder service) {
+        super(car);
         ICarProperty mCarPropertyService = ICarProperty.Stub.asInterface(service);
-        mCarPropertyMgr = new CarPropertyManager(mCarPropertyService, null);
+        mCarPropertyMgr = new CarPropertyManager(car, mCarPropertyService);
     }
 
     /** @hide */
diff --git a/car-lib/src/android/car/CarManagerBase.java b/car-lib/src/android/car/CarManagerBase.java
index 737f356..8d30fdf 100644
--- a/car-lib/src/android/car/CarManagerBase.java
+++ b/car-lib/src/android/car/CarManagerBase.java
@@ -16,10 +16,44 @@
 
 package android.car;
 
+import android.content.Context;
+import android.os.Handler;
+import android.os.RemoteException;
+
 /**
- * Common interface for Car*Manager
+ * Common base class for Car*Manager
  * @hide
  */
-public interface CarManagerBase {
-    void onCarDisconnected();
+public abstract class CarManagerBase {
+
+    protected final Car mCar;
+
+    public CarManagerBase(Car car) {
+        mCar = car;
+    }
+
+    protected Context getContext() {
+        return mCar.getContext();
+    }
+
+    protected Handler getEventHandler() {
+        return mCar.getEventHandler();
+    }
+
+    protected <T> T handleRemoteExceptionFromCarService(RemoteException e, T returnValue) {
+        return mCar.handleRemoteExceptionFromCarService(e, returnValue);
+    }
+
+    protected void handleRemoteExceptionFromCarService(RemoteException e) {
+        mCar.handleRemoteExceptionFromCarService(e);
+    }
+
+    /**
+     * Handle disconnection of car service (=crash). As car service has crashed already, this call
+     * should only clean up any listeners / callbacks passed from client. Clearing object passed
+     * to car service is not necessary as car service has crashed. Note that Car*Manager will not
+     * work any more as all binders are invalid. Client should re-create all Car*Managers when
+     * car service is restarted.
+     */
+    protected abstract void onCarDisconnected();
 }
diff --git a/car-lib/src/android/car/CarProjectionManager.java b/car-lib/src/android/car/CarProjectionManager.java
index 4c177f7..bc4107f 100644
--- a/car-lib/src/android/car/CarProjectionManager.java
+++ b/car-lib/src/android/car/CarProjectionManager.java
@@ -69,7 +69,7 @@
  * @hide
  */
 @SystemApi
-public final class CarProjectionManager implements CarManagerBase {
+public final class CarProjectionManager extends CarManagerBase {
     private static final String TAG = CarProjectionManager.class.getSimpleName();
 
     private final Binder mToken = new Binder();
@@ -194,7 +194,6 @@
     public static final int PROJECTION_AP_FAILED = 2;
 
     private final ICarProjection mService;
-    private final Handler mHandler;
     private final Executor mHandlerExecutor;
 
     @GuardedBy("mLock")
@@ -241,9 +240,10 @@
     /**
      * @hide
      */
-    public CarProjectionManager(IBinder service, Handler handler) {
+    public CarProjectionManager(Car car, IBinder service) {
+        super(car);
         mService = ICarProjection.Stub.asInterface(service);
-        mHandler = handler;
+        Handler handler = getEventHandler();
         mHandlerExecutor = handler::post;
     }
 
@@ -448,7 +448,8 @@
                 mService.unregisterKeyEventHandler(mBinderHandler);
             }
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
+            return;
         }
 
         mHandledEvents = events;
@@ -466,7 +467,7 @@
             try {
                 mService.registerProjectionRunner(serviceIntent);
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                handleRemoteExceptionFromCarService(e);
             }
         }
     }
@@ -483,7 +484,7 @@
             try {
                 mService.unregisterProjectionRunner(serviceIntent);
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                handleRemoteExceptionFromCarService(e);
             }
         }
     }
@@ -507,14 +508,14 @@
     public void startProjectionAccessPoint(@NonNull ProjectionAccessPointCallback callback) {
         Preconditions.checkNotNull(callback, "callback cannot be null");
         synchronized (mLock) {
-            Looper looper = mHandler.getLooper();
+            Looper looper = getEventHandler().getLooper();
             ProjectionAccessPointCallbackProxy proxy =
                     new ProjectionAccessPointCallbackProxy(this, looper, callback);
             try {
                 mService.startProjectionAccessPoint(proxy.getMessenger(), mAccessPointProxyToken);
                 mProjectionAccessPointCallbackProxy = proxy;
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                handleRemoteExceptionFromCarService(e);
             }
         }
     }
@@ -535,7 +536,7 @@
             }
             return channelList;
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Collections.emptyList());
         }
     }
 
@@ -556,7 +557,7 @@
         try {
             mService.stopProjectionAccessPoint(mAccessPointProxyToken);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -575,7 +576,7 @@
         try {
             return mService.requestBluetoothProfileInhibit(device, profile, mToken);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -593,7 +594,7 @@
         try {
             return mService.releaseBluetoothProfileInhibit(device, profile, mToken);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -611,7 +612,7 @@
         try {
             mService.updateProjectionStatus(status, mToken);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -634,12 +635,12 @@
                 try {
                     mService.registerProjectionStatusListener(mCarProjectionStatusListener);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
             } else {
                 // Already subscribed to Car Service, immediately notify listener with the current
                 // projection status in the event handler thread.
-                mHandler.post(() ->
+                getEventHandler().post(() ->
                         listener.onProjectionStatusChanged(
                                 mCarProjectionStatusListener.mCurrentState,
                                 mCarProjectionStatusListener.mCurrentPackageName,
@@ -671,7 +672,7 @@
             mService.unregisterProjectionStatusListener(mCarProjectionStatusListener);
             mCarProjectionStatusListener = null;
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -695,7 +696,7 @@
         try {
             return mService.getProjectionOptions();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Bundle.EMPTY);
         }
     }
 
@@ -838,7 +839,7 @@
                 List<ProjectionStatus> details) {
             CarProjectionManager mgr = mManagerRef.get();
             if (mgr != null) {
-                mgr.mHandler.post(() -> {
+                mgr.getEventHandler().post(() -> {
                     mCurrentState = projectionState;
                     mCurrentPackageName = packageName;
                     mDetails = Collections.unmodifiableList(details);
diff --git a/car-lib/src/android/car/CarTransactionException.java b/car-lib/src/android/car/CarTransactionException.java
new file mode 100644
index 0000000..c0e7e2f
--- /dev/null
+++ b/car-lib/src/android/car/CarTransactionException.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 android.car;
+
+/**
+ * Runtime exception thrown when a transaction-level binder exception has occurred.
+ *
+ * This allows clients to log or recover transaction errors as appropriate.
+ *
+ * @hide
+ */
+public class CarTransactionException extends UnsupportedOperationException {
+    CarTransactionException(Throwable cause, String msg, Object... args) {
+        super(String.format(msg, args), cause);
+    }
+}
+
diff --git a/car-lib/src/android/car/VehiclePropertyIds.java b/car-lib/src/android/car/VehiclePropertyIds.java
index c335e58..ada2b2d 100644
--- a/car-lib/src/android/car/VehiclePropertyIds.java
+++ b/car-lib/src/android/car/VehiclePropertyIds.java
@@ -338,38 +338,44 @@
     /**
      * Distance units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} to write the property.
+     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
+     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
      */
     public static final int DISTANCE_DISPLAY_UNITS = 289408512;
     /**
      * Fuel volume units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} to write the property.
+     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
+     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
      */
     public static final int FUEL_VOLUME_DISPLAY_UNITS = 289408513;
     /**
      * Tire pressure units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} to write the property.
+     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
+     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
      */
     public static final int TIRE_PRESSURE_DISPLAY_UNITS = 289408514;
     /**
      * EV battery units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} to write the property.
+     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
+     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
      */
     public static final int EV_BATTERY_DISPLAY_UNITS = 289408515;
     /**
      * Speed Units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} to write the property.
+     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
+     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
      * @hide
      */
     public static final int VEHICLE_SPEED_DISPLAY_UNITS = 289408516;
     /**
      * Fuel consumption units for display
      * Requires permission {@link Car#PERMISSION_READ_DISPLAY_UNITS} to read the property.
-     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} to write the property.
+     * Requires permission {@link Car#PERMISSION_CONTROL_DISPLAY_UNITS} and
+     * {@link Car#PERMISSION_VENDOR_EXTENSION}to write the property.
      */
     public static final int FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME = 287311364;
     /**
diff --git a/car-lib/src/android/car/cluster/CarInstrumentClusterManager.java b/car-lib/src/android/car/cluster/CarInstrumentClusterManager.java
index 54d10e2..2b633a0 100644
--- a/car-lib/src/android/car/cluster/CarInstrumentClusterManager.java
+++ b/car-lib/src/android/car/cluster/CarInstrumentClusterManager.java
@@ -17,10 +17,10 @@
 package android.car.cluster;
 
 import android.annotation.SystemApi;
+import android.car.Car;
 import android.car.CarManagerBase;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.IBinder;
 
 /**
@@ -35,7 +35,7 @@
  */
 @Deprecated
 @SystemApi
-public class CarInstrumentClusterManager implements CarManagerBase {
+public class CarInstrumentClusterManager extends CarManagerBase {
     /**
      * @deprecated use {@link android.car.Car#CATEGORY_NAVIGATION} instead
      *
@@ -101,7 +101,8 @@
     }
 
     /** @hide */
-    public CarInstrumentClusterManager(IBinder service, Handler handler) {
+    public CarInstrumentClusterManager(Car car, IBinder service) {
+        super(car);
         // No-op
     }
 
diff --git a/car-lib/src/android/car/cluster/renderer/IInstrumentCluster.aidl b/car-lib/src/android/car/cluster/renderer/IInstrumentCluster.aidl
index 7deecc7..4f41796 100644
--- a/car-lib/src/android/car/cluster/renderer/IInstrumentCluster.aidl
+++ b/car-lib/src/android/car/cluster/renderer/IInstrumentCluster.aidl
@@ -28,6 +28,8 @@
     /**
      * Returns {@link IInstrumentClusterNavigation} that will be passed to the navigation
      * application.
+     *
+     * TODO(b/141992448) : remove blocking call
      */
     IInstrumentClusterNavigation getNavigationService();
 
diff --git a/car-lib/src/android/car/cluster/renderer/IInstrumentClusterHelper.aidl b/car-lib/src/android/car/cluster/renderer/IInstrumentClusterHelper.aidl
new file mode 100644
index 0000000..680e241
--- /dev/null
+++ b/car-lib/src/android/car/cluster/renderer/IInstrumentClusterHelper.aidl
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 android.car.cluster.renderer;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Helper binder API for InstrumentClusterRenderingService. This contains binder calls to car
+ * service.
+ *
+ * @hide
+ */
+interface IInstrumentClusterHelper {
+    /**
+     * Start an activity to specified display / user. The activity is considered as
+     * in fixed mode for the display and will be re-launched if the activity crashes, the package
+     * is updated or goes to background for whatever reason.
+     * Only one activity can exist in fixed mode for the target display and calling this multiple
+     * times with different {@code Intent} will lead into making all previous activities into
+     * non-fixed normal state (= will not be re-launched.)
+     *
+     * Do not change binder transaction number.
+     */
+    boolean startFixedActivityModeForDisplayAndUser(in Intent intent,
+            in Bundle activityOptionsBundle, int userId) = 0;
+    /**
+     * The activity lauched on the display is no longer in fixed mode. Re-launching or finishing
+     * should not trigger re-launfhing any more. Note that Activity for non-current user will
+     * be auto-stopped and there is no need to call this for user swiching. Note that this does not
+     * stop the activity but it will not be re-launched any more.
+     *
+     * Do not change binder transaction number.
+     */
+    void stopFixedActivityMode(int displayId) = 1;
+}
diff --git a/car-lib/src/android/car/cluster/renderer/InstrumentClusterRenderingService.java b/car-lib/src/android/car/cluster/renderer/InstrumentClusterRenderingService.java
index b692c02..3e463d1 100644
--- a/car-lib/src/android/car/cluster/renderer/InstrumentClusterRenderingService.java
+++ b/car-lib/src/android/car/cluster/renderer/InstrumentClusterRenderingService.java
@@ -22,6 +22,7 @@
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
+import android.annotation.UserIdInt;
 import android.app.ActivityOptions;
 import android.app.Service;
 import android.car.Car;
@@ -82,6 +83,15 @@
  */
 @SystemApi
 public abstract class InstrumentClusterRenderingService extends Service {
+    /**
+     * Key to pass IInstrumentClusterHelper binder in onBind call {@link Intent} through extra
+     * {@link Bundle). Both extra bundle and binder itself use this key.
+     *
+     * @hide
+     */
+    public static final String EXTRA_BUNDLE_KEY_FOR_INSTRUMENT_CLUSTER_HELPER =
+            "android.car.cluster.renderer.IInstrumentClusterHelper";
+
     private static final String TAG = CarLibLog.TAG_CLUSTER;
 
     /**
@@ -93,16 +103,22 @@
     private static final int NAVIGATION_STATE_EVENT_ID = 1;
     private static final String BITMAP_QUERY_WIDTH = "w";
     private static final String BITMAP_QUERY_HEIGHT = "h";
+    private static final String BITMAP_QUERY_OFFLANESALPHA = "offLanesAlpha";
+
+    private final Handler mUiHandler = new Handler(Looper.getMainLooper());
 
     private final Object mLock = new Object();
+    // Main thread only
     private RendererBinder mRendererBinder;
-    private Handler mUiHandler = new Handler(Looper.getMainLooper());
     private ActivityOptions mActivityOptions;
     private ClusterActivityState mActivityState;
     private ComponentName mNavigationComponent;
     @GuardedBy("mLock")
     private ContextOwner mNavContextOwner;
 
+    @GuardedBy("mLock")
+    private IInstrumentClusterHelper mInstrumentClusterHelper;
+
     private static final int IMAGE_CACHE_SIZE_BYTES = 4 * 1024 * 1024; /* 4 mb */
     private final LruCache<String, Bitmap> mCache = new LruCache<String, Bitmap>(
             IMAGE_CACHE_SIZE_BYTES) {
@@ -164,6 +180,18 @@
             Log.d(TAG, "onBind, intent: " + intent);
         }
 
+        Bundle bundle = intent.getBundleExtra(EXTRA_BUNDLE_KEY_FOR_INSTRUMENT_CLUSTER_HELPER);
+        IBinder binder = null;
+        if (bundle != null) {
+            binder = bundle.getBinder(EXTRA_BUNDLE_KEY_FOR_INSTRUMENT_CLUSTER_HELPER);
+        }
+        if (binder == null) {
+            Log.wtf(TAG, "IInstrumentClusterHelper not passed through binder");
+        } else {
+            synchronized (mLock) {
+                mInstrumentClusterHelper = IInstrumentClusterHelper.Stub.asInterface(binder);
+            }
+        }
         if (mRendererBinder == null) {
             mRendererBinder = new RendererBinder(getNavigationRenderer());
         }
@@ -203,6 +231,76 @@
     public void onNavigationComponentReleased() {
     }
 
+    @Nullable
+    private IInstrumentClusterHelper getClusterHelper() {
+        synchronized (mLock) {
+            if (mInstrumentClusterHelper == null) {
+                Log.w("mInstrumentClusterHelper still null, should wait until onBind",
+                        new RuntimeException());
+            }
+            return mInstrumentClusterHelper;
+        }
+    }
+
+    /**
+     * Start Activity in fixed mode.
+     *
+     * <p>Activity launched in this way will stay visible across crash, package updatge
+     * or other Activity launch. So this should be carefully used for case like apps running
+     * in instrument cluster.</p>
+     *
+     * <p> Only one Activity can stay in this mode for a display and launching other Activity
+     * with this call means old one get out of the mode. Alternatively
+     * {@link #stopFixedActivityMode(int)} can be called to get the top activitgy out of this
+     * mode.</p>
+     *
+     * @param intent Should include specific {@code ComponentName}.
+     * @param options Should include target display.
+     * @param userId Target user id
+     * @return {@code true} if succeeded. {@code false} may mean the target component is not ready
+     *         or available. Note that failure can happen during early boot-up stage even if the
+     *         target Activity is in normal state and client should retry when it fails. Once it is
+     *         successfully launched, car service will guarantee that it is running across crash or
+     *         other events.
+     *
+     * @hide
+     */
+    protected boolean startFixedActivityModeForDisplayAndUser(@NonNull Intent intent,
+            @NonNull ActivityOptions options, @UserIdInt int userId) {
+        IInstrumentClusterHelper helper = getClusterHelper();
+        if (helper == null) {
+            return false;
+        }
+        try {
+            return helper.startFixedActivityModeForDisplayAndUser(intent, options.toBundle(),
+                    userId);
+        } catch (RemoteException e) {
+            Log.w("Remote exception from car service", e);
+            // Probably car service will restart and rebind. So do nothing.
+        }
+        return false;
+    }
+
+
+    /**
+     * Stop fixed mode for top Activity in the display. Crashing or launching other Activity
+     * will not re-launch the top Activity any more.
+     *
+     * @hide
+     */
+    protected void stopFixedActivityMode(int displayId) {
+        IInstrumentClusterHelper helper = getClusterHelper();
+        if (helper == null) {
+            return;
+        }
+        try {
+            helper.stopFixedActivityMode(displayId);
+        } catch (RemoteException e) {
+            Log.w("Remote exception from car service, displayId:" + displayId, e);
+            // Probably car service will restart and rebind. So do nothing.
+        }
+    }
+
     /**
      * Updates the cluster navigation activity by checking which activity to show (an activity of
      * the {@link #mNavContextOwner}). If not yet launched, it will do so.
@@ -379,16 +477,19 @@
     @CallSuper
     @Override
     protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
-        writer.println("**" + getClass().getSimpleName() + "**");
-        writer.println("renderer binder: " + mRendererBinder);
-        if (mRendererBinder != null) {
-            writer.println("navigation renderer: " + mRendererBinder.mNavigationRenderer);
+        synchronized (mLock) {
+            writer.println("**" + getClass().getSimpleName() + "**");
+            writer.println("renderer binder: " + mRendererBinder);
+            if (mRendererBinder != null) {
+                writer.println("navigation renderer: " + mRendererBinder.mNavigationRenderer);
+            }
+            writer.println("navigation focus owner: " + getNavigationContextOwner());
+            writer.println("activity options: " + mActivityOptions);
+            writer.println("activity state: " + mActivityState);
+            writer.println("current nav component: " + mNavigationComponent);
+            writer.println("current nav packages: " + getNavigationContextOwner().mPackageNames);
+            writer.println("mInstrumentClusterHelper" + mInstrumentClusterHelper);
         }
-        writer.println("navigation focus owner: " + getNavigationContextOwner());
-        writer.println("activity options: " + mActivityOptions);
-        writer.println("activity state: " + mActivityState);
-        writer.println("current nav component: " + mNavigationComponent);
-        writer.println("current nav packages: " + getNavigationContextOwner().mPackageNames);
     }
 
     private class RendererBinder extends IInstrumentCluster.Stub {
@@ -547,8 +648,18 @@
     }
 
     /**
+     * See {@link #getBitmap(Uri, int, int, float)}
+     *
+     * @hide
+     */
+    @Nullable
+    public Bitmap getBitmap(Uri uri, int width, int height) {
+        return getBitmap(uri, width, height, 1f);
+    }
+
+    /**
      * Fetches a bitmap from the navigation context owner (application holding navigation focus)
-     * of the given width and height. The fetched bitmaps are cached.
+     * of the given width and height and off lane opacity. The fetched bitmaps are cached.
      * It returns null if:
      * <ul>
      * <li>there is no navigation context owner
@@ -557,12 +668,16 @@
      * </ul>
      * This is a costly operation. Returned bitmaps should be fetched on a secondary thread.
      *
+     * @throws IllegalArgumentException if width, height <= 0, or 0 > offLanesAlpha > 1
      * @hide
      */
     @Nullable
-    public Bitmap getBitmap(Uri uri, int width, int height) throws InvalidSizeException {
+    public Bitmap getBitmap(Uri uri, int width, int height, float offLanesAlpha) {
         if (width <= 0 || height <= 0) {
-            throw new InvalidSizeException("Width and height must be > 0");
+            throw new IllegalArgumentException("Width and height must be > 0");
+        }
+        if (offLanesAlpha < 0 || offLanesAlpha > 1) {
+            throw new IllegalArgumentException("offLanesAlpha must be between [0, 1]");
         }
 
         try {
@@ -575,6 +690,7 @@
             uri = uri.buildUpon()
                     .appendQueryParameter(BITMAP_QUERY_WIDTH, String.valueOf(width))
                     .appendQueryParameter(BITMAP_QUERY_HEIGHT, String.valueOf(height))
+                    .appendQueryParameter(BITMAP_QUERY_OFFLANESALPHA, String.valueOf(offLanesAlpha))
                     .build();
 
             String host = uri.getHost();
diff --git a/car-lib/src/android/car/cluster/renderer/InvalidSizeException.java b/car-lib/src/android/car/cluster/renderer/InvalidSizeException.java
deleted file mode 100644
index b89cd9f..0000000
--- a/car-lib/src/android/car/cluster/renderer/InvalidSizeException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 android.car.cluster.renderer;
-
-/**
- * Exception denoting invalid size of an object.
- * eg.) Minimum size of an image
- *
- * @hide
- */
-public class InvalidSizeException extends Exception {
-    public InvalidSizeException(String message) {
-        super(message);
-    }
-
-    public InvalidSizeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InvalidSizeException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/car-lib/src/android/car/content/pm/CarAppBlockingPolicyService.java b/car-lib/src/android/car/content/pm/CarAppBlockingPolicyService.java
index 5b0a6bd..f95063a 100644
--- a/car-lib/src/android/car/content/pm/CarAppBlockingPolicyService.java
+++ b/car-lib/src/android/car/content/pm/CarAppBlockingPolicyService.java
@@ -17,6 +17,7 @@
 
 import android.annotation.SystemApi;
 import android.app.Service;
+import android.car.Car;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
@@ -76,7 +77,7 @@
             try {
                 setter.setAppBlockingPolicy(policy);
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                Car.handleRemoteExceptionFromCarService(CarAppBlockingPolicyService.this, e);
             }
         }
     }
diff --git a/car-lib/src/android/car/content/pm/CarPackageManager.java b/car-lib/src/android/car/content/pm/CarPackageManager.java
index d23633d..7498c65 100644
--- a/car-lib/src/android/car/content/pm/CarPackageManager.java
+++ b/car-lib/src/android/car/content/pm/CarPackageManager.java
@@ -19,9 +19,9 @@
 import android.annotation.IntDef;
 import android.annotation.SystemApi;
 import android.annotation.TestApi;
+import android.car.Car;
 import android.car.CarManagerBase;
 import android.content.ComponentName;
-import android.content.Context;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteException;
@@ -32,7 +32,7 @@
 /**
  * Provides car specific API related with package management.
  */
-public final class CarPackageManager implements CarManagerBase {
+public final class CarPackageManager extends CarManagerBase {
     private static final String TAG = "CarPackageManager";
 
     /**
@@ -70,12 +70,11 @@
     public @interface SetPolicyFlags {}
 
     private final ICarPackageManager mService;
-    private final Context mContext;
 
     /** @hide */
-    public CarPackageManager(IBinder service, Context context) {
+    public CarPackageManager(Car car, IBinder service) {
+        super(car);
         mService = ICarPackageManager.Stub.asInterface(service);
-        mContext = context;
     }
 
     /** @hide */
@@ -115,7 +114,7 @@
         try {
             mService.setAppBlockingPolicy(packageName, policy, flags);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -128,7 +127,7 @@
         try {
             mService.restartTask(taskId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -151,7 +150,7 @@
         try {
             return mService.isActivityBackedBySafeActivity(activityName);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -165,7 +164,7 @@
         try {
             mService.setEnableActivityBlocking(enable);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -181,7 +180,7 @@
         try {
             return mService.isActivityDistractionOptimized(packageName, className);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -197,7 +196,7 @@
         try {
             return mService.isServiceDistractionOptimized(packageName, className);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 }
diff --git a/car-lib/src/android/car/diagnostic/CarDiagnosticManager.java b/car-lib/src/android/car/diagnostic/CarDiagnosticManager.java
index 1559dd4..c9c8b6f 100644
--- a/car-lib/src/android/car/diagnostic/CarDiagnosticManager.java
+++ b/car-lib/src/android/car/diagnostic/CarDiagnosticManager.java
@@ -23,8 +23,6 @@
 import android.car.CarLibLog;
 import android.car.CarManagerBase;
 import android.car.diagnostic.ICarDiagnosticEventListener.Stub;
-import android.content.Context;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
@@ -47,7 +45,7 @@
  * @hide
  */
 @SystemApi
-public final class CarDiagnosticManager implements CarManagerBase {
+public final class CarDiagnosticManager extends CarManagerBase {
     public static final int FRAME_TYPE_LIVE = 0;
     public static final int FRAME_TYPE_FREEZE = 1;
 
@@ -70,15 +68,16 @@
     /** Handles call back into clients. */
     private final SingleMessageHandler<CarDiagnosticEvent> mHandlerCallback;
 
-    private CarDiagnosticEventListenerToService mListenerToService;
+    private final CarDiagnosticEventListenerToService mListenerToService;
 
     private final CarPermission mVendorExtensionPermission;
 
     /** @hide */
-    public CarDiagnosticManager(IBinder service, Context context, Handler handler) {
+    public CarDiagnosticManager(Car car, IBinder service) {
+        super(car);
         mService = ICarDiagnostic.Stub.asInterface(service);
-        mHandlerCallback = new SingleMessageHandler<CarDiagnosticEvent>(handler.getLooper(),
-            MSG_DIAGNOSTIC_EVENTS) {
+        mHandlerCallback = new SingleMessageHandler<CarDiagnosticEvent>(
+                getEventHandler().getLooper(), MSG_DIAGNOSTIC_EVENTS) {
             @Override
             protected void handleEvent(CarDiagnosticEvent event) {
                 CarDiagnosticListeners listeners;
@@ -90,7 +89,9 @@
                 }
             }
         };
-        mVendorExtensionPermission = new CarPermission(context, Car.PERMISSION_VENDOR_EXTENSION);
+        mVendorExtensionPermission = new CarPermission(getContext(),
+                Car.PERMISSION_VENDOR_EXTENSION);
+        mListenerToService = new CarDiagnosticEventListenerToService(this);
     }
 
     @Override
@@ -98,7 +99,6 @@
     public void onCarDisconnected() {
         synchronized(mActiveListeners) {
             mActiveListeners.clear();
-            mListenerToService = null;
         }
     }
 
@@ -137,9 +137,6 @@
             OnDiagnosticEventListener listener, @FrameType int frameType, int rate) {
         assertFrameType(frameType);
         synchronized(mActiveListeners) {
-            if (null == mListenerToService) {
-                mListenerToService = new CarDiagnosticEventListenerToService(this);
-            }
             boolean needsServerUpdate = false;
             CarDiagnosticListeners listeners = mActiveListeners.get(frameType);
             if (listeners == null) {
@@ -184,7 +181,8 @@
                     mService.unregisterDiagnosticListener(frameType,
                         mListenerToService);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
+                    // continue for local clean-up
                 }
                 mActiveListeners.remove(frameType);
             } else if (needsServerUpdate) {
@@ -197,7 +195,7 @@
         try {
             return mService.registerOrUpdateDiagnosticListener(frameType, rate, mListenerToService);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -212,7 +210,7 @@
         try {
             return mService.getLatestLiveFrame();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -229,7 +227,7 @@
         try {
             return mService.getFreezeFrameTimestamps();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, new long[0]);
         }
     }
 
@@ -246,7 +244,7 @@
         try {
             return mService.getFreezeFrame(timestamp);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -264,7 +262,7 @@
         try {
             return mService.clearFreezeFrames(timestamps);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -276,7 +274,7 @@
         try {
             return mService.isLiveFrameSupported();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -288,7 +286,7 @@
         try {
             return mService.isFreezeFrameNotificationSupported();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -300,7 +298,7 @@
         try {
             return mService.isGetFreezeFrameSupported();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -318,7 +316,7 @@
         try {
             return mService.isClearFreezeFramesSupported();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -336,7 +334,7 @@
         try {
             return mService.isSelectiveClearFreezeFramesSupported();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
diff --git a/car-lib/src/android/car/drivingstate/CarDrivingStateManager.java b/car-lib/src/android/car/drivingstate/CarDrivingStateManager.java
index 9b0626f..4053c5c 100644
--- a/car-lib/src/android/car/drivingstate/CarDrivingStateManager.java
+++ b/car-lib/src/android/car/drivingstate/CarDrivingStateManager.java
@@ -22,7 +22,6 @@
 import android.annotation.TestApi;
 import android.car.Car;
 import android.car.CarManagerBase;
-import android.content.Context;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -40,13 +39,12 @@
  */
 @SystemApi
 @TestApi
-public final class CarDrivingStateManager implements CarManagerBase {
+public final class CarDrivingStateManager extends CarManagerBase {
     private static final String TAG = "CarDrivingStateMgr";
     private static final boolean DBG = false;
     private static final boolean VDBG = false;
     private static final int MSG_HANDLE_DRIVING_STATE_CHANGE = 0;
 
-    private final Context mContext;
     private final ICarDrivingState mDrivingService;
     private final EventCallbackHandler mEventCallbackHandler;
     private CarDrivingStateEventListener mDrvStateEventListener;
@@ -54,10 +52,10 @@
 
 
     /** @hide */
-    public CarDrivingStateManager(IBinder service, Context context, Handler handler) {
-        mContext = context;
+    public CarDrivingStateManager(Car car, IBinder service) {
+        super(car);
         mDrivingService = ICarDrivingState.Stub.asInterface(service);
-        mEventCallbackHandler = new EventCallbackHandler(this, handler.getLooper());
+        mEventCallbackHandler = new EventCallbackHandler(this, getEventHandler().getLooper());
     }
 
     /** @hide */
@@ -111,7 +109,7 @@
             // register to the Service for getting notified
             mDrivingService.registerDrivingStateChangeListener(mListenerToService);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -134,7 +132,7 @@
             mDrvStateEventListener = null;
             mListenerToService = null;
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -151,7 +149,7 @@
         try {
             return mDrivingService.getCurrentDrivingState();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -172,7 +170,7 @@
         try {
             mDrivingService.injectDrivingState(event);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
diff --git a/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java b/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java
index 1148856..fc367d0 100644
--- a/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java
+++ b/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java
@@ -20,13 +20,11 @@
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_PARKED;
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_UNKNOWN;
 import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_BASELINE;
-import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_PASSENGER;
 
 import android.annotation.FloatRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.car.drivingstate.CarDrivingStateEvent.CarDrivingState;
-import android.car.drivingstate.CarUxRestrictionsManager.UxRestrictionMode;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -65,14 +63,6 @@
     private static final String JSON_NAME_IDLING_RESTRICTIONS = "idling_restrictions";
     private static final String JSON_NAME_PARKED_RESTRICTIONS = "parked_restrictions";
     private static final String JSON_NAME_UNKNOWN_RESTRICTIONS = "unknown_restrictions";
-    private static final String JSON_NAME_PASSENGER_MOVING_RESTRICTIONS =
-            "passenger_moving_restrictions";
-    private static final String JSON_NAME_PASSENGER_IDLING_RESTRICTIONS =
-            "passenger_idling_restrictions";
-    private static final String JSON_NAME_PASSENGER_PARKED_RESTRICTIONS =
-            "passenger_parked_restrictions";
-    private static final String JSON_NAME_PASSENGER_UNKNOWN_RESTRICTIONS =
-            "passenger_unknown_restrictions";
     private static final String JSON_NAME_REQ_OPT = "req_opt";
     private static final String JSON_NAME_RESTRICTIONS = "restrictions";
     private static final String JSON_NAME_SPEED_RANGE = "speed_range";
@@ -82,10 +72,10 @@
     private final int mMaxContentDepth;
     private final int mMaxCumulativeContentItems;
     private final int mMaxStringLength;
-    private final Map<Integer, List<RestrictionsPerSpeedRange>> mPassengerUxRestrictions =
-            new ArrayMap<>(DRIVING_STATES.length);
-    private final Map<Integer, List<RestrictionsPerSpeedRange>> mBaselineUxRestrictions =
-            new ArrayMap<>(DRIVING_STATES.length);
+    /**
+     * Mapping of a restriction mode name to its restrictions.
+     */
+    private final Map<String, RestrictionModeContainer> mRestrictionModes = new ArrayMap<>();
 
     // null means the port is not configured. It should apply to default display.
     @Nullable
@@ -98,24 +88,23 @@
         mMaxCumulativeContentItems = builder.mMaxCumulativeContentItems;
         mMaxStringLength = builder.mMaxStringLength;
 
-        for (int drivingState : DRIVING_STATES) {
-            List<RestrictionsPerSpeedRange> baseline = new ArrayList<>();
-            for (RestrictionsPerSpeedRange r : builder.mBaselineUxRestrictions.get(drivingState)) {
-                baseline.add(r);
+        // make an immutable copy from the builder
+        for (Map.Entry<String, RestrictionModeContainer> entry :
+                builder.mRestrictionModes.entrySet()) {
+            String mode = entry.getKey();
+            RestrictionModeContainer container = new RestrictionModeContainer();
+            for (int drivingState : DRIVING_STATES) {
+                container.setRestrictionsForDriveState(drivingState,
+                        Collections.unmodifiableList(
+                                entry.getValue().getRestrictionsForDriveState(drivingState)));
             }
-            mBaselineUxRestrictions.put(drivingState, baseline);
-
-            List<RestrictionsPerSpeedRange> passenger = new ArrayList<>();
-            for (RestrictionsPerSpeedRange r : builder.mPassengerUxRestrictions.get(drivingState)) {
-                passenger.add(r);
-            }
-            mPassengerUxRestrictions.put(drivingState, passenger);
+            mRestrictionModes.put(mode, container);
         }
     }
 
     /**
      * Returns the restrictions for
-     * {@link UxRestrictionMode#UX_RESTRICTION_MODE_BASELINE}
+     * {@link CarUxRestrictionsManager#UX_RESTRICTION_MODE_BASELINE}
      * based on current driving state.
      *
      * @param drivingState Driving state.
@@ -131,25 +120,35 @@
      * Returns the restrictions based on current driving state and restriction mode.
      *
      * <p>Restriction mode allows a different set of restrictions to be applied in the same driving
-     * state. See values in {@link UxRestrictionMode}.
+     * state.
      *
      * @param drivingState Driving state.
      *                     See values in {@link CarDrivingStateEvent.CarDrivingState}.
      * @param currentSpeed Current speed in meter per second.
-     * @param mode Current UX Restriction mode.
+     * @param mode         Current UX Restriction mode.
      */
     public CarUxRestrictions getUxRestrictions(@CarDrivingState int drivingState,
-            float currentSpeed, @UxRestrictionMode int mode) {
+            float currentSpeed, @NonNull String mode) {
+        Objects.requireNonNull(mode, "mode must not be null");
         RestrictionsPerSpeedRange restriction = null;
-        if (mode == UX_RESTRICTION_MODE_PASSENGER) {
-            restriction = findUxRestrictionsInList(
-                    currentSpeed, mPassengerUxRestrictions.get(drivingState));
+        if (mRestrictionModes.containsKey(mode)) {
+            restriction = findUxRestrictionsInList(currentSpeed,
+                    mRestrictionModes.get(mode).getRestrictionsForDriveState(drivingState));
         }
+
         if (restriction == null) {
-            // Mode is baseline, or passenger mode does not specify restrictions for current driving
-            // state.
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG,
+                        String.format("No restrictions specified for (mode: %s, drive state: %s)",
+                                mode,
+                                drivingState));
+            }
+            // Either mode does not have any configuration or the mode does not have a configuration
+            // for the specific drive state. In either case, fall-back to baseline configuration.
             restriction = findUxRestrictionsInList(
-                    currentSpeed, mBaselineUxRestrictions.get(drivingState));
+                    currentSpeed,
+                    mRestrictionModes.get(UX_RESTRICTION_MODE_BASELINE)
+                            .getRestrictionsForDriveState(drivingState));
         }
 
         if (restriction == null) {
@@ -231,7 +230,8 @@
     /**
      * Writes current configuration as Json.
      */
-    public void writeJson(JsonWriter writer) throws IOException {
+    public void writeJson(@NonNull JsonWriter writer) throws IOException {
+        Objects.requireNonNull(writer, "writer must not be null");
         // We need to be lenient to accept infinity number (as max speed).
         writer.setLenient(true);
 
@@ -246,38 +246,29 @@
                 mMaxCumulativeContentItems);
         writer.name(JSON_NAME_MAX_STRING_LENGTH).value(mMaxStringLength);
 
+        for (Map.Entry<String, RestrictionModeContainer> entry : mRestrictionModes.entrySet()) {
+            writer.name(entry.getKey());
+            writeRestrictionMode(writer, entry.getValue());
+        }
+
+        writer.endObject();
+    }
+
+    private void writeRestrictionMode(JsonWriter writer, RestrictionModeContainer container)
+            throws IOException {
+        writer.beginObject();
         writer.name(JSON_NAME_PARKED_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mBaselineUxRestrictions.get(DRIVING_STATE_PARKED));
+        writeRestrictionsList(writer, container.getRestrictionsForDriveState(DRIVING_STATE_PARKED));
 
         writer.name(JSON_NAME_IDLING_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mBaselineUxRestrictions.get(DRIVING_STATE_IDLING));
+        writeRestrictionsList(writer, container.getRestrictionsForDriveState(DRIVING_STATE_IDLING));
 
         writer.name(JSON_NAME_MOVING_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mBaselineUxRestrictions.get(DRIVING_STATE_MOVING));
+        writeRestrictionsList(writer, container.getRestrictionsForDriveState(DRIVING_STATE_MOVING));
 
         writer.name(JSON_NAME_UNKNOWN_RESTRICTIONS);
         writeRestrictionsList(writer,
-                mBaselineUxRestrictions.get(DRIVING_STATE_UNKNOWN));
-
-        writer.name(JSON_NAME_PASSENGER_PARKED_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mPassengerUxRestrictions.get(DRIVING_STATE_PARKED));
-
-        writer.name(JSON_NAME_PASSENGER_IDLING_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mPassengerUxRestrictions.get(DRIVING_STATE_IDLING));
-
-        writer.name(JSON_NAME_PASSENGER_MOVING_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mPassengerUxRestrictions.get(DRIVING_STATE_MOVING));
-
-        writer.name(JSON_NAME_PASSENGER_UNKNOWN_RESTRICTIONS);
-        writeRestrictionsList(writer,
-                mPassengerUxRestrictions.get(DRIVING_STATE_UNKNOWN));
-
+                container.getRestrictionsForDriveState(DRIVING_STATE_UNKNOWN));
         writer.endObject();
     }
 
@@ -319,12 +310,19 @@
     }
 
     /**
-     * Reads Json as UX restriction configuration.
+     * Reads Json as UX restriction configuration with the specified schema version.
+     *
+     * <p>Supports reading files persisted in multiple JSON schemas, including the pre-R version 1
+     * format, and the R format version 2.
      */
-    public static CarUxRestrictionsConfiguration readJson(JsonReader reader) throws IOException {
+    public static CarUxRestrictionsConfiguration readJson(@NonNull JsonReader reader,
+            int schemaVersion) throws IOException {
+        Objects.requireNonNull(reader, "reader must not be null");
         // We need to be lenient to accept infinity number (as max speed).
         reader.setLenient(true);
 
+        RestrictionConfigurationParser parser = createConfigurationParser(schemaVersion);
+
         Builder builder = new Builder();
         reader.beginObject();
         while (reader.hasNext()) {
@@ -346,6 +344,58 @@
                 case JSON_NAME_MAX_STRING_LENGTH:
                     builder.setMaxStringLength(reader.nextInt());
                     break;
+                default:
+                    parser.readJson(reader, name, builder);
+            }
+        }
+        reader.endObject();
+        return builder.build();
+    }
+
+    private static RestrictionConfigurationParser createConfigurationParser(int schemaVersion) {
+        switch (schemaVersion) {
+            case 1:
+                return new V1RestrictionConfigurationParser();
+            case 2:
+                return new V2RestrictionConfigurationParser();
+            default:
+                throw new IllegalArgumentException(
+                        "No parser supported for schemaVersion " + schemaVersion);
+        }
+    }
+
+    private interface RestrictionConfigurationParser {
+        /**
+         * Handle reading any information within a particular name and add data to the builder.
+         */
+        void readJson(JsonReader reader, String name, Builder builder) throws IOException;
+    }
+
+    private static class V2RestrictionConfigurationParser implements
+            RestrictionConfigurationParser {
+        @Override
+        public void readJson(JsonReader reader, String name, Builder builder) throws IOException {
+            readRestrictionsMode(reader, name, builder);
+        }
+    }
+
+    private static class V1RestrictionConfigurationParser implements
+            RestrictionConfigurationParser {
+
+        private static final String JSON_NAME_PASSENGER_MOVING_RESTRICTIONS =
+                "passenger_moving_restrictions";
+        private static final String JSON_NAME_PASSENGER_IDLING_RESTRICTIONS =
+                "passenger_idling_restrictions";
+        private static final String JSON_NAME_PASSENGER_PARKED_RESTRICTIONS =
+                "passenger_parked_restrictions";
+        private static final String JSON_NAME_PASSENGER_UNKNOWN_RESTRICTIONS =
+                "passenger_unknown_restrictions";
+
+        private static final String PASSENGER_MODE_NAME_FOR_MIGRATION = "passenger";
+
+        @Override
+        public void readJson(JsonReader reader, String name, Builder builder) throws IOException {
+            switch (name) {
                 case JSON_NAME_PARKED_RESTRICTIONS:
                     readRestrictionsList(reader, DRIVING_STATE_PARKED,
                             UX_RESTRICTION_MODE_BASELINE, builder);
@@ -364,31 +414,54 @@
                     break;
                 case JSON_NAME_PASSENGER_PARKED_RESTRICTIONS:
                     readRestrictionsList(reader, DRIVING_STATE_PARKED,
-                            UX_RESTRICTION_MODE_PASSENGER, builder);
+                            PASSENGER_MODE_NAME_FOR_MIGRATION, builder);
                     break;
                 case JSON_NAME_PASSENGER_IDLING_RESTRICTIONS:
                     readRestrictionsList(reader, DRIVING_STATE_IDLING,
-                            UX_RESTRICTION_MODE_PASSENGER, builder);
+                            PASSENGER_MODE_NAME_FOR_MIGRATION, builder);
                     break;
                 case JSON_NAME_PASSENGER_MOVING_RESTRICTIONS:
                     readRestrictionsList(reader, DRIVING_STATE_MOVING,
-                            UX_RESTRICTION_MODE_PASSENGER, builder);
+                            PASSENGER_MODE_NAME_FOR_MIGRATION, builder);
                     break;
                 case JSON_NAME_PASSENGER_UNKNOWN_RESTRICTIONS:
                     readRestrictionsList(reader, DRIVING_STATE_UNKNOWN,
-                            UX_RESTRICTION_MODE_PASSENGER, builder);
+                            PASSENGER_MODE_NAME_FOR_MIGRATION, builder);
                     break;
                 default:
                     Log.e(TAG, "Unknown name parsing json config: " + name);
                     reader.skipValue();
             }
         }
+    }
+
+    private static void readRestrictionsMode(JsonReader reader, String mode, Builder builder)
+            throws IOException {
+        reader.beginObject();
+        while (reader.hasNext()) {
+            String name = reader.nextName();
+            switch (name) {
+                case JSON_NAME_PARKED_RESTRICTIONS:
+                    readRestrictionsList(reader, DRIVING_STATE_PARKED, mode, builder);
+                    break;
+                case JSON_NAME_IDLING_RESTRICTIONS:
+                    readRestrictionsList(reader, DRIVING_STATE_IDLING, mode, builder);
+                    break;
+                case JSON_NAME_MOVING_RESTRICTIONS:
+                    readRestrictionsList(reader, DRIVING_STATE_MOVING, mode, builder);
+                    break;
+                case JSON_NAME_UNKNOWN_RESTRICTIONS:
+                    readRestrictionsList(reader, DRIVING_STATE_UNKNOWN, mode, builder);
+                    break;
+                default:
+                    Log.e(TAG, "Unknown name parsing restriction mode json config: " + name);
+            }
+        }
         reader.endObject();
-        return builder.build();
     }
 
     private static void readRestrictionsList(JsonReader reader, @CarDrivingState int drivingState,
-            @UxRestrictionMode int mode, Builder builder) throws IOException {
+            String mode, Builder builder) throws IOException {
         reader.beginArray();
         while (reader.hasNext()) {
             DrivingStateRestrictions drivingStateRestrictions = readRestrictions(reader);
@@ -443,9 +516,8 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(mPhysicalPort,
-                mMaxStringLength, mMaxCumulativeContentItems, mMaxContentDepth,
-                mBaselineUxRestrictions, mPassengerUxRestrictions);
+        return Objects.hash(mPhysicalPort, mMaxStringLength, mMaxCumulativeContentItems,
+                mMaxContentDepth, mRestrictionModes);
     }
 
     @Override
@@ -461,14 +533,14 @@
 
         return mPhysicalPort == other.mPhysicalPort
                 && hasSameParameters(other)
-                && mBaselineUxRestrictions.equals(other.mBaselineUxRestrictions)
-                && mPassengerUxRestrictions.equals(other.mPassengerUxRestrictions);
+                && mRestrictionModes.equals(other.mRestrictionModes);
     }
 
     /**
      * Compares {@code this} configuration object with {@code other} on restriction parameters.
      */
-    public boolean hasSameParameters(CarUxRestrictionsConfiguration other) {
+    public boolean hasSameParameters(@NonNull CarUxRestrictionsConfiguration other) {
+        Objects.requireNonNull(other, "other must not be null");
         return mMaxContentDepth == other.mMaxContentDepth
                 && mMaxCumulativeContentItems == other.mMaxCumulativeContentItems
                 && mMaxStringLength == other.mMaxStringLength;
@@ -477,17 +549,16 @@
     /**
      * Dump the driving state to UX restrictions mapping.
      */
-    public void dump(PrintWriter writer) {
+    public void dump(@NonNull PrintWriter writer) {
+        Objects.requireNonNull(writer, "writer must not be null");
         writer.println("Physical display port: " + mPhysicalPort);
 
-        writer.println("===========================================");
-        writer.println("Baseline mode UXR:");
-        writer.println("-------------------------------------------");
-        dumpRestrictions(writer, mBaselineUxRestrictions);
-
-        writer.println("Passenger mode UXR:");
-        writer.println("-------------------------------------------");
-        dumpRestrictions(writer, mPassengerUxRestrictions);
+        for (Map.Entry<String, RestrictionModeContainer> entry : mRestrictionModes.entrySet()) {
+            writer.println("===========================================");
+            writer.println(entry.getKey() + " mode UXR:");
+            writer.println("-------------------------------------------");
+            dumpRestrictions(writer, entry.getValue().mDriveStateUxRestrictions);
+        }
 
         writer.println("Max String length: " + mMaxStringLength);
         writer.println("Max Cumulative Content Items: " + mMaxCumulativeContentItems);
@@ -531,7 +602,7 @@
     // Parcelable methods/fields.
 
     // Used by Parcel methods to ensure de/serialization order.
-    private static final int[] DRIVING_STATES = new int[] {
+    private static final int[] DRIVING_STATES = new int[]{
             DRIVING_STATE_UNKNOWN,
             DRIVING_STATE_PARKED,
             DRIVING_STATE_IDLING,
@@ -541,16 +612,16 @@
     public static final Parcelable.Creator<CarUxRestrictionsConfiguration> CREATOR =
             new Parcelable.Creator<CarUxRestrictionsConfiguration>() {
 
-        @Override
-        public CarUxRestrictionsConfiguration createFromParcel(Parcel source) {
-            return new CarUxRestrictionsConfiguration(source);
-        }
+                @Override
+                public CarUxRestrictionsConfiguration createFromParcel(Parcel source) {
+                    return new CarUxRestrictionsConfiguration(source);
+                }
 
-        @Override
-        public CarUxRestrictionsConfiguration[] newArray(int size) {
-            return new CarUxRestrictionsConfiguration[size];
-        }
-    };
+                @Override
+                public CarUxRestrictionsConfiguration[] newArray(int size) {
+                    return new CarUxRestrictionsConfiguration[size];
+                }
+            };
 
     @Override
     public int describeContents() {
@@ -558,16 +629,18 @@
     }
 
     private CarUxRestrictionsConfiguration(Parcel in) {
-        for (int drivingState : DRIVING_STATES) {
-            List<RestrictionsPerSpeedRange> restrictions = new ArrayList<>();
-            in.readTypedList(restrictions, RestrictionsPerSpeedRange.CREATOR);
-            mBaselineUxRestrictions.put(drivingState, restrictions);
+        int modesCount = in.readInt();
+        for (int i = 0; i < modesCount; i++) {
+            String modeName = in.readString();
+            RestrictionModeContainer container = new RestrictionModeContainer();
+            for (int drivingState : DRIVING_STATES) {
+                List<RestrictionsPerSpeedRange> restrictions = new ArrayList<>();
+                in.readTypedList(restrictions, RestrictionsPerSpeedRange.CREATOR);
+                container.setRestrictionsForDriveState(drivingState, restrictions);
+            }
+            mRestrictionModes.put(modeName, container);
         }
-        for (int drivingState : DRIVING_STATES) {
-            List<RestrictionsPerSpeedRange> restrictions = new ArrayList<>();
-            in.readTypedList(restrictions, RestrictionsPerSpeedRange.CREATOR);
-            mPassengerUxRestrictions.put(drivingState, restrictions);
-        }
+
         boolean nullPhysicalPort = in.readBoolean();
         byte physicalPort = in.readByte();
         mPhysicalPort = nullPhysicalPort ? null : physicalPort;
@@ -579,11 +652,12 @@
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        for (int drivingState : DRIVING_STATES) {
-            dest.writeTypedList(mBaselineUxRestrictions.get(drivingState));
-        }
-        for (int drivingState : DRIVING_STATES) {
-            dest.writeTypedList(mPassengerUxRestrictions.get(drivingState));
+        dest.writeInt(mRestrictionModes.size());
+        for (Map.Entry<String, RestrictionModeContainer> entry : mRestrictionModes.entrySet()) {
+            dest.writeString(entry.getKey());
+            for (int drivingState : DRIVING_STATES) {
+                dest.writeTypedList(entry.getValue().getRestrictionsForDriveState(drivingState));
+            }
         }
         boolean nullPhysicalPort = mPhysicalPort == null;
         dest.writeBoolean(nullPhysicalPort);
@@ -626,16 +700,10 @@
         private int mMaxCumulativeContentItems = UX_RESTRICTIONS_UNKNOWN;
         private int mMaxStringLength = UX_RESTRICTIONS_UNKNOWN;
 
-        public Map<Integer, List<RestrictionsPerSpeedRange>> mPassengerUxRestrictions =
-                new ArrayMap<>(DRIVING_STATES.length);
-        public Map<Integer, List<RestrictionsPerSpeedRange>> mBaselineUxRestrictions =
-                new ArrayMap<>(DRIVING_STATES.length);
+        public final Map<String, RestrictionModeContainer> mRestrictionModes = new ArrayMap<>();
 
         public Builder() {
-            for (int drivingState : DRIVING_STATES) {
-                mBaselineUxRestrictions.put(drivingState, new ArrayList<>());
-                mPassengerUxRestrictions.put(drivingState, new ArrayList<>());
-            }
+            mRestrictionModes.put(UX_RESTRICTION_MODE_BASELINE, new RestrictionModeContainer());
         }
 
         /**
@@ -665,16 +733,16 @@
         /**
          * Sets UX restrictions with speed range.
          *
-         * @param drivingState Restrictions will be set for this Driving state.
-         *                     See constants in {@link CarDrivingStateEvent}.
-         * @param speedRange If set, restrictions will only apply when current speed is within
-         *                   the range. Only {@link CarDrivingStateEvent#DRIVING_STATE_MOVING}
-         *                   supports speed range. {@code null} implies the full speed range,
-         *                   i.e. zero to {@link SpeedRange#MAX_SPEED}.
+         * @param drivingState         Restrictions will be set for this Driving state.
+         *                             See constants in {@link CarDrivingStateEvent}.
+         * @param speedRange           If set, restrictions will only apply when current speed is
+         *                             within the range. Only
+         *                             {@link CarDrivingStateEvent#DRIVING_STATE_MOVING}
+         *                             supports speed range. {@code null} implies the full speed
+         *                             range, i.e. zero to {@link SpeedRange#MAX_SPEED}.
          * @param requiresOptimization Whether distraction optimization (DO) is required for this
          *                             driving state.
-         * @param restrictions See constants in {@link CarUxRestrictions}.
-         *
+         * @param restrictions         See constants in {@link CarUxRestrictions}.
          * @deprecated Use {@link #setUxRestrictions(int, DrivingStateRestrictions)} instead.
          */
         @Deprecated
@@ -690,10 +758,9 @@
         /**
          * Sets UX restriction.
          *
-         * @param drivingState Restrictions will be set for this Driving state.
-         *                     See constants in {@link CarDrivingStateEvent}.
+         * @param drivingState             Restrictions will be set for this Driving state.
+         *                                 See constants in {@link CarDrivingStateEvent}.
          * @param drivingStateRestrictions Restrictions to set.
-         *
          * @return This builder object for method chaining.
          */
         public Builder setUxRestrictions(
@@ -705,22 +772,13 @@
                         "Non-moving driving state should not specify speed range.");
             }
 
-            List<RestrictionsPerSpeedRange> restrictions;
-            switch (drivingStateRestrictions.mMode) {
-                case UX_RESTRICTION_MODE_BASELINE:
-                    restrictions = mBaselineUxRestrictions.get(drivingState);
-                    break;
-                case UX_RESTRICTION_MODE_PASSENGER:
-                    restrictions = mPassengerUxRestrictions.get(drivingState);
-                    break;
-                default:
-                    String mode = CarUxRestrictionsManager.modeToString(
-                            drivingStateRestrictions.mMode);
-                    throw new IllegalArgumentException("Unrecognized restriction mode " + mode);
-            }
-            restrictions.add(new RestrictionsPerSpeedRange(
-                    drivingStateRestrictions.mMode, drivingStateRestrictions.mReqOpt,
-                    drivingStateRestrictions.mRestrictions, speedRange));
+            RestrictionModeContainer container = mRestrictionModes.computeIfAbsent(
+                    drivingStateRestrictions.mMode, mode -> new RestrictionModeContainer());
+
+            container.getRestrictionsForDriveState(drivingState).add(
+                    new RestrictionsPerSpeedRange(
+                            drivingStateRestrictions.mMode, drivingStateRestrictions.mReqOpt,
+                            drivingStateRestrictions.mRestrictions, speedRange));
             return this;
         }
 
@@ -757,15 +815,22 @@
             addDefaultRestrictionsToBaseline();
 
             validateBaselineModeRestrictions();
-            validatePassengerModeRestrictions();
+            for (String mode : mRestrictionModes.keySet()) {
+                if (UX_RESTRICTION_MODE_BASELINE.equals(mode)) {
+                    continue;
+                }
+                validateModeRestrictions(mode);
+            }
 
             return new CarUxRestrictionsConfiguration(this);
         }
 
         private void addDefaultRestrictionsToBaseline() {
+            RestrictionModeContainer container = mRestrictionModes.get(
+                    UX_RESTRICTION_MODE_BASELINE);
             for (int drivingState : DRIVING_STATES) {
                 List<RestrictionsPerSpeedRange> restrictions =
-                        mBaselineUxRestrictions.get(drivingState);
+                        container.getRestrictionsForDriveState(drivingState);
                 if (restrictions.size() == 0) {
                     Log.i(TAG, "Using default restrictions for driving state: "
                             + getDrivingStateName(drivingState));
@@ -776,9 +841,11 @@
         }
 
         private void validateBaselineModeRestrictions() {
+            RestrictionModeContainer container = mRestrictionModes.get(
+                    UX_RESTRICTION_MODE_BASELINE);
             for (int drivingState : DRIVING_STATES) {
                 List<RestrictionsPerSpeedRange> restrictions =
-                        mBaselineUxRestrictions.get(drivingState);
+                        container.getRestrictionsForDriveState(drivingState);
                 if (drivingState != DRIVING_STATE_MOVING) {
                     // Note: For non-moving state, setUxRestrictions() rejects UxRestriction with
                     // speed range, so we don't check here.
@@ -809,13 +876,17 @@
             }
         }
 
-        private void validatePassengerModeRestrictions() {
-            List<RestrictionsPerSpeedRange> passengerMovingRestrictions =
-                    mPassengerUxRestrictions.get(DRIVING_STATE_MOVING);
-            Collections.sort(passengerMovingRestrictions,
+        private void validateModeRestrictions(String mode) {
+            if (!mRestrictionModes.containsKey(mode)) {
+                return;
+            }
+            RestrictionModeContainer container = mRestrictionModes.get(mode);
+            List<RestrictionsPerSpeedRange> movingRestrictions =
+                    container.getRestrictionsForDriveState(DRIVING_STATE_MOVING);
+            Collections.sort(movingRestrictions,
                     Comparator.comparing(RestrictionsPerSpeedRange::getSpeedRange));
 
-            validateContinuousSpeedRange(passengerMovingRestrictions);
+            validateContinuousSpeedRange(movingRestrictions);
         }
 
         /**
@@ -909,7 +980,7 @@
                 mMaxSpeed = maxSpeed;
             }
 
-             /**
+            /**
              * Return if the given speed is in the range of [minSpeed, maxSpeed).
              *
              * @param speed Speed to check
@@ -965,16 +1036,15 @@
      * These UX restrictions can also specified to be only applicable to certain speed range and
      * restriction mode.
      *
-     * @see UxRestrictionMode
-     * @see Builder.SpeedRange
-     *
      * @hide
+     * @see Builder.SpeedRange
      */
     public static final class DrivingStateRestrictions {
-        private int mMode = UX_RESTRICTION_MODE_BASELINE;
+        private String mMode = UX_RESTRICTION_MODE_BASELINE;
         private boolean mReqOpt = true;
         private int mRestrictions = CarUxRestrictions.UX_RESTRICTIONS_FULLY_RESTRICTED;
-        @Nullable private Builder.SpeedRange mSpeedRange;
+        @Nullable
+        private Builder.SpeedRange mSpeedRange;
 
         /**
          * Sets whether Distraction Optimization (DO) is required. Defaults to {@code true}.
@@ -999,8 +1069,8 @@
          * Sets restriction mode to apply to.
          * Defaults to {@link CarUxRestrictionsManager#UX_RESTRICTION_MODE_BASELINE}.
          */
-        public DrivingStateRestrictions setMode(@UxRestrictionMode int mode) {
-            mMode = mode;
+        public DrivingStateRestrictions setMode(@NonNull String mode) {
+            mMode = Objects.requireNonNull(mode, "mode must not be null");
             return this;
         }
 
@@ -1016,7 +1086,7 @@
         @Override
         public String toString() {
             return new StringBuilder()
-                    .append("Mode: ").append(CarUxRestrictionsManager.modeToString(mMode))
+                    .append("Mode: ").append(mMode)
                     .append(". Requires DO? ").append(mReqOpt)
                     .append(". Restrictions: ").append(Integer.toBinaryString(mRestrictions))
                     .append(". SpeedRange: ")
@@ -1030,8 +1100,7 @@
      * Speed range is valid only for the {@link CarDrivingStateEvent#DRIVING_STATE_MOVING}.
      */
     private static final class RestrictionsPerSpeedRange implements Parcelable {
-        @UxRestrictionMode
-        final int mMode;
+        final String mMode;
         final boolean mReqOpt;
         final int mRestrictions;
         @Nullable
@@ -1041,13 +1110,13 @@
             this(UX_RESTRICTION_MODE_BASELINE, reqOpt, restrictions, null);
         }
 
-        RestrictionsPerSpeedRange(@UxRestrictionMode int mode, boolean reqOpt, int restrictions,
+        RestrictionsPerSpeedRange(@NonNull String mode, boolean reqOpt, int restrictions,
                 @Nullable Builder.SpeedRange speedRange) {
             if (!reqOpt && restrictions != CarUxRestrictions.UX_RESTRICTIONS_BASELINE) {
                 throw new IllegalArgumentException(
                         "Driving optimization is not required but UX restrictions is required.");
             }
-            mMode = mode;
+            mMode = Objects.requireNonNull(mode, "mode must not be null");
             mReqOpt = reqOpt;
             mRestrictions = restrictions;
             mSpeedRange = speedRange;
@@ -1071,7 +1140,7 @@
                 return false;
             }
             RestrictionsPerSpeedRange other = (RestrictionsPerSpeedRange) obj;
-            return mMode == other.mMode
+            return Objects.equals(mMode, other.mMode)
                     && mReqOpt == other.mReqOpt
                     && mRestrictions == other.mRestrictions
                     && Objects.equals(mSpeedRange, other.mSpeedRange);
@@ -1080,7 +1149,7 @@
         @Override
         public String toString() {
             return new StringBuilder()
-                    .append("[Mode is ").append(CarUxRestrictionsManager.modeToString(mMode))
+                    .append("[Mode is ").append(mMode)
                     .append("; Requires DO? ").append(mReqOpt)
                     .append("; Restrictions: ").append(Integer.toBinaryString(mRestrictions))
                     .append("; Speed range: ")
@@ -1110,7 +1179,7 @@
         }
 
         protected RestrictionsPerSpeedRange(Parcel in) {
-            mMode = in.readInt();
+            mMode = in.readString();
             mReqOpt = in.readBoolean();
             mRestrictions = in.readInt();
             // Whether speed range is specified.
@@ -1125,7 +1194,7 @@
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(mMode);
+            dest.writeString(mMode);
             dest.writeBoolean(mReqOpt);
             dest.writeInt(mRestrictions);
             // Whether speed range is specified.
@@ -1136,4 +1205,55 @@
             }
         }
     }
+
+    /**
+     * All the restriction configurations for a particular mode.
+     */
+    private static final class RestrictionModeContainer {
+        /**
+         * Mapping from drive state to the list of applicable restrictions.
+         */
+        private final Map<Integer, List<RestrictionsPerSpeedRange>> mDriveStateUxRestrictions =
+                new ArrayMap<>(DRIVING_STATES.length);
+
+        RestrictionModeContainer() {
+            for (int drivingState : DRIVING_STATES) {
+                mDriveStateUxRestrictions.put(drivingState, new ArrayList<>());
+            }
+        }
+
+        /**
+         * Returns the restrictions for a particular drive state.
+         */
+        @NonNull
+        List<RestrictionsPerSpeedRange> getRestrictionsForDriveState(
+                @CarDrivingState int driveState) {
+            // Guaranteed not to be null since a container is initialized with empty lists for
+            // each drive state in the constructor.
+            return mDriveStateUxRestrictions.get(driveState);
+        }
+
+        void setRestrictionsForDriveState(@CarDrivingState int driveState,
+                @NonNull List<RestrictionsPerSpeedRange> restrictions) {
+            Objects.requireNonNull(restrictions, "null restrictions are not allows");
+            mDriveStateUxRestrictions.put(driveState, restrictions);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof RestrictionModeContainer)) {
+                return false;
+            }
+            RestrictionModeContainer container = (RestrictionModeContainer) obj;
+            return Objects.equals(mDriveStateUxRestrictions, container.mDriveStateUxRestrictions);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(mDriveStateUxRestrictions);
+        }
+    }
 }
diff --git a/car-lib/src/android/car/drivingstate/CarUxRestrictionsManager.java b/car-lib/src/android/car/drivingstate/CarUxRestrictionsManager.java
index 9a3d5cf..1557e6e 100644
--- a/car-lib/src/android/car/drivingstate/CarUxRestrictionsManager.java
+++ b/car-lib/src/android/car/drivingstate/CarUxRestrictionsManager.java
@@ -16,13 +16,11 @@
 
 package android.car.drivingstate;
 
-import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
 import android.car.Car;
 import android.car.CarManagerBase;
-import android.content.Context;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -33,17 +31,16 @@
 
 import com.android.internal.annotations.GuardedBy;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * API to register and get the User Experience restrictions imposed based on the car's driving
  * state.
  */
-public final class CarUxRestrictionsManager implements CarManagerBase {
+public final class CarUxRestrictionsManager extends CarManagerBase {
     private static final String TAG = "CarUxRManager";
     private static final boolean DBG = false;
     private static final boolean VDBG = false;
@@ -54,33 +51,8 @@
      *
      * @hide
      */
-    public static final int UX_RESTRICTION_MODE_BASELINE = 0;
-    /**
-     * Passenger restriction mode uses UX restrictions for {@link #UX_RESTRICTION_MODE_PASSENGER},
-     * set through {@link CarUxRestrictionsConfiguration.Builder.UxRestrictions#setMode(int)}.
-     *
-     * <p>If a new {@link CarUxRestrictions} is available upon mode transition, it'll be immediately
-     * dispatched to listeners.
-     *
-     * <p>If passenger mode restrictions is not configured for current driving state, it will fall
-     * back to {@link #UX_RESTRICTION_MODE_BASELINE}.
-     *
-     * <p>Caller are responsible for determining and executing the criteria for entering and exiting
-     * this mode. Exiting by setting mode to {@link #UX_RESTRICTION_MODE_BASELINE}.
-     *
-     * @hide
-     */
-    public static final int UX_RESTRICTION_MODE_PASSENGER = 1;
+    public static final String UX_RESTRICTION_MODE_BASELINE = "baseline";
 
-    /** @hide */
-    @IntDef(prefix = { "UX_RESTRICTION_MODE_" }, value = {
-            UX_RESTRICTION_MODE_BASELINE,
-            UX_RESTRICTION_MODE_PASSENGER
-    })
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface UxRestrictionMode {}
-
-    private final Context mContext;
     private int mDisplayId = Display.INVALID_DISPLAY;
     private final ICarUxRestrictionsManager mUxRService;
     private final EventCallbackHandler mEventCallbackHandler;
@@ -89,10 +61,11 @@
     private CarUxRestrictionsChangeListenerToService mListenerToService;
 
     /** @hide */
-    public CarUxRestrictionsManager(IBinder service, Context context, Handler handler) {
-        mContext = context;
+    public CarUxRestrictionsManager(Car car, IBinder service) {
+        super(car);
         mUxRService = ICarUxRestrictionsManager.Stub.asInterface(service);
-        mEventCallbackHandler = new EventCallbackHandler(this, handler.getLooper());
+        mEventCallbackHandler = new EventCallbackHandler(this,
+                getEventHandler().getLooper());
     }
 
     /** @hide */
@@ -152,7 +125,7 @@
             // register to the Service to listen for changes.
             mUxRService.registerUxRestrictionsChangeListener(mListenerToService, displayId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -172,7 +145,7 @@
         try {
             mUxRService.unregisterUxRestrictionsChangeListener(mListenerToService);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -188,7 +161,6 @@
      *
      * @param configs Map of display Id to UX restrictions configurations to be persisted.
      * @return {@code true} if input config was successfully saved; {@code false} otherwise.
-     *
      * @hide
      */
     @RequiresPermission(value = Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION)
@@ -197,7 +169,7 @@
         try {
             return mUxRService.saveUxRestrictionsConfigurationForNextBoot(configs);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -219,36 +191,53 @@
         try {
             return mUxRService.getCurrentUxRestrictions(displayId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
     /**
      * Sets restriction mode. Returns {@code true} if the operation succeeds.
      *
+     * <p>The default mode is {@link #UX_RESTRICTION_MODE_BASELINE}.
+     *
+     * <p>If a new {@link CarUxRestrictions} is available upon mode transition, it'll
+     * be immediately dispatched to listeners.
+     *
+     * <p>If the given mode is not configured for current driving state, it
+     * will fall back to the default value.
+     *
+     * <p>If a configuration was set for a passenger mode before an upgrade to Android R, that
+     * passenger configuration is now called "passenger".
+     *
      * @hide
      */
     @RequiresPermission(value = Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION)
-    public boolean setRestrictionMode(@UxRestrictionMode int mode) {
+    public boolean setRestrictionMode(@NonNull String mode) {
+        Objects.requireNonNull(mode, "mode must not be null");
         try {
             return mUxRService.setRestrictionMode(mode);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
     /**
      * Returns the current restriction mode.
      *
+     * <p>The default mode is {@link #UX_RESTRICTION_MODE_BASELINE}.
+     *
+     * <p>If a configuration was set for a passenger mode before an upgrade to Android R, that
+     * passenger configuration is now called "passenger".
+     *
      * @hide
      */
     @RequiresPermission(value = Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION)
-    @UxRestrictionMode
-    public int getRestrictionMode() {
+    @NonNull
+    public String getRestrictionMode() {
         try {
             return mUxRService.getRestrictionMode();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -260,7 +249,6 @@
      *
      * @param config UX restrictions configuration to be persisted.
      * @return {@code true} if input config was successfully saved; {@code false} otherwise.
-     *
      * @hide
      */
     @RequiresPermission(value = Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION)
@@ -279,7 +267,6 @@
      * This methods is only for test purpose, please do not use in production.
      *
      * @return current staged configuration, {@code null} if it's not available
-     *
      * @hide
      */
     @Nullable
@@ -288,7 +275,7 @@
         try {
             return mUxRService.getStagedConfigs();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -296,7 +283,6 @@
      * Gets the current configurations.
      *
      * @return current configurations that is in effect.
-     *
      * @hide
      */
     @RequiresPermission(value = Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION)
@@ -304,21 +290,7 @@
         try {
             return mUxRService.getConfigs();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
-    /**
-     * @hide
-     */
-    public static String modeToString(@UxRestrictionMode int mode) {
-        switch (mode) {
-            case UX_RESTRICTION_MODE_BASELINE:
-                return "baseline";
-            case UX_RESTRICTION_MODE_PASSENGER:
-                return "passenger";
-            default:
-                throw new IllegalArgumentException("Unrecognized restriction mode " + mode);
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -399,7 +371,7 @@
             return mDisplayId;
         }
 
-        mDisplayId = mContext.getDisplayId();
+        mDisplayId = getContext().getDisplayId();
         Log.i(TAG, "Context returns display ID " + mDisplayId);
 
         if (mDisplayId == Display.INVALID_DISPLAY) {
diff --git a/car-lib/src/android/car/drivingstate/ICarUxRestrictionsManager.aidl b/car-lib/src/android/car/drivingstate/ICarUxRestrictionsManager.aidl
index 7f3a6e9..8c9afd7 100644
--- a/car-lib/src/android/car/drivingstate/ICarUxRestrictionsManager.aidl
+++ b/car-lib/src/android/car/drivingstate/ICarUxRestrictionsManager.aidl
@@ -34,6 +34,8 @@
     boolean saveUxRestrictionsConfigurationForNextBoot(in List<CarUxRestrictionsConfiguration> configs) = 3;
     List<CarUxRestrictionsConfiguration> getStagedConfigs() = 4;
     List<CarUxRestrictionsConfiguration> getConfigs() = 5;
-    boolean setRestrictionMode(int mode) = 6;
-    int getRestrictionMode() = 7;
+    // 6 removed. Do not use - boolean setRestrictionMode(int mode) = 6;
+    // 7 removed. Do not use - int getRestrictionMode() = 7;
+    boolean setRestrictionMode(String mode) = 10;
+    String getRestrictionMode() = 11;
 }
diff --git a/car-lib/src/android/car/hardware/CarSensorManager.java b/car-lib/src/android/car/hardware/CarSensorManager.java
index d61cb2e..082c8eb 100644
--- a/car-lib/src/android/car/hardware/CarSensorManager.java
+++ b/car-lib/src/android/car/hardware/CarSensorManager.java
@@ -26,9 +26,7 @@
 import android.car.hardware.property.CarPropertyManager;
 import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
 import android.car.hardware.property.ICarProperty;
-import android.content.Context;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.IBinder;
 import android.util.ArraySet;
 import android.util.Log;
@@ -46,7 +44,7 @@
  *  API for monitoring car sensor data.
  */
 @Deprecated
-public final class CarSensorManager implements CarManagerBase {
+public final class CarSensorManager extends CarManagerBase {
     private static final String TAG = "CarSensorManager";
     private final CarPropertyManager mCarPropertyMgr;
     /** @hide */
@@ -304,9 +302,10 @@
 
     }
     /** @hide */
-    public CarSensorManager(IBinder service, Context context, Handler handler) {
+    public CarSensorManager(Car car, IBinder service) {
+        super(car);
         ICarProperty mCarPropertyService = ICarProperty.Stub.asInterface(service);
-        mCarPropertyMgr = new CarPropertyManager(mCarPropertyService, handler);
+        mCarPropertyMgr = new CarPropertyManager(car, mCarPropertyService);
     }
 
     /** @hide */
diff --git a/car-lib/src/android/car/hardware/CarVendorExtensionManager.java b/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
index e7df3b0..b796156 100644
--- a/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
+++ b/car-lib/src/android/car/hardware/CarVendorExtensionManager.java
@@ -22,7 +22,6 @@
 import android.car.hardware.property.CarPropertyManager;
 import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
 import android.car.hardware.property.ICarProperty;
-import android.os.Handler;
 import android.os.IBinder;
 import android.util.ArraySet;
 
@@ -44,7 +43,7 @@
  */
 @Deprecated
 @SystemApi
-public final class CarVendorExtensionManager implements CarManagerBase {
+public final class CarVendorExtensionManager extends CarManagerBase {
 
     private final static boolean DBG = false;
     private final static String TAG = CarVendorExtensionManager.class.getSimpleName();
@@ -84,9 +83,10 @@
      * <p>Should not be obtained directly by clients, use {@link Car#getCarManager(String)} instead.
      * @hide
      */
-    public CarVendorExtensionManager(IBinder service, Handler handler) {
+    public CarVendorExtensionManager(Car car, IBinder service) {
+        super(car);
         ICarProperty mCarPropertyService = ICarProperty.Stub.asInterface(service);
-        mPropertyManager = new CarPropertyManager(mCarPropertyService, handler);
+        mPropertyManager = new CarPropertyManager(car, mCarPropertyService);
     }
 
     /**
@@ -206,6 +206,9 @@
     /** @hide */
     @Override
     public void onCarDisconnected() {
+        synchronized (mLock) {
+            mCallbacks.clear();
+        }
         mPropertyManager.onCarDisconnected();
     }
     private static class CarPropertyEventListenerToBase implements CarPropertyEventCallback {
diff --git a/car-lib/src/android/car/hardware/cabin/CarCabinManager.java b/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
index 1c41a2b..7318176 100644
--- a/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
+++ b/car-lib/src/android/car/hardware/cabin/CarCabinManager.java
@@ -25,8 +25,6 @@
 import android.car.hardware.property.CarPropertyManager;
 import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
 import android.car.hardware.property.ICarProperty;
-import android.content.Context;
-import android.os.Handler;
 import android.os.IBinder;
 import android.util.ArraySet;
 
@@ -58,7 +56,7 @@
  */
 @Deprecated
 @SystemApi
-public final class CarCabinManager implements CarManagerBase {
+public final class CarCabinManager extends CarManagerBase {
     private final static boolean DBG = false;
     private final static String TAG = "CarCabinManager";
     private final CarPropertyManager mCarPropertyMgr;
@@ -470,9 +468,10 @@
      * @param handler
      * @hide
      */
-    public CarCabinManager(IBinder service, Context context, Handler handler) {
+    public CarCabinManager(Car car, IBinder service) {
+        super(car);
         ICarProperty mCarPropertyService = ICarProperty.Stub.asInterface(service);
-        mCarPropertyMgr = new CarPropertyManager(mCarPropertyService, handler);
+        mCarPropertyMgr = new CarPropertyManager(car, mCarPropertyService);
     }
 
     /**
@@ -594,6 +593,10 @@
     /** @hide */
     @Override
     public void onCarDisconnected() {
+        // TODO(b/142730969) Fix synchronization to use separate mLock
+        synchronized (this) {
+            mCallbacks.clear();
+        }
         mCarPropertyMgr.onCarDisconnected();
     }
 }
diff --git a/car-lib/src/android/car/hardware/hvac/CarHvacManager.java b/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
index b2b8014..3ab7631 100644
--- a/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
+++ b/car-lib/src/android/car/hardware/hvac/CarHvacManager.java
@@ -25,8 +25,6 @@
 import android.car.hardware.property.CarPropertyManager;
 import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
 import android.car.hardware.property.ICarProperty;
-import android.content.Context;
-import android.os.Handler;
 import android.os.IBinder;
 import android.util.ArraySet;
 import android.util.Log;
@@ -46,7 +44,7 @@
  */
 @Deprecated
 @SystemApi
-public final class CarHvacManager implements CarManagerBase {
+public final class CarHvacManager extends CarManagerBase {
     private final static boolean DBG = false;
     private final static String TAG = "CarHvacManager";
     private final CarPropertyManager mCarPropertyMgr;
@@ -301,14 +299,15 @@
      *
      * Should not be obtained directly by clients, use {@link Car#getCarManager(String)} instead.
      * @param service
-     * @param context
-     * @param handler
+     *
      * @hide
      */
-    public CarHvacManager(IBinder service, Context context, Handler handler) {
+    public CarHvacManager(Car car, IBinder service) {
+        super(car);
         ICarProperty mCarPropertyService = ICarProperty.Stub.asInterface(service);
-        mCarPropertyMgr = new CarPropertyManager(mCarPropertyService, handler);
+        mCarPropertyMgr = new CarPropertyManager(car, mCarPropertyService);
     }
+
     /**
      * Implement wrappers for contained CarPropertyManager object
      * @param callback
@@ -432,6 +431,10 @@
 
     /** @hide */
     public void onCarDisconnected() {
+        // TODO(b/142730482) Fix synchronization to use separate mLock
+        synchronized (this) {
+            mCallbacks.clear();
+        }
         mCarPropertyMgr.onCarDisconnected();
     }
 }
diff --git a/car-lib/src/android/car/hardware/power/CarPowerManager.java b/car-lib/src/android/car/hardware/power/CarPowerManager.java
index 3d9a23a..4b0e8cf 100644
--- a/car-lib/src/android/car/hardware/power/CarPowerManager.java
+++ b/car-lib/src/android/car/hardware/power/CarPowerManager.java
@@ -19,8 +19,6 @@
 import android.annotation.SystemApi;
 import android.car.Car;
 import android.car.CarManagerBase;
-import android.content.Context;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
@@ -35,15 +33,18 @@
  * @hide
  */
 @SystemApi
-public class CarPowerManager implements CarManagerBase {
+public class CarPowerManager extends CarManagerBase {
     private final static boolean DBG = false;
     private final static String TAG = "CarPowerManager";
 
     private final Object mLock = new Object();
     private final ICarPower mService;
 
+    @GuardedBy("mLock")
     private CarPowerStateListener mListener;
+    @GuardedBy("mLock")
     private CarPowerStateListenerWithCompletion mListenerWithCompletion;
+    @GuardedBy("mLock")
     private CompletableFuture<Void> mFuture;
     @GuardedBy("mLock")
     private ICarPowerStateListener mListenerToService;
@@ -131,7 +132,8 @@
      * @param handler
      * @hide
      */
-    public CarPowerManager(IBinder service, Context context, Handler handler) {
+    public CarPowerManager(Car car, IBinder service) {
+        super(car);
         mService = ICarPower.Stub.asInterface(service);
     }
 
@@ -143,7 +145,7 @@
         try {
             mService.requestShutdownOnNextSuspend();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -155,7 +157,7 @@
         try {
             mService.scheduleNextWakeupTime(seconds);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -209,13 +211,23 @@
                 @Override
                 public void onStateChanged(int state) throws RemoteException {
                     if (useCompletion) {
-                        // Update CompletableFuture. This will recreate it or just clean it up.
-                        updateFuture(state);
+                        CarPowerStateListenerWithCompletion listenerWithCompletion;
+                        CompletableFuture<Void> future;
+                        synchronized (mLock) {
+                            // Update CompletableFuture. This will recreate it or just clean it up.
+                            updateFutureLocked(state);
+                            listenerWithCompletion = mListenerWithCompletion;
+                            future = mFuture;
+                        }
                         // Notify user that the state has changed and supply a future
-                        mListenerWithCompletion.onStateChanged(state, mFuture);
+                        listenerWithCompletion.onStateChanged(state, future);
                     } else {
+                        CarPowerStateListener listener;
+                        synchronized (mLock) {
+                            listener = mListener;
+                        }
                         // Notify the user without supplying a future
-                        mListener.onStateChanged(state);
+                        listener.onStateChanged(state);
                     }
                 }
             };
@@ -227,7 +239,7 @@
                 }
                 mListenerToService = listenerToService;
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                handleRemoteExceptionFromCarService(e);
             }
         }
     }
@@ -243,7 +255,7 @@
             mListenerToService = null;
             mListener = null;
             mListenerWithCompletion = null;
-            cleanupFuture();
+            cleanupFutureLocked();
         }
 
         if (listenerToService == null) {
@@ -254,12 +266,12 @@
         try {
             mService.unregisterListener(listenerToService);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
-    private void updateFuture(int state) {
-        cleanupFuture();
+    private void updateFutureLocked(int state) {
+        cleanupFutureLocked();
         if (state == CarPowerStateListener.SHUTDOWN_PREPARE) {
             // Create a CompletableFuture and pass it to the listener.
             // When the listener completes the future, tell
@@ -269,16 +281,20 @@
                 if (exception != null && !(exception instanceof CancellationException)) {
                     Log.e(TAG, "Exception occurred while waiting for future", exception);
                 }
+                ICarPowerStateListener listenerToService;
+                synchronized (mLock) {
+                    listenerToService = mListenerToService;
+                }
                 try {
-                    mService.finished(mListenerToService);
+                    mService.finished(listenerToService);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
             });
         }
     }
 
-    private void cleanupFuture() {
+    private void cleanupFutureLocked() {
         if (mFuture != null) {
             if (!mFuture.isDone()) {
                 mFuture.cancel(false);
@@ -290,13 +306,9 @@
     /** @hide */
     @Override
     public void onCarDisconnected() {
-        ICarPowerStateListener listenerToService;
         synchronized (mLock) {
-            listenerToService = mListenerToService;
-        }
-
-        if (listenerToService != null) {
-            clearListener();
+            mListener = null;
+            mListenerWithCompletion = null;
         }
     }
 }
diff --git a/car-lib/src/android/car/hardware/property/CarPropertyManager.java b/car-lib/src/android/car/hardware/property/CarPropertyManager.java
index 3f7da1d..be4766b 100644
--- a/car-lib/src/android/car/hardware/property/CarPropertyManager.java
+++ b/car-lib/src/android/car/hardware/property/CarPropertyManager.java
@@ -21,6 +21,7 @@
 import android.annotation.FloatRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.car.Car;
 import android.car.CarManagerBase;
 import android.car.hardware.CarPropertyConfig;
 import android.car.hardware.CarPropertyValue;
@@ -44,7 +45,7 @@
  * For details about the individual properties, see the descriptions in
  * hardware/interfaces/automotive/vehicle/types.hal
  */
-public class CarPropertyManager implements CarManagerBase {
+public class CarPropertyManager extends CarManagerBase {
     private static final boolean DBG = false;
     private static final String TAG = "CarPropertyManager";
     private static final int MSG_GENERIC_EVENT = 0;
@@ -93,11 +94,12 @@
      * Get an instance of the CarPropertyManager.
      *
      * Should not be obtained directly by clients, use {@link Car#getCarManager(String)} instead.
+     * @param car Car instance
      * @param service ICarProperty instance
-     * @param handler The handler to deal with CarPropertyEvent.
      * @hide
      */
-    public CarPropertyManager(@NonNull ICarProperty service, @Nullable Handler handler) {
+    public CarPropertyManager(Car car, @NonNull ICarProperty service) {
+        super(car);
         mService = service;
         try {
             List<CarPropertyConfig> configs = mService.getPropertyList();
@@ -108,11 +110,12 @@
             Log.e(TAG, "getPropertyList exception ", e);
             throw new RuntimeException(e);
         }
-        if (handler == null) {
+        Handler eventHandler = getEventHandler();
+        if (eventHandler == null) {
             mHandler = null;
             return;
         }
-        mHandler = new SingleMessageHandler<CarPropertyEvent>(handler.getLooper(),
+        mHandler = new SingleMessageHandler<CarPropertyEvent>(eventHandler.getLooper(),
             MSG_GENERIC_EVENT) {
             @Override
             protected void handleEvent(CarPropertyEvent event) {
@@ -206,7 +209,7 @@
         try {
             mService.registerListener(propertyId, rate, mCarPropertyEventToService);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
         return true;
     }
@@ -274,7 +277,8 @@
                 try {
                     mService.unregisterListener(propertyId, mCarPropertyEventToService);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
+                    // continue for local clean-up
                 }
                 mActivePropertyListener.remove(propertyId);
             } else if (needsServerUpdate) {
@@ -327,7 +331,7 @@
         try {
             return mService.getReadPermission(propId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, "");
         }
     }
 
@@ -346,7 +350,7 @@
         try {
             return mService.getWritePermission(propId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, "");
         }
     }
 
@@ -363,7 +367,7 @@
             return (propValue != null)
                     && (propValue.getStatus() == CarPropertyValue.STATUS_AVAILABLE);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -449,7 +453,7 @@
             }
             return propVal;
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -466,7 +470,7 @@
             CarPropertyValue<E> propVal = mService.getProperty(propId, areaId);
             return propVal;
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -488,7 +492,7 @@
         try {
             mService.setProperty(new CarPropertyValue<>(propId, areaId, val));
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -534,11 +538,11 @@
         void onPropertyChanged(final CarPropertyEvent event) {
             // throw away old sensor data as oneway binder call can change order.
             long updateTime = event.getCarPropertyValue().getTimestamp();
-            if (updateTime < mLastUpdateTime) {
+            int areaId = event.getCarPropertyValue().getAreaId();
+            if (!needUpdateForAreaId(areaId, updateTime)) {
                 Log.w(TAG, "dropping old property data");
                 return;
             }
-            mLastUpdateTime = updateTime;
             List<CarPropertyEventCallback> listeners;
             synchronized (mActivePropertyListener) {
                 listeners = new ArrayList<>(getListeners());
@@ -546,7 +550,7 @@
             listeners.forEach(new Consumer<CarPropertyEventCallback>() {
                 @Override
                 public void accept(CarPropertyEventCallback listener) {
-                    if (needUpdate(listener, updateTime)) {
+                    if (needUpdateForSelectedListener(listener, updateTime)) {
                         listener.onChangeEvent(event.getCarPropertyValue());
                     }
                 }
diff --git a/car-lib/src/android/car/input/CarInputHandlingService.java b/car-lib/src/android/car/input/CarInputHandlingService.java
index 518cee1..0ea990f 100644
--- a/car-lib/src/android/car/input/CarInputHandlingService.java
+++ b/car-lib/src/android/car/input/CarInputHandlingService.java
@@ -19,6 +19,7 @@
 import android.annotation.MainThread;
 import android.annotation.SystemApi;
 import android.app.Service;
+import android.car.Car;
 import android.car.CarLibLog;
 import android.content.Intent;
 import android.os.Bundle;
@@ -101,7 +102,7 @@
         try {
             callbackBinder.transact(INPUT_CALLBACK_BINDER_CODE, dataIn, null, IBinder.FLAG_ONEWAY);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            Car.handleRemoteExceptionFromCarService(this, e);
         }
     }
 
diff --git a/car-lib/src/android/car/media/CarAudioManager.java b/car-lib/src/android/car/media/CarAudioManager.java
index dcd4514..2bc8fd7 100644
--- a/car-lib/src/android/car/media/CarAudioManager.java
+++ b/car-lib/src/android/car/media/CarAudioManager.java
@@ -22,10 +22,8 @@
 import android.car.Car;
 import android.car.CarLibLog;
 import android.car.CarManagerBase;
-import android.content.Context;
 import android.media.AudioAttributes;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
@@ -52,7 +50,7 @@
  * - There is exactly one audio zone, which is the primary zone
  * - Each volume group represents a controllable STREAM_TYPE, same as AudioManager
  */
-public final class CarAudioManager implements CarManagerBase {
+public final class CarAudioManager extends CarManagerBase {
 
     /**
      * Zone id of the primary audio zone.
@@ -114,7 +112,7 @@
         try {
             return mService.isDynamicRoutingEnabled();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -147,7 +145,7 @@
         try {
             mService.setGroupVolume(zoneId, groupId, index, flags);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -177,7 +175,7 @@
         try {
             return mService.getGroupMaxVolume(zoneId, groupId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -207,7 +205,7 @@
         try {
             return mService.getGroupMinVolume(zoneId, groupId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -240,7 +238,7 @@
         try {
             return mService.getGroupVolume(zoneId, groupId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -259,7 +257,7 @@
         try {
             mService.setFadeTowardFront(value);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -278,7 +276,7 @@
         try {
             mService.setBalanceTowardRight(value);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -300,7 +298,8 @@
         try {
             return mService.getExternalSources();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
+            return new String[0];
         }
     }
 
@@ -330,7 +329,7 @@
         try {
             return mService.createAudioPatch(sourceAddress, usage, gainInMillibels);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -350,7 +349,7 @@
         try {
             mService.releaseAudioPatch(patch);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -379,7 +378,7 @@
         try {
             return mService.getVolumeGroupCount(zoneId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -409,7 +408,7 @@
         try {
             return mService.getVolumeGroupIdForUsage(zoneId, usage);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -436,7 +435,7 @@
         try {
             return mService.getAudioZoneIds();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, new int[0]);
         }
     }
 
@@ -453,7 +452,7 @@
         try {
             return mService.getZoneIdForUid(uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -470,7 +469,7 @@
         try {
             return mService.setZoneIdForUid(zoneId, uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -486,7 +485,7 @@
         try {
             return mService.clearZoneIdForUid(uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -523,7 +522,7 @@
         try {
             return mService.getZoneIdForDisplayPortId(displayPortId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -541,7 +540,7 @@
         try {
             return mService.getUsagesForVolumeGroupId(zoneId, groupId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, new int[0]);
         }
     }
 
@@ -552,16 +551,16 @@
             try {
                 mService.unregisterVolumeCallback(mCarVolumeCallbackImpl.asBinder());
             } catch (RemoteException e) {
-                throw e.rethrowFromSystemServer();
+                handleRemoteExceptionFromCarService(e);
             }
         }
     }
 
     /** @hide */
-    public CarAudioManager(IBinder service, Context context, Handler handler) {
+    public CarAudioManager(Car car, IBinder service) {
+        super(car);
         mService = ICarAudio.Stub.asInterface(service);
         mCarVolumeCallbacks = new ArrayList<>();
-
         try {
             mService.registerVolumeCallback(mCarVolumeCallbackImpl.asBinder());
         } catch (RemoteException e) {
diff --git a/car-lib/src/android/car/media/CarMediaManager.java b/car-lib/src/android/car/media/CarMediaManager.java
index fbddd22..8537ed6 100644
--- a/car-lib/src/android/car/media/CarMediaManager.java
+++ b/car-lib/src/android/car/media/CarMediaManager.java
@@ -18,6 +18,7 @@
 import android.annotation.RequiresPermission;
 import android.car.Car;
 import android.car.CarManagerBase;
+import android.content.ComponentName;
 import android.os.IBinder;
 import android.os.RemoteException;
 
@@ -28,7 +29,7 @@
  * API for updating and receiving updates to the primary media source in the car.
  * @hide
  */
-public final class CarMediaManager implements CarManagerBase {
+public final class CarMediaManager extends CarManagerBase {
 
     private final ICarMedia mService;
     private Map<MediaSourceChangedListener, ICarMediaSourceListener> mCallbackMap = new HashMap();
@@ -39,7 +40,8 @@
      * Should not be obtained directly by clients, use {@link Car#getCarManager(String)} instead.
      * @hide
      */
-    public CarMediaManager(IBinder service) {
+    public CarMediaManager(Car car, IBinder service) {
+        super(car);
         mService = ICarMedia.Stub.asInterface(service);
     }
 
@@ -53,7 +55,7 @@
          * Called when the primary media source is changed
          * @hide
          */
-        void onMediaSourceChanged(String packageName);
+        void onMediaSourceChanged(ComponentName componentName);
     }
 
     /**
@@ -62,11 +64,11 @@
      * @hide
      */
     @RequiresPermission(value = android.Manifest.permission.MEDIA_CONTENT_CONTROL)
-    public synchronized String getMediaSource() {
+    public synchronized ComponentName getMediaSource() {
         try {
             return mService.getMediaSource();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -76,11 +78,11 @@
      * @hide
      */
     @RequiresPermission(value = android.Manifest.permission.MEDIA_CONTENT_CONTROL)
-    public synchronized void setMediaSource(String packageName) {
+    public synchronized void setMediaSource(ComponentName componentName) {
         try {
-            mService.setMediaSource(packageName);
+            mService.setMediaSource(componentName);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -94,14 +96,14 @@
         try {
             ICarMediaSourceListener binderCallback = new ICarMediaSourceListener.Stub() {
                 @Override
-                public void onMediaSourceChanged(String packageName) {
-                    callback.onMediaSourceChanged(packageName);
+                public void onMediaSourceChanged(ComponentName componentName) {
+                    callback.onMediaSourceChanged(componentName);
                 }
             };
             mCallbackMap.put(callback, binderCallback);
             mService.registerMediaSourceListener(binderCallback);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -116,12 +118,14 @@
             ICarMediaSourceListener binderCallback = mCallbackMap.remove(callback);
             mService.unregisterMediaSourceListener(binderCallback);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
     /** @hide */
     @Override
     public synchronized void onCarDisconnected() {
+        // TODO(b/142733057) Fix synchronization to use separate mLock
+        mCallbackMap.clear();
     }
 }
diff --git a/car-lib/src/android/car/media/ICarMedia.aidl b/car-lib/src/android/car/media/ICarMedia.aidl
index fb1392d..c2881cd 100644
--- a/car-lib/src/android/car/media/ICarMedia.aidl
+++ b/car-lib/src/android/car/media/ICarMedia.aidl
@@ -17,6 +17,7 @@
 package android.car.media;
 
 import android.car.media.ICarMediaSourceListener;
+import android.content.ComponentName;
 
 /**
  * Binder interface for {@link android.car.media.CarMediaManager}.
@@ -25,8 +26,8 @@
  * @hide
  */
 interface ICarMedia {
-    String getMediaSource();
-    void setMediaSource(in String mediaSource);
+    ComponentName getMediaSource();
+    void setMediaSource(in ComponentName mediaSource);
     void registerMediaSourceListener(in ICarMediaSourceListener callback);
     void unregisterMediaSourceListener(in ICarMediaSourceListener callback);
 }
diff --git a/car-lib/src/android/car/media/ICarMediaSourceListener.aidl b/car-lib/src/android/car/media/ICarMediaSourceListener.aidl
index 22c81eb..96f27e4 100644
--- a/car-lib/src/android/car/media/ICarMediaSourceListener.aidl
+++ b/car-lib/src/android/car/media/ICarMediaSourceListener.aidl
@@ -16,11 +16,13 @@
 
 package android.car.media;
 
+import android.content.ComponentName;
+
 /**
  * Binder interface to listen for media source changes
  *
  * @hide
  */
 oneway interface ICarMediaSourceListener {
-    void onMediaSourceChanged(in String newSource) = 0;
+    void onMediaSourceChanged(in ComponentName newSource) = 0;
 }
diff --git a/car-lib/src/android/car/navigation/CarNavigationStatusManager.java b/car-lib/src/android/car/navigation/CarNavigationStatusManager.java
index a70e3c8..2aa2f10 100644
--- a/car-lib/src/android/car/navigation/CarNavigationStatusManager.java
+++ b/car-lib/src/android/car/navigation/CarNavigationStatusManager.java
@@ -24,14 +24,13 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.util.Log;
 
 /**
  * API for providing navigation status for instrument cluster.
  * @hide
  */
 @SystemApi
-public final class CarNavigationStatusManager implements CarManagerBase {
+public final class CarNavigationStatusManager extends CarManagerBase {
     private static final String TAG = CarLibLog.TAG_NAV;
 
     private final IInstrumentClusterNavigation mService;
@@ -40,7 +39,8 @@
      * Only for CarServiceLoader
      * @hide
      */
-    public CarNavigationStatusManager(IBinder service) {
+    public CarNavigationStatusManager(Car car, IBinder service) {
+        super(car);
         mService = IInstrumentClusterNavigation.Stub.asInterface(service);
     }
 
@@ -67,14 +67,13 @@
         try {
             mService.onNavigationStateChanged(bundle);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
     /** @hide */
     @Override
     public void onCarDisconnected() {
-        Log.e(TAG, "Car service disconnected");
     }
 
     /** Returns navigation features of instrument cluster */
@@ -83,7 +82,7 @@
         try {
             return mService.getInstrumentClusterInfo();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 }
diff --git a/car-lib/src/android/car/settings/CarConfigurationManager.java b/car-lib/src/android/car/settings/CarConfigurationManager.java
index 34d5f4a..626ad39 100644
--- a/car-lib/src/android/car/settings/CarConfigurationManager.java
+++ b/car-lib/src/android/car/settings/CarConfigurationManager.java
@@ -16,6 +16,7 @@
 
 package android.car.settings;
 
+import android.car.Car;
 import android.car.CarManagerBase;
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -23,13 +24,14 @@
 /**
  * Manager that exposes car configuration values that are stored on the system.
  */
-public class CarConfigurationManager implements CarManagerBase {
+public class CarConfigurationManager extends CarManagerBase {
     private static final String TAG = "CarConfigurationManager";
 
     private final ICarConfigurationManager mConfigurationService;
 
     /** @hide */
-    public CarConfigurationManager(IBinder service) {
+    public CarConfigurationManager(Car car, IBinder service) {
+        super(car);
         mConfigurationService = ICarConfigurationManager.Stub.asInterface(service);
     }
 
@@ -42,7 +44,7 @@
         try {
             return mConfigurationService.getSpeedBumpConfiguration();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
diff --git a/car-lib/src/android/car/settings/CarSettings.java b/car-lib/src/android/car/settings/CarSettings.java
index c307cab..3294071 100644
--- a/car-lib/src/android/car/settings/CarSettings.java
+++ b/car-lib/src/android/car/settings/CarSettings.java
@@ -76,6 +76,15 @@
          */
         public static final String DEFAULT_USER_RESTRICTIONS_SET =
                 "android.car.DEFAULT_USER_RESTRICTIONS_SET";
+
+        /**
+         * Developer settings String used to explicitly enable the user switch message when
+         * set to {@code "true"}.
+         *
+         * @hide
+         */
+        public static final String ENABLE_USER_SWITCH_DEVELOPER_MESSAGE =
+                "android.car.ENABLE_USER_SWITCH_DEVELOPER_MESSAGE";
     }
 
     /**
@@ -144,5 +153,23 @@
          */
         public static final String KEY_BLUETOOTH_PROFILES_INHIBITED =
                 "android.car.BLUETOOTH_PROFILES_INHIBITED";
+
+        /**
+         * Key to enable / disable initial notice screen that will be shown for all user-starting
+         * moments including cold boot, wake up from suspend, and user switching.
+         * The value is boolean (1 or 0).
+         * @hide
+         */
+        public static final String KEY_ENABLE_INITIAL_NOTICE_SCREEN_TO_USER =
+                "android.car.ENABLE_INITIAL_NOTICE_SCREEN_TO_USER";
+
+        /**
+         * Key to indicate Setup Wizard is in progress. It differs from USER_SETUP_COMPLETE in
+         * that this flag can be reset to 0 in deferred Setup Wizard flow.
+         * The value is boolean (1 or 0).
+         * @hide
+         */
+        public static final String KEY_SETUP_WIZARD_IN_PROGRESS =
+                "android.car.SETUP_WIZARD_IN_PROGRESS";
     }
 }
diff --git a/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java b/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java
index ff7b099..69c092b 100644
--- a/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java
+++ b/car-lib/src/android/car/storagemonitoring/CarStorageMonitoringManager.java
@@ -19,7 +19,6 @@
 import android.annotation.SystemApi;
 import android.car.Car;
 import android.car.CarManagerBase;
-import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 
@@ -37,7 +36,7 @@
  * @hide
  */
 @SystemApi
-public final class CarStorageMonitoringManager implements CarManagerBase {
+public final class CarStorageMonitoringManager extends CarManagerBase {
     private static final String TAG = CarStorageMonitoringManager.class.getSimpleName();
     private static final int MSG_IO_STATS_EVENT = 0;
 
@@ -77,9 +76,10 @@
     /**
      * @hide
      */
-    public CarStorageMonitoringManager(IBinder service, Handler handler) {
+    public CarStorageMonitoringManager(Car car, IBinder service) {
+        super(car);
         mService = ICarStorageMonitoring.Stub.asInterface(service);
-        mMessageHandler = new SingleMessageHandler<IoStats>(handler, MSG_IO_STATS_EVENT) {
+        mMessageHandler = new SingleMessageHandler<IoStats>(getEventHandler(), MSG_IO_STATS_EVENT) {
             @Override
             protected void handleEvent(IoStats event) {
                 for (IoStatsListener listener : mListeners) {
@@ -112,7 +112,7 @@
         try {
             return mService.getPreEolIndicatorStatus();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, PRE_EOL_INFO_UNKNOWN);
         }
     }
 
@@ -130,7 +130,7 @@
         try {
             return mService.getWearEstimate();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, null);
         }
     }
 
@@ -150,7 +150,7 @@
         try {
             return mService.getWearEstimateHistory();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Collections.emptyList());
         }
     }
 
@@ -169,7 +169,7 @@
         try {
             return mService.getBootIoStats();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Collections.emptyList());
         }
     }
 
@@ -199,7 +199,7 @@
         try {
             return mService.getShutdownDiskWriteAmount();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, 0);
         }
     }
 
@@ -216,7 +216,7 @@
         try {
             return mService.getAggregateIoStats();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Collections.emptyList());
         }
     }
 
@@ -236,7 +236,7 @@
         try {
             return mService.getIoStatsDeltas();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Collections.emptyList());
         }
     }
 
@@ -259,7 +259,7 @@
             }
             mListeners.add(listener);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -277,7 +277,7 @@
                 mListenerToService = null;
             }
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 }
diff --git a/car-lib/src/android/car/test/CarTestManagerBinderWrapper.java b/car-lib/src/android/car/test/CarTestManagerBinderWrapper.java
index 5e39ea3..0a167cf 100644
--- a/car-lib/src/android/car/test/CarTestManagerBinderWrapper.java
+++ b/car-lib/src/android/car/test/CarTestManagerBinderWrapper.java
@@ -15,6 +15,7 @@
  */
 package android.car.test;
 
+import android.car.Car;
 import android.car.CarManagerBase;
 import android.os.IBinder;
 
@@ -22,10 +23,17 @@
  * Only for system testing
  * @hide
  */
-public class CarTestManagerBinderWrapper implements CarManagerBase {
+public class CarTestManagerBinderWrapper extends CarManagerBase {
     public final IBinder binder;
 
     public CarTestManagerBinderWrapper(IBinder binder) {
+        super(null); // This will not work safely but is only for keeping API.
+        this.binder = binder;
+    }
+
+    /** @hide */
+    public CarTestManagerBinderWrapper(Car car, IBinder binder) {
+        super(car);
         this.binder = binder;
     }
 
diff --git a/car-lib/src/android/car/trust/CarTrustAgentEnrollmentManager.java b/car-lib/src/android/car/trust/CarTrustAgentEnrollmentManager.java
index c82d515..9881420 100644
--- a/car-lib/src/android/car/trust/CarTrustAgentEnrollmentManager.java
+++ b/car-lib/src/android/car/trust/CarTrustAgentEnrollmentManager.java
@@ -24,8 +24,8 @@
 import android.annotation.RequiresPermission;
 import android.annotation.SystemApi;
 import android.bluetooth.BluetoothDevice;
+import android.car.Car;
 import android.car.CarManagerBase;
-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -39,6 +39,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.ref.WeakReference;
+import java.util.Collections;
 import java.util.List;
 
 
@@ -67,7 +68,7 @@
  * @hide
  */
 @SystemApi
-public final class CarTrustAgentEnrollmentManager implements CarManagerBase {
+public final class CarTrustAgentEnrollmentManager extends CarManagerBase {
     private static final String TAG = "CarTrustEnrollMgr";
     private static final String KEY_HANDLE = "handle";
     private static final String KEY_ACTIVE = "active";
@@ -81,7 +82,6 @@
     private static final int MSG_ENROLL_TOKEN_STATE_CHANGED = 7;
     private static final int MSG_ENROLL_TOKEN_REMOVED = 8;
 
-    private final Context mContext;
     private final ICarTrustAgentEnrollment mEnrollmentService;
     private Object mListenerLock = new Object();
     @GuardedBy("mListenerLock")
@@ -114,10 +114,10 @@
 
 
     /** @hide */
-    public CarTrustAgentEnrollmentManager(IBinder service, Context context, Handler handler) {
-        mContext = context;
+    public CarTrustAgentEnrollmentManager(Car car, IBinder service) {
+        super(car);
         mEnrollmentService = ICarTrustAgentEnrollment.Stub.asInterface(service);
-        mEventCallbackHandler = new EventCallbackHandler(this, handler.getLooper());
+        mEventCallbackHandler = new EventCallbackHandler(this, getEventHandler().getLooper());
     }
 
     /** @hide */
@@ -134,7 +134,7 @@
         try {
             mEnrollmentService.startEnrollmentAdvertising();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -146,7 +146,7 @@
         try {
             mEnrollmentService.stopEnrollmentAdvertising();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -161,7 +161,7 @@
         try {
             mEnrollmentService.enrollmentHandshakeAccepted(device);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -173,7 +173,7 @@
         try {
             mEnrollmentService.terminateEnrollmentHandshake();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -194,7 +194,7 @@
         try {
             return mEnrollmentService.isEscrowTokenActive(handle, uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, false);
         }
     }
 
@@ -209,7 +209,7 @@
         try {
             mEnrollmentService.removeEscrowToken(handle, uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -223,7 +223,7 @@
         try {
             mEnrollmentService.removeAllTrustedDevices(uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -238,7 +238,7 @@
         try {
             mEnrollmentService.setTrustedDeviceEnrollmentEnabled(isEnabled);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -253,7 +253,7 @@
         try {
             mEnrollmentService.setTrustedDeviceUnlockEnabled(isEnabled);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -278,7 +278,7 @@
                     mEnrollmentService.registerEnrollmentCallback(mListenerToEnrollmentService);
                     mEnrollmentCallback = callback;
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
             }
         }
@@ -290,7 +290,7 @@
                 try {
                     mEnrollmentService.unregisterEnrollmentCallback(mListenerToEnrollmentService);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
                 mEnrollmentCallback = null;
             }
@@ -318,7 +318,7 @@
                     mEnrollmentService.registerBleCallback(mListenerToBleService);
                     mBleCallback = callback;
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
             }
         }
@@ -330,7 +330,7 @@
                 try {
                     mEnrollmentService.unregisterBleCallback(mListenerToBleService);
                 } catch (RemoteException e) {
-                    throw e.rethrowFromSystemServer();
+                    handleRemoteExceptionFromCarService(e);
                 }
                 mBleCallback = null;
             }
@@ -351,7 +351,7 @@
         try {
             return mEnrollmentService.getEnrolledDeviceInfosForUser(uid);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, Collections.emptyList());
         }
     }
 
diff --git a/car-lib/src/android/car/user/IUserNotice.aidl b/car-lib/src/android/car/user/IUserNotice.aidl
new file mode 100644
index 0000000..1debc84
--- /dev/null
+++ b/car-lib/src/android/car/user/IUserNotice.aidl
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 android.car.user;
+
+/**
+ * Binder for UserNotice UI to notify status change to CarUserNoticeService/CarService.
+ * This binder is implemented inside CarService.
+ * @hide
+*/
+interface IUserNotice {
+    /**
+     * Notify CarUserNoticeService/CarSercice that UI dialog is dismissed.
+     * CarUserNoticeService will unbind the UI servie to finish it.
+     */
+    void onDialogDismissed();
+}
\ No newline at end of file
diff --git a/car-lib/src/android/car/user/IUserNoticeUI.aidl b/car-lib/src/android/car/user/IUserNoticeUI.aidl
new file mode 100644
index 0000000..44717d0
--- /dev/null
+++ b/car-lib/src/android/car/user/IUserNoticeUI.aidl
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 android.car.user;
+
+import android.car.user.IUserNotice;
+
+/**
+ * Binder for CarUserNoticeService/CarService to pass IUserNotice binder to UserNotice UI.
+ * UserNotice UI implements this binder.
+ * @hide
+*/
+oneway interface IUserNoticeUI {
+    /**
+     * CarUserNoticeService will use this call to pass IUserNotice binder which can be used
+     * to notify dismissal of UI dialog.
+     */
+    void setCallbackBinder(in IUserNotice binder);
+}
diff --git a/car-lib/src/android/car/vms/VmsPublisherClientService.java b/car-lib/src/android/car/vms/VmsPublisherClientService.java
index 5847b19..70e0592 100644
--- a/car-lib/src/android/car/vms/VmsPublisherClientService.java
+++ b/car-lib/src/android/car/vms/VmsPublisherClientService.java
@@ -20,6 +20,7 @@
 import android.annotation.NonNull;
 import android.annotation.SystemApi;
 import android.app.Service;
+import android.car.Car;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.Build;
@@ -35,6 +36,7 @@
 import com.android.internal.util.Preconditions;
 
 import java.lang.ref.WeakReference;
+import java.util.Collections;
 
 /**
  * API implementation of a Vehicle Map Service publisher client.
@@ -53,9 +55,13 @@
  */
 @SystemApi
 public abstract class VmsPublisherClientService extends Service {
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final String TAG = "VmsPublisherClientService";
 
+    private static final VmsSubscriptionState DEFAULT_SUBSCRIPTIONS =
+            new VmsSubscriptionState(0, Collections.emptySet(),
+                    Collections.emptySet());
+
     private final Object mLock = new Object();
 
     private Handler mHandler = new VmsEventHandler(this);
@@ -66,17 +72,13 @@
 
     @Override
     public IBinder onBind(Intent intent) {
-        if (DBG) {
-            Log.d(TAG, "onBind, intent: " + intent);
-        }
+        if (DBG) Log.d(TAG, "onBind, intent: " + intent);
         return mVmsPublisherClient.asBinder();
     }
 
     @Override
     public boolean onUnbind(Intent intent) {
-        if (DBG) {
-            Log.d(TAG, "onUnbind, intent: " + intent);
-        }
+        if (DBG) Log.d(TAG, "onUnbind, intent: " + intent);
         stopSelf();
         return super.onUnbind(intent);
     }
@@ -111,16 +113,14 @@
      */
     public final void publish(@NonNull VmsLayer layer, int publisherId, byte[] payload) {
         Preconditions.checkNotNull(layer, "layer cannot be null");
-        if (DBG) {
-            Log.d(TAG, "Publishing for layer : " + layer);
-        }
+        if (DBG) Log.d(TAG, "Publishing for layer : " + layer);
 
         IBinder token = getTokenForPublisherServiceThreadSafe();
 
         try {
             mVmsPublisherService.publish(token, layer, publisherId, payload);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            Car.handleRemoteExceptionFromCarService(this, e);
         }
     }
 
@@ -132,9 +132,7 @@
      */
     public final void setLayersOffering(@NonNull VmsLayersOffering offering) {
         Preconditions.checkNotNull(offering, "offering cannot be null");
-        if (DBG) {
-            Log.d(TAG, "Setting layers offering : " + offering);
-        }
+        if (DBG) Log.d(TAG, "Setting layers offering : " + offering);
 
         IBinder token = getTokenForPublisherServiceThreadSafe();
 
@@ -142,7 +140,7 @@
             mVmsPublisherService.setLayersOffering(token, offering);
             VmsOperationRecorder.get().setLayersOffering(offering);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            Car.handleRemoteExceptionFromCarService(this, e);
         }
     }
 
@@ -177,9 +175,10 @@
         }
         int publisherId;
         try {
-            Log.i(TAG, "Getting publisher static ID");
             publisherId = mVmsPublisherService.getPublisherId(publisherInfo);
+            Log.i(TAG, "Assigned publisher ID: " + publisherId);
         } catch (RemoteException e) {
+            // This will crash. To prevent crash, safer invalid return value should be defined.
             throw e.rethrowFromSystemServer();
         }
         VmsOperationRecorder.get().getPublisherId(publisherId);
@@ -199,7 +198,7 @@
         try {
             return mVmsPublisherService.getSubscriptions();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return Car.handleRemoteExceptionFromCarService(this, e, DEFAULT_SUBSCRIPTIONS);
         }
     }
 
@@ -227,9 +226,7 @@
 
             VmsPublisherClientService vmsPublisherClientService = mVmsPublisherClientService.get();
             if (vmsPublisherClientService == null) return;
-            if (DBG) {
-                Log.d(TAG, "setting VmsPublisherService.");
-            }
+            if (DBG) Log.d(TAG, "setting VmsPublisherService.");
             Handler handler = vmsPublisherClientService.mHandler;
             handler.sendMessage(
                     handler.obtainMessage(VmsEventHandler.SET_SERVICE_CALLBACK, service));
@@ -242,9 +239,7 @@
 
             VmsPublisherClientService vmsPublisherClientService = mVmsPublisherClientService.get();
             if (vmsPublisherClientService == null) return;
-            if (DBG) {
-                Log.d(TAG, "subscription event: " + subscriptionState);
-            }
+            if (DBG) Log.d(TAG, "subscription event: " + subscriptionState);
             synchronized (mSequenceLock) {
                 if (subscriptionState.getSequenceNumber() <= mSequence) {
                     Log.w(TAG, "Sequence out of order. Current sequence = " + mSequence
diff --git a/car-lib/src/android/car/vms/VmsSubscriberManager.java b/car-lib/src/android/car/vms/VmsSubscriberManager.java
index 06a06ae..ce10b13 100644
--- a/car-lib/src/android/car/vms/VmsSubscriberManager.java
+++ b/car-lib/src/android/car/vms/VmsSubscriberManager.java
@@ -19,6 +19,7 @@
 import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
 import android.annotation.SystemApi;
+import android.car.Car;
 import android.car.CarManagerBase;
 import android.os.Binder;
 import android.os.IBinder;
@@ -28,6 +29,7 @@
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.util.Preconditions;
 
+import java.util.Collections;
 import java.util.concurrent.Executor;
 
 /**
@@ -39,10 +41,13 @@
  * @hide
  */
 @SystemApi
-public final class VmsSubscriberManager implements CarManagerBase {
-    private static final boolean DBG = true;
+public final class VmsSubscriberManager extends CarManagerBase {
     private static final String TAG = "VmsSubscriberManager";
 
+    private static final byte[] DEFAULT_PUBLISHER_INFO = new byte[0];
+    private static final VmsAvailableLayers DEFAULT_AVAILABLE_LAYERS =
+            new VmsAvailableLayers(Collections.emptySet(), 0);
+
     private final IVmsSubscriberService mVmsSubscriberService;
     private final IVmsSubscriberClient mSubscriberManagerClient;
     private final Object mClientCallbackLock = new Object();
@@ -76,7 +81,8 @@
      *
      * @hide
      */
-    public VmsSubscriberManager(IBinder service) {
+    public VmsSubscriberManager(Car car, IBinder service) {
+        super(car);
         mVmsSubscriberService = IVmsSubscriberService.Stub.asInterface(service);
         mSubscriberManagerClient = new IVmsSubscriberClient.Stub() {
             @Override
@@ -86,9 +92,7 @@
                     executor = mExecutor;
                 }
                 if (executor == null) {
-                    if (DBG) {
-                        Log.d(TAG, "Executor is null in onVmsMessageReceived");
-                    }
+                    Log.w(TAG, "Executor is unset in onVmsMessageReceived");
                     return;
                 }
                 Binder.clearCallingIdentity();
@@ -104,9 +108,7 @@
                     executor = mExecutor;
                 }
                 if (executor == null) {
-                    if (DBG) {
-                        Log.d(TAG, "Executor is null in onLayersAvailabilityChanged");
-                    }
+                    Log.w(TAG, "Executor is unset in onLayersAvailabilityChanged");
                     return;
                 }
                 Binder.clearCallingIdentity();
@@ -138,7 +140,7 @@
         try {
             mVmsSubscriberService.addVmsSubscriberToNotifications(mSubscriberManagerClient);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -153,7 +155,7 @@
         try {
             mVmsSubscriberService.removeVmsSubscriberToNotifications(mSubscriberManagerClient);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         } finally {
             synchronized (mClientCallbackLock) {
                 mClientCallback = null;
@@ -173,7 +175,7 @@
         try {
             return mVmsSubscriberService.getPublisherInfo(publisherId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, DEFAULT_PUBLISHER_INFO);
         }
     }
 
@@ -187,7 +189,7 @@
         try {
             return mVmsSubscriberService.getAvailableLayers();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            return handleRemoteExceptionFromCarService(e, DEFAULT_AVAILABLE_LAYERS);
         }
     }
 
@@ -204,7 +206,7 @@
             mVmsSubscriberService.addVmsSubscriber(mSubscriberManagerClient, layer);
             VmsOperationRecorder.get().subscribe(layer);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -223,7 +225,7 @@
                     mSubscriberManagerClient, layer, publisherId);
             VmsOperationRecorder.get().subscribe(layer, publisherId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -236,7 +238,7 @@
             mVmsSubscriberService.addVmsSubscriberPassive(mSubscriberManagerClient);
             VmsOperationRecorder.get().startMonitoring();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -253,7 +255,7 @@
             mVmsSubscriberService.removeVmsSubscriber(mSubscriberManagerClient, layer);
             VmsOperationRecorder.get().unsubscribe(layer);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -271,7 +273,7 @@
                     mSubscriberManagerClient, layer, publisherId);
             VmsOperationRecorder.get().unsubscribe(layer, publisherId);
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -283,7 +285,7 @@
             mVmsSubscriberService.removeVmsSubscriberPassive(mSubscriberManagerClient);
             VmsOperationRecorder.get().stopMonitoring();
         } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -331,5 +333,9 @@
      */
     @Override
     public void onCarDisconnected() {
+        synchronized (mClientCallbackLock) {
+            mClientCallback = null;
+            mExecutor = null;
+        }
     }
 }
diff --git a/car-lib/src/com/android/car/internal/CarRatedFloatListeners.java b/car-lib/src/com/android/car/internal/CarRatedFloatListeners.java
index 93519d6..566eed7 100644
--- a/car-lib/src/com/android/car/internal/CarRatedFloatListeners.java
+++ b/car-lib/src/com/android/car/internal/CarRatedFloatListeners.java
@@ -16,6 +16,8 @@
 
 package com.android.car.internal;
 
+import android.util.SparseArray;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -36,7 +38,8 @@
 
     private float mUpdateRate;
 
-    protected long mLastUpdateTime = -1;
+    // key: areaId, value: lastUpdateTime in nanosecond
+    protected SparseArray<Long> mAreaIdToLastUpdateTime = new SparseArray<>();
 
     protected CarRatedFloatListeners(float rate) {
         mUpdateRate = rate;
@@ -105,7 +108,7 @@
      * @param eventTimeStamp
      * @return true if listener need to be notified.
      */
-    public boolean needUpdate(T listener, long eventTimeStamp) {
+    public boolean needUpdateForSelectedListener(T listener, long eventTimeStamp) {
         Long nextUpdateTime = mListenersUpdateTime.get(listener);
         Float updateRate = mListenersToRate.get(listener);
         /** Update ON_CHANGE property. */
@@ -121,6 +124,21 @@
         return false;
     }
 
+    /**
+     * @param areaId AreaId in CarPropertyValue
+     * @param eventTime TimeStamp in CarPropertyValue
+     * @return true if eventTime is greater than the last event time for the same areaId.
+     */
+    public boolean needUpdateForAreaId(int areaId, long eventTime) {
+        long lastUpdateTime = mAreaIdToLastUpdateTime.get(areaId, 0L);
+        if (eventTime >= lastUpdateTime) {
+            mAreaIdToLastUpdateTime.put(areaId, eventTime);
+            return true;
+        }
+        return false;
+    }
+
+
     public Collection<T> getListeners() {
         return mListenersToRate.keySet();
     }
diff --git a/car-lib/src_stub/android/media/AudioPatch.java b/car-lib/src_stub/android/media/AudioPatch.java
new file mode 100644
index 0000000..f50481b
--- /dev/null
+++ b/car-lib/src_stub/android/media/AudioPatch.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 android.media;
+
+/**
+ * This is added to build system-stub library as hidden API, AudioPatch was used by mistake in
+ * CarAudioManager for system API. This should not be used by apps using system API as the real
+ * API from framework is really hidden API.
+ *
+ * @hide
+ */
+public class AudioPatch {
+}
diff --git a/car-maps-placeholder/res/values-bn/strings.xml b/car-maps-placeholder/res/values-bn/strings.xml
index 35be0b5..ab3ccb0 100644
--- a/car-maps-placeholder/res/values-bn/strings.xml
+++ b/car-maps-placeholder/res/values-bn/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"ম্যাপ"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"কোনও ম্যাপ অ্যাপ্লিকেশন ইনস্টল করা নেই। আপনার গাড়ির প্রস্তুতকারকের সাথে যোগাযোগ করুন।"</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-gu/strings.xml b/car-maps-placeholder/res/values-gu/strings.xml
index 75e3d1a..45e1af7 100644
--- a/car-maps-placeholder/res/values-gu/strings.xml
+++ b/car-maps-placeholder/res/values-gu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"નકશા"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"કોઈ નકશા એપ્લિકેશન ઇન્સ્ટૉલ કરેલ નથી. કૃપા કરીને તમારી કારના નિર્માતાનો સંપર્ક કરો."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-hi/strings.xml b/car-maps-placeholder/res/values-hi/strings.xml
index fbb0c4a..f5a252e 100644
--- a/car-maps-placeholder/res/values-hi/strings.xml
+++ b/car-maps-placeholder/res/values-hi/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"मैप"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"कोई मैप ऐप्लिकेशन इंस्टॉल नहीं किया हुआ है. कृपया अपनी कार के निर्माता से संपर्क करें."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-kn/strings.xml b/car-maps-placeholder/res/values-kn/strings.xml
index 4a94e81..fdfd107 100644
--- a/car-maps-placeholder/res/values-kn/strings.xml
+++ b/car-maps-placeholder/res/values-kn/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"ನಕ್ಷೆಗಳು"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"ನಕ್ಷೆಗಳ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿಲ್ಲ. ನಿಮ್ಮ ಕಾರಿನ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-ml/strings.xml b/car-maps-placeholder/res/values-ml/strings.xml
index 2581753..a46ff32 100644
--- a/car-maps-placeholder/res/values-ml/strings.xml
+++ b/car-maps-placeholder/res/values-ml/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"മാപ്‌സ്"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"മാപ്‌സ് ആപ്പ് ഇൻസ്‌റ്റാൾ ചെയ്‌തിട്ടില്ല. നിങ്ങളുടെ കാറിന്റെ നിർമ്മാതാവുമായി ബന്ധപ്പെടുക."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-mr/strings.xml b/car-maps-placeholder/res/values-mr/strings.xml
index 5e1fd78..b279d2f 100644
--- a/car-maps-placeholder/res/values-mr/strings.xml
+++ b/car-maps-placeholder/res/values-mr/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"नकाशे"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"नकाशे अ‍ॅप्लिकेशन इंस्टॉल केलेले नाही. कृपया तुमच्या कार उत्पादकाशी संपर्क साधा."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-or/strings.xml b/car-maps-placeholder/res/values-or/strings.xml
index 478cbc0..286fb8a 100644
--- a/car-maps-placeholder/res/values-or/strings.xml
+++ b/car-maps-placeholder/res/values-or/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"ମ୍ୟାପ୍ସ"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"କୌଣସି ମ୍ୟାପ୍ସ ଆପ୍ଲିକେସନ୍ ଇନ୍‍ଷ୍ଟଲ୍ କରାଯାଇନାହିଁ। ଆପଣଙ୍କ କାର୍‍ର ଉତ୍ପାଦକଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-pa/strings.xml b/car-maps-placeholder/res/values-pa/strings.xml
index 1b0ef60..850de49 100644
--- a/car-maps-placeholder/res/values-pa/strings.xml
+++ b/car-maps-placeholder/res/values-pa/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"ਨਕਸ਼ੇ"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"ਕੋਈ ਨਕਸ਼ਾ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਗਈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਕਾਰ ਦੇ ਨਿਰਮਾਤਾ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-ta/strings.xml b/car-maps-placeholder/res/values-ta/strings.xml
index 8d5e354..ed29fee 100644
--- a/car-maps-placeholder/res/values-ta/strings.xml
+++ b/car-maps-placeholder/res/values-ta/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"வரைபடம்"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"வரைபட ஆப்ஸ் எதுவும் நிறுவப்படவில்லை. உங்கள் கார் உற்பத்தியாளரைத் தொடர்புகொள்ளவும்."</string>
 </resources>
diff --git a/car-maps-placeholder/res/values-te/strings.xml b/car-maps-placeholder/res/values-te/strings.xml
index 987b654..96c809e 100644
--- a/car-maps-placeholder/res/values-te/strings.xml
+++ b/car-maps-placeholder/res/values-te/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6575346965016311017">"మ్యాప్స్"</string>
+    <string name="app_name" msgid="6575346965016311017">"Maps"</string>
     <string name="error_text" msgid="5575174711944349180">"మ్యాప్స్ అప్లికేషన్ ఇన్‌స్టాల్ చేయబడలేదు. దయచేసి మీ కారుని తయారు చేసినవారిని సంప్రదించండి"</string>
 </resources>
diff --git a/car-systemtest-lib/src/android/car/test/CarTestManager.java b/car-systemtest-lib/src/android/car/test/CarTestManager.java
index 52b01a6..3ee1067 100644
--- a/car-systemtest-lib/src/android/car/test/CarTestManager.java
+++ b/car-systemtest-lib/src/android/car/test/CarTestManager.java
@@ -27,18 +27,19 @@
  * @hide
  */
 @SystemApi
-public final class CarTestManager implements CarManagerBase {
+public final class CarTestManager extends CarManagerBase {
 
     private final ICarTest mService;
 
 
-    public CarTestManager(IBinder carServiceBinder) {
+    public CarTestManager(Car car, IBinder carServiceBinder) {
+        super(car);
         mService = ICarTest.Stub.asInterface(carServiceBinder);
     }
 
     @Override
     public void onCarDisconnected() {
-        // should not happen for embedded
+        // test will fail. nothing to do.
     }
 
     /**
@@ -52,7 +53,7 @@
         try {
             mService.stopCarService(token);
         } catch (RemoteException e) {
-            handleRemoteException(e);
+            handleRemoteExceptionFromCarService(e);
         }
     }
 
@@ -66,12 +67,7 @@
         try {
             mService.startCarService(token);
         } catch (RemoteException e) {
-            handleRemoteException(e);
+            handleRemoteExceptionFromCarService(e);
         }
     }
-
-    private static void handleRemoteException(RemoteException e) {
-        // let test fail
-        throw new RuntimeException(e);
-    }
 }
diff --git a/car-usb-handler/AndroidManifest.xml b/car-usb-handler/AndroidManifest.xml
index 848548f..caa93bd 100644
--- a/car-usb-handler/AndroidManifest.xml
+++ b/car-usb-handler/AndroidManifest.xml
@@ -26,7 +26,7 @@
                  android:directBootAware="true">
         <activity android:name=".UsbHostManagementActivity"
                   android:theme="@android:style/Theme.DeviceDefault.Dialog"
-                  android:launchMode="singleTop">
+                  android:launchMode="standard">
             <meta-data
                 android:name="distractionOptimized"
                 android:value="true" />
diff --git a/car-usb-handler/res/values-ky/strings.xml b/car-usb-handler/res/values-ky/strings.xml
index f88d6fe..2dabb58 100644
--- a/car-usb-handler/res/values-ky/strings.xml
+++ b/car-usb-handler/res/values-ky/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="6963366455471441257">"USB иштеткичи"</string>
     <string name="usb_saved_devices" msgid="2829442070749964872">"Сакталган түзмөктөр"</string>
     <string name="usb_pref_delete_title" msgid="3885061814853467483">"USB түзмөгү үчүн иштетилген колдонмону алып салуу"</string>
-    <string name="usb_pref_delete_message" msgid="5849493572520646218">"%1$s үчүн демейки колдонмону чын эле жок кылгыңыз келеби?"</string>
+    <string name="usb_pref_delete_message" msgid="5849493572520646218">"%1$s үчүн демейки колдонмону чын эле өчүрөсүзбү?"</string>
     <string name="usb_pref_delete_yes" msgid="7803356145103146036">"Ооба"</string>
     <string name="usb_pref_delete_cancel" msgid="5999791462730255929">"Жок"</string>
     <string name="usb_resolving_handlers" msgid="1943100136172948686">"Колдоого алынган иштеткичтерди алуу"</string>
diff --git a/car-usb-handler/src/android/car/usb/handler/BootUsbService.java b/car-usb-handler/src/android/car/usb/handler/BootUsbService.java
index 698571a..5d29f54 100644
--- a/car-usb-handler/src/android/car/usb/handler/BootUsbService.java
+++ b/car-usb-handler/src/android/car/usb/handler/BootUsbService.java
@@ -46,14 +46,14 @@
     static final String USB_DEVICE_LIST_KEY = "usb_device_list";
 
     private ArrayList<UsbDevice> mDeviceList;
-
-    private class UserSwitchBroadcastReceiver extends BroadcastReceiver {
+    private boolean mReceiverRegistered = false;
+    private final BroadcastReceiver mUserSwitchBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             processDevices();
-            unregisterReceiver(this);
+            unregisterUserSwitchReceiver();
         }
-    }
+    };
 
     @Override
     public Binder onBind(Intent intent) {
@@ -86,8 +86,7 @@
         // immediately.
         if (ActivityManager.getCurrentUser() == UserHandle.USER_SYSTEM) {
             Log.d(TAG, "Current user is still the system user, waiting for user switch");
-            registerReceiver(
-                    new UserSwitchBroadcastReceiver(), new IntentFilter(ACTION_USER_SWITCHED));
+            registerUserSwitchReceiver();
         } else {
             processDevices();
         }
@@ -95,6 +94,11 @@
         return START_NOT_STICKY;
     }
 
+    @Override
+    public void onDestroy() {
+        unregisterUserSwitchReceiver();
+    }
+
     private void processDevices() {
         Log.d(TAG, "Processing connected USB devices and starting handlers");
         for (UsbDevice device : mDeviceList) {
@@ -107,7 +111,21 @@
         Intent manageDevice = new Intent(context, UsbHostManagementActivity.class);
         manageDevice.setAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
         manageDevice.putExtra(UsbManager.EXTRA_DEVICE, device);
-        manageDevice.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        manageDevice.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivityAsUser(manageDevice, UserHandle.CURRENT);
     }
+
+    private void registerUserSwitchReceiver() {
+        if (!mReceiverRegistered) {
+            registerReceiver(mUserSwitchBroadcastReceiver, new IntentFilter(ACTION_USER_SWITCHED));
+            mReceiverRegistered = true;
+        }
+    }
+
+    private void unregisterUserSwitchReceiver() {
+        if (mReceiverRegistered) {
+            unregisterReceiver(mUserSwitchBroadcastReceiver);
+            mReceiverRegistered = false;
+        }
+    }
 }
diff --git a/car-usb-handler/src/android/car/usb/handler/UsbHostManagementActivity.java b/car-usb-handler/src/android/car/usb/handler/UsbHostManagementActivity.java
index f710960..0a91089 100644
--- a/car-usb-handler/src/android/car/usb/handler/UsbHostManagementActivity.java
+++ b/car-usb-handler/src/android/car/usb/handler/UsbHostManagementActivity.java
@@ -80,7 +80,6 @@
         if (connectedDevice != null) {
             mController.processDevice(connectedDevice);
         } else {
-            unregisterResolveBroadcastReceiver();
             finish();
         }
     }
@@ -90,8 +89,8 @@
             // We could have been unregistered after receiving the intent but before processing it,
             // so make sure we are still registered.
             if (mReceiverRegistered) {
-                processDevice();
                 unregisterResolveBroadcastReceiver();
+                processDevice();
             }
         }
     }
diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index 104d5d6..7c03328 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -53,9 +53,9 @@
     persist.bluetooth.enablenewavrcp=false \
     ro.carrier=unknown
 
-# Enable headless user 0
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.fw.mu.headless_system_user=true \
+    config.disable_systemtextclassifier=true
 
 # Overlay for Google network and fused location providers
 $(call inherit-product, device/sample/products/location_overlay.mk)
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 5132890..72feacf 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -73,3 +73,6 @@
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
 
+# Default dex optimization configurations
+PRODUCT_PROPERTY_OVERRIDES += \
+     pm.dexopt.disable_bg_dexopt=true
diff --git a/car_product/init/init.bootstat.rc b/car_product/init/init.bootstat.rc
index 5c5e796..4122ea4 100644
--- a/car_product/init/init.bootstat.rc
+++ b/car_product/init/init.bootstat.rc
@@ -4,4 +4,4 @@
 # This is a common source of Android security bugs.
 #
 on property:boot.car_service_created=1
-    exec - root root -- /system/bin/bootstat -r car_service_created
+    exec - system log -- /system/bin/bootstat -r car_service_created
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-af/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-af/strings.xml
index cf04334..abf8fd2 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-af/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-af/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Bestuurder"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"kry benaderde ligging net op die voorgrond"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-am/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-am/strings.xml
index 4afdf25..0f190c4 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-am/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-am/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ነጂ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ከፊት ለፊት ብቻ ግምታዊ አካባቢን ድረስ"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ar/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ar/strings.xml
index 874ff29..aa51d5d 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ar/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ar/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"السائق"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"الوصول إلى الموقع الجغرافي التقريبي في الواجهة الأمامية فقط"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-as/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-as/strings.xml
index 9091503..ea877d4 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-as/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-as/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"চালক"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"কেৱল অগ্ৰভূমিত আনুমানিক অৱস্থান এক্সেছ কৰক"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-az/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-az/strings.xml
index 67b565b..3e2ccc1 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-az/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-az/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Sürücü"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"yalnız ön planda təqribi məkana daxil olun"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-b+sr+Latn/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-b+sr+Latn/strings.xml
index 5f857c2..a20c58e 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-b+sr+Latn/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-b+sr+Latn/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Vozač"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"pristup približnoj lokaciji samo u prvom planu"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-be/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-be/strings.xml
index 7cc0826..d6e8de4 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-be/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-be/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Вадзіцель"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"доступ да прыблізнага месцазнаходжання толькі ў асноўным рэжыме"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-bg/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-bg/strings.xml
index ad2abf6..7a2fd23 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-bg/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-bg/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Шофьор"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"достъп до приблизителното местоположение само на преден план"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-bn/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-bn/strings.xml
index cb6d8a6..e9725c8 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-bn/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-bn/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ড্রাইভার"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"শুধুমাত্র অ্যাপটি খোলা থাকলে আপনার আনুমানিক লোকেশন অ্যাক্সেস করা"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-bs/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-bs/strings.xml
index 5f857c2..a20c58e 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-bs/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-bs/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Vozač"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"pristup približnoj lokaciji samo u prvom planu"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ca/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ca/strings.xml
index 130c869..8d24e22 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ca/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ca/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Conductor"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"accedeix a la ubicació aproximada només en primer pla"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-cs/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-cs/strings.xml
index 40d9e58..2432df2 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-cs/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-cs/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Řidič"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"přístup k přibližné poloze jen na popředí"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-da/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-da/strings.xml
index 25c544c..4f95061 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-da/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-da/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Chauffør"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"få kun adgang til omtrentlig placering i forgrunden"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-de/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-de/strings.xml
index 6a1deea..9febde6 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-de/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-de/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Fahrer"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"Nur bei Ausführung im Vordergrund auf den ungefähren Standort zugreifen"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-el/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-el/strings.xml
index 4c317af..fcfe739 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-el/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-el/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Οδηγός"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"πρόσβαση στην κατά προσέγγιση τοποθεσία μόνο στο προσκήνιο"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rAU/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-en-rAU/strings.xml
index a4a3e1a..85c4908 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-en-rAU/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-en-rAU/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Driver"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"access approximate location only in the foreground"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rCA/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-en-rCA/strings.xml
index a4a3e1a..85c4908 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-en-rCA/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-en-rCA/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Driver"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"access approximate location only in the foreground"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
index a4a3e1a..85c4908 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Driver"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"access approximate location only in the foreground"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
index a4a3e1a..85c4908 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Driver"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"access approximate location only in the foreground"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
index 725d577..7778984 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎Driver‎‏‎‎‏‎"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎access approximate location only in the foreground‎‏‎‎‏‎"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
index 130c869..5666331 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Conductor"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"acceder a la ubicación aproximada solo en primer plano"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-es/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-es/strings.xml
index 130c869..3e3ad48 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-es/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-es/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Conductor"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"acceder a la ubicación aproximada solo al estar en primer plano"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-et/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-et/strings.xml
index 4cffa81..27ae02b 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-et/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-et/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Sõitja"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"juurdepääs ligikaudsele asukohale ainult esiplaanil"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-eu/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-eu/strings.xml
index 14ccb8e..f7e62cf 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-eu/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-eu/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Gidaria"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"atzitu gutxi gorabeherako kokapena aurreko planoan bakarrik"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fa/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-fa/strings.xml
index 19c4ff9..4d257d6 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-fa/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-fa/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"راننده"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"دسترسی به مکان تقریبی فقط در پیش‌زمینه"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fi/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-fi/strings.xml
index 07853e1..b2d5135 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-fi/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-fi/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Kuljettaja"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"käyttää likimääräistä sijaintia vain etualalla"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
index 3cfdaf3..2ac4be7 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Conducteur"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"accéder à votre position approximative seulement en avant-plan"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fr/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-fr/strings.xml
index 3cfdaf3..81af986 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-fr/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-fr/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Conducteur"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"accéder à la position approximative au premier plan uniquement"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-gl/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-gl/strings.xml
index fa09574..3754442 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-gl/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-gl/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Condutor"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"acceder á localización aproximada só en primeiro plano"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-gu/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-gu/strings.xml
index 62dd43e..5c6ff84 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-gu/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-gu/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ડ્રાઇવર"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ફૉરગ્રાઉન્ડમાં ફક્ત અંદાજિત સ્થાન ઍક્સેસ કરો"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hi/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-hi/strings.xml
index fbe93e1..003478d 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-hi/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-hi/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ड्राइवर"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"अनुमानित जगह की जानकारी सिर्फ़ तब ऐक्सेस करें, जब ऐप्लिकेशन स्क्रीन पर खुला हो"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hr/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-hr/strings.xml
index 5f857c2..4cffd31 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-hr/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-hr/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Vozač"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"pristupiti približnoj lokaciji samo u prednjem planu"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hu/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-hu/strings.xml
index 83dc49a..52b7760 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-hu/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-hu/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Sofőr"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"megközelítőleges helyadatokhoz való hozzáférés csak előtérben"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hy/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-hy/strings.xml
index cbaa105..68df140 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-hy/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-hy/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Վարորդ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"տեղադրության մոտավոր տվյալների հասանելիություն միայն ֆոնային ռեժիմում"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-in/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-in/strings.xml
index 89fa52e..21c21a8 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-in/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-in/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Pengemudi"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"akses perkiraan lokasi hanya saat di latar depan"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-is/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-is/strings.xml
index 38bba6e..1eb3776 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-is/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-is/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Ökumaður"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"aðgangur að áætlaðri staðsetningu aðeins í forgrunni"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
index c9491dd..c704544 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Autista"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"Accesso alla posizione approssimativa solo in primo piano"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-iw/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-iw/strings.xml
index f1383ea..a8d3bee 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-iw/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-iw/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"נהג/ת"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"קבלת גישה למיקום משוער בחזית בלבד"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ja/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ja/strings.xml
index 7872368..eb41c01 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ja/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ja/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ドライバー"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"フォアグラウンドでのみおおよその位置情報を取得"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ka/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ka/strings.xml
index 55879f3..4d26423 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ka/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ka/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"მძღოლი"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"მიახლოებით მდებარეობაზე წვდომა მხოლოდ წინა პლანზე"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-kk/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-kk/strings.xml
index 68714f3..b12a6d5 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-kk/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-kk/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Көлік жүргізуші"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"болжалды орналасқан жер туралы ақпаратқа тек ашық экранда кіру"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-km/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-km/strings.xml
index f2d19e7..4975540 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-km/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-km/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"អ្នក​បើកបរ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ចូលប្រើ​ទីតាំង​ប្រហាក់ប្រហែល​តែនៅផ្ទៃ​ខាងមុខប៉ុណ្ណោះ"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-kn/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-kn/strings.xml
index 1812f01..27e9a9e 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-kn/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-kn/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ಡ್ರೈವರ್"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ಮುನ್ನೆಲೆಯಲ್ಲಿ ಮಾತ್ರ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ko/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ko/strings.xml
index 6fb8bbd..20facb1 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ko/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ko/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"운전자"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"포그라운드에서만 대략적인 위치에 액세스"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ky/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ky/strings.xml
index a961e34..1a43c49 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ky/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ky/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Айдоочу"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"болжолдуу аныкталган жайгашкан жерге активдүү режимде гана кирүүгө уруксат берүү"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-lo/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-lo/strings.xml
index a2e075b..877a259 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-lo/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-lo/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ຄົນຂັບລົດ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ເຂົ້າເຖິງສະຖານທີ່ໂດຍປະມານເມື່ອຢູ່ໃນພື້ນໜ້າເທົ່ານັ້ນ"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-lt/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-lt/strings.xml
index 20d10d8..134230f 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-lt/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-lt/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Vairuotojas"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"pasiekti apytikslę vietovę, tik kai programa veikia priekiniame plane"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-lv/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-lv/strings.xml
index f8a9b63..3cc5c88 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-lv/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-lv/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Vadītājs"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"piekļuve aptuvenai atrašanās vietai, tikai darbojoties priekšplānā"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-mk/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-mk/strings.xml
index ea97216..3b1eda7 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-mk/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-mk/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Возач"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"пристап до приближната локација само во преден план"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ml/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ml/strings.xml
index e09eaeb..7205182 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ml/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ml/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ഡ്രൈവർ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ഏകദേശ ലൊക്കേഷൻ ഫോർഗ്രൗണ്ടിൽ മാത്രം ആക്‌സസ് ചെയ്യുക"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-mn/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-mn/strings.xml
index 5a1682e..dd1d6a2 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-mn/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-mn/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Жолооч"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ойролцоо байршилд зөвхөн дэлгэц дээр хандах"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-mr/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-mr/strings.xml
index de33088..a0619ec 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-mr/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-mr/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ड्रायव्हर"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"फक्त फोअरग्राउंडमध्ये अंदाजे स्थान अ‍ॅक्सेस करा"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ms/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ms/strings.xml
index 837f538..7f22021 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ms/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ms/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Pemandu"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"akses lokasi anggaran hanya di latar depan"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-my/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-my/strings.xml
index 5c96457..aea1568 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-my/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-my/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ယာဉ်မောင်းသူ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"မျက်နှာစာတွင်သာ ခန့်မှန်းခြေ တည်နေရာ အသုံးပြုခြင်း"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-nb/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-nb/strings.xml
index 139517b..6e0de84 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-nb/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-nb/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Sjåfør"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"bare tilgang til omtrentlig posisjon i forgrunnen"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ne/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ne/strings.xml
index 21d4f74..76ca044 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ne/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ne/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"चालक"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"अग्रभूमिमा मात्र अनुमानित स्थानमाथि पहुँच राख्नुहोस्"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-nl/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-nl/strings.xml
index c634d43..873fb01 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-nl/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-nl/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Chauffeur"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"alleen toegang tot geschatte locatie op de voorgrond"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-or/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-or/strings.xml
index 04f5336..964683f 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-or/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-or/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ଡ୍ରାଇଭର୍"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"କେବଳ ଫୋର୍‌ଗ୍ରାଉଣ୍ଡରେ ହାରାହାରି ଲୋକେସନ୍ ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pa/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-pa/strings.xml
index 354b580..16541d3 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-pa/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-pa/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ਡਰਾਈਵਰ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"ਸਿਰਫ਼ ਫੋਰਗ੍ਰਾਊਂਡ ਵਿੱਚ ਅਨੁਮਾਨਿਤ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰੋ"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pl/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-pl/strings.xml
index 315bf44..d0ff092 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-pl/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-pl/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Kierowca"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"dostęp do przybliżonej lokalizacji tylko na pierwszym planie"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
index fa09574..984000a 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Condutor"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"apenas aceder à localização aproximada em primeiro plano"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pt/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-pt/strings.xml
index af84856..7ac9eef 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-pt/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-pt/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Motorista"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"acessar local aproximado apenas em primeiro plano"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ro/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ro/strings.xml
index c6ca011..ec78db2 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ro/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ro/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Șofer"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"să acceseze locația aproximativă numai în prim-plan"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ru/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ru/strings.xml
index 87359fb..ed49d76 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ru/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ru/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Водитель"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"Доступ к приблизительному местоположению только в активном режиме"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-si/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-si/strings.xml
index a2aa811..fcba27e 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-si/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-si/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"රියදුරු"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"පෙරබිම තුළ පමණක් ආසන්න ස්ථානයට ප්‍රවේශය"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sk/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-sk/strings.xml
index 94a4723..c9a990d 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-sk/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-sk/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Vodič"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"prístup k približnej polohe iba v popredí"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sl/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-sl/strings.xml
index 9f75529..918dda4 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-sl/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-sl/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Voznik"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"dostop do približne lokacije samo, ko deluje v ospredju"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sq/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-sq/strings.xml
index 4e6cd54..e4192e7 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-sq/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-sq/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Drejtuesi"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"qasu në vendndodhjen e përafërt vetëm në plan të parë"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sr/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-sr/strings.xml
index ea97216..8cce889 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-sr/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-sr/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Возач"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"приступ приближној локацији само у првом плану"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sv/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-sv/strings.xml
index 12d2369..b5b4f63 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-sv/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-sv/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Förare"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"endast åtkomst till ungefärlig plats i förgrunden"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sw/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-sw/strings.xml
index 90924e1..765973c 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-sw/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-sw/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Dereva"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"kufikia mahali palipokadiriwa ikiwa tu programu imefunguliwa kwenye skrini"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ta/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ta/strings.xml
index 47a7058..264f0c1 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ta/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ta/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"கார் உரிமையாளர்"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"முன்புலத்தில் இயங்கும்போது மட்டும் தோராயமான இருப்பிடத்தைக் கண்டறிதல்"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-te/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-te/strings.xml
index ebbb6b3..bf45f96 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-te/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-te/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"డ్రైవర్"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"స్క్రీన్‌పై ఉన్నప్పుడు మాత్రమే సమీప లొకేషన్‌ను యాక్సెస్ చేయండి"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-th/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-th/strings.xml
index c3d4c8c..8fae2ca 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-th/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-th/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ผู้ขับรถ"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"เข้าถึงตำแหน่งโดยประมาณเมื่ออยู่เบื้องหน้าเท่านั้น"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-tl/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-tl/strings.xml
index a4a3e1a..d425a87 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-tl/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-tl/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Driver"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"i-access lang ang tinatantyang lokasyon sa foreground"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-tr/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-tr/strings.xml
index 67b565b..244564e 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-tr/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-tr/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Sürücü"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"yalnızca ön planda yaklaşık konuma erişme"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-uk/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-uk/strings.xml
index 1bc0b22..b46d679 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-uk/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-uk/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Водій"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"отримувати доступ до даних про приблизне місцезнаходження лише в активному режимі"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ur/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-ur/strings.xml
index f69a738..89fd655 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-ur/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-ur/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"ڈرائیور"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"صرف پیش منظر میں تخمینی مقام تک رسائی"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-uz/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-uz/strings.xml
index 07264f4..9914c10 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-uz/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-uz/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Haydovchi"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"taxminiy joylashuv axborotini olishga faqat old fonda ruxsat"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-vi/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-vi/strings.xml
index ef6b702..d478052 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-vi/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-vi/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Tài xế"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"chỉ truy cập thông tin vị trí gần đúng khi ứng dụng mở trên màn hình"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
index 0347e14..06fe50d 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"司机"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"只有在前台运行时才能获取大致位置信息"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
index 37aab13..86618d3 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"司機"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"只在前景存取大概位置"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
index 8ecce72..59f09e1 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"駕駛"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"僅可在前景中取得概略位置"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zu/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-zu/strings.xml
index b5ec2c1..adb9402 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-zu/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-zu/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="owner_name" msgid="3416113395996003764">"Umshayeli"</string>
+    <string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"finyelela indawo enembile kuphela engaphambili"</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
index 62ff41c..56dbf19 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
@@ -48,7 +48,6 @@
     <!-- Allow smart unlock immediately after boot because the user shouldn't have to enter a pin
          code to unlock their car head unit. -->
     <bool name="config_strongAuthRequiredOnBoot">false</bool>
-    <string name="config_defaultTrustAgent" translatable="false">com.android.car/com.android.car.trust.CarBleTrustAgent</string>
     <!-- Show Navigation Bar -->
     <bool name="config_showNavigationBar">true</bool>
 
@@ -58,6 +57,9 @@
     <!-- Automotive Bluetooth pairing option -->
     <bool name="enable_pbap_pce_profile">true</bool>
 
+    <!-- Whether the device supports quick settings and its associated APIs -->
+    <bool name="config_quickSettingsSupported">false</bool>
+
     <!-- Flag indicating that the entire notification header can be clicked to expand the
          notification. If false, then the expand icon has to be clicked in order for the expand
          to occur. -->
@@ -88,4 +90,12 @@
     <bool name="config_supportsSystemDecorsOnSecondaryDisplays">false</bool>
 
     <string name="config_dataUsageSummaryComponent">com.android.car.settings/com.android.car.settings.datausage.DataWarningAndLimitActivity</string>
+
+    <bool name="config_automotiveHideNavBarForKeyboard">true</bool>
+
+    <!-- Turn off Wallpaper service -->
+    <bool name="config_enableWallpaperService">false</bool>
+
+    <!-- Automotive explicitly controls when the system suspends. Do not use autoSuspend. -->
+    <bool name="config_enableAutoSuspend" translatable="false">false</bool>
 </resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values/strings.xml
index 9217647..34fd92f 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values/strings.xml
@@ -18,4 +18,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Default name of the owner user [CHAR LIMIT=20] -->
     <string name="owner_name">Driver</string>
+    <string name="permlab_accessCoarseLocation">access approximate location only in the foreground</string>
 </resources>
diff --git a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml b/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
index d8d8516..e30a197 100644
--- a/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
+++ b/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
@@ -80,4 +80,42 @@
     <!-- Keep the notification background when the container has been expanded. The children will
          expand inline within the container, so it can keep its original background. -->
     <bool name="config_showGroupNotificationBgWhenExpanded">true</bool>
+
+    <!--
+      Service components below were copied verbatim from frameworks/base/packages/SystemUI/res/values/config.xml,
+      then the services that are not needed by automotive were commented out (to improve boot and user switch time).
+    -->
+    <string-array name="config_systemUIServiceComponents" translatable="false">
+        <item>com.android.systemui.util.NotificationChannels</item>
+        <item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item>
+        <item>com.android.systemui.keyguard.KeyguardViewMediator</item>
+<!--
+        <item>com.android.systemui.recents.Recents</item>
+-->
+<!--
+        <item>com.android.systemui.volume.VolumeUI</item>
+-->
+        <item>com.android.systemui.stackdivider.Divider</item>
+        <item>com.android.systemui.SystemBars</item>
+        <item>com.android.systemui.usb.StorageNotification</item>
+        <item>com.android.systemui.power.PowerUI</item>
+        <item>com.android.systemui.media.RingtonePlayer</item>
+        <item>com.android.systemui.keyboard.KeyboardUI</item>
+<!--
+        <item>com.android.systemui.pip.PipUI</item>
+-->
+        <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>
+        <item>@string/config_systemUIVendorServiceComponent</item>
+        <item>com.android.systemui.util.leak.GarbageMonitor$Service</item>
+        <item>com.android.systemui.LatencyTester</item>
+        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>
+        <item>com.android.systemui.ScreenDecorations</item>
+        <item>com.android.systemui.biometrics.BiometricDialogImpl</item>
+        <item>com.android.systemui.SliceBroadcastRelayHandler</item>
+        <item>com.android.systemui.SizeCompatModeActivityController</item>
+        <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>
+        <item>com.android.systemui.theme.ThemeOverlayController</item>
+        <item>com.android.systemui.voicerecognition.car.ConnectedDeviceVoiceRecognitionNotifier</item>
+    </string-array>
+
 </resources>
diff --git a/car_product/overlay/packages/apps/CertInstaller/res/values/config.xml b/car_product/overlay/packages/apps/CertInstaller/res/values/config.xml
new file mode 100644
index 0000000..6f94ffb
--- /dev/null
+++ b/car_product/overlay/packages/apps/CertInstaller/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2019 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <string name="config_system_install_component" translatable="false">com.android.car.settings/com.android.car.settings.security.CredentialStorageActivity</string>
+</resources>
diff --git a/car_product/sepolicy/private/bluetooth.te b/car_product/sepolicy/private/bluetooth.te
new file mode 100644
index 0000000..6ba74c2
--- /dev/null
+++ b/car_product/sepolicy/private/bluetooth.te
@@ -0,0 +1 @@
+allow bluetooth mediametrics_service:service_manager find;
diff --git a/car_product/sepolicy/private/carservice_app.te b/car_product/sepolicy/private/carservice_app.te
index 817aa5d..05c7b3f 100644
--- a/car_product/sepolicy/private/carservice_app.te
+++ b/car_product/sepolicy/private/carservice_app.te
@@ -12,13 +12,15 @@
 # Allow Car Service to register/access itself with ServiceManager
 add_service(carservice_app, carservice_service)
 
-allow carservice_app wifi_service:service_manager find;
+# Allow Car Service to register its stats service with ServiceManager
+add_service(carservice_app, carstats_service)
 
 # Allow Car Service to access certain system services.
 # Keep alphabetically sorted.
 allow carservice_app {
     accessibility_service
     activity_service
+    activity_task_service
     audio_service
     audioserver_service
     autofill_service
@@ -40,6 +42,8 @@
     telecom_service
     uimode_service
     voiceinteraction_service
+    wifi_service
+    wifiscanner_service
 }:service_manager find;
 
 # Read and write /data/data subdirectory.
@@ -49,6 +53,8 @@
 allow carservice_app system_car_data_file:dir create_dir_perms;
 allow carservice_app system_car_data_file:{ file lnk_file } create_file_perms;
 
+net_domain(carservice_app)
+
 allow carservice_app cgroup:file rw_file_perms;
 
 # For I/O stats tracker
diff --git a/car_product/sepolicy/private/platform_app.te b/car_product/sepolicy/private/platform_app.te
index 6f67594..65dd75d 100644
--- a/car_product/sepolicy/private/platform_app.te
+++ b/car_product/sepolicy/private/platform_app.te
@@ -1,2 +1,5 @@
-allow platform_app broadcastradio_service:service_manager find;
-allow platform_app carservice_service:service_manager find;
+allow platform_app {
+    broadcastradio_service
+    carservice_service
+    update_engine_service
+}:service_manager find;
diff --git a/car_product/sepolicy/private/service_contexts b/car_product/sepolicy/private/service_contexts
index 7ac544c..38d994c 100644
--- a/car_product/sepolicy/private/service_contexts
+++ b/car_product/sepolicy/private/service_contexts
@@ -1,2 +1,3 @@
 car_service  u:object_r:carservice_service:s0
+car_stats u:object_r:carstats_service:s0
 com.android.car.procfsinspector u:object_r:procfsinspector_service:s0
diff --git a/car_product/sepolicy/private/statsd.te b/car_product/sepolicy/private/statsd.te
new file mode 100644
index 0000000..1a17418
--- /dev/null
+++ b/car_product/sepolicy/private/statsd.te
@@ -0,0 +1,2 @@
+# Allow statsd to pull atoms from car_stats service
+allow statsd carstats_service:service_manager find;
diff --git a/car_product/sepolicy/private/system_app.te b/car_product/sepolicy/private/system_app.te
index 232b117..f212050 100644
--- a/car_product/sepolicy/private/system_app.te
+++ b/car_product/sepolicy/private/system_app.te
@@ -1 +1,2 @@
 hal_client_domain(system_app, hal_vehicle)
+allow system_app { proc_vmallocinfo proc_pagetypeinfo }:file r_file_perms;
diff --git a/car_product/sepolicy/public/file.te b/car_product/sepolicy/public/file.te
index 8555d29..11bf839 100644
--- a/car_product/sepolicy/public/file.te
+++ b/car_product/sepolicy/public/file.te
@@ -5,4 +5,4 @@
 type sysfs_fs_lifetime_write, sysfs_type, fs_type;
 
 # /data/system/car
-type system_car_data_file, file_type, data_file_type, core_data_file_type;
\ No newline at end of file
+type system_car_data_file, file_type, data_file_type, core_data_file_type;
diff --git a/car_product/sepolicy/public/property_contexts b/car_product/sepolicy/public/property_contexts
index 8dbe0bc..9646ac9 100644
--- a/car_product/sepolicy/public/property_contexts
+++ b/car_product/sepolicy/public/property_contexts
@@ -1 +1,3 @@
+android.car.number_pre_created_guests            u:object_r:car_bootuser_prop:s0
+android.car.number_pre_created_users             u:object_r:car_bootuser_prop:s0
 android.car.systemuser.bootuseroverrideid        u:object_r:car_bootuser_prop:s0
diff --git a/car_product/sepolicy/public/service.te b/car_product/sepolicy/public/service.te
index 87426f4..c6a2e30 100644
--- a/car_product/sepolicy/public/service.te
+++ b/car_product/sepolicy/public/service.te
@@ -1,2 +1,3 @@
 type carservice_service, app_api_service, service_manager_type;
+type carstats_service, service_manager_type;
 type procfsinspector_service, service_manager_type;
diff --git a/car_product/sepolicy/public/te_macros b/car_product/sepolicy/public/te_macros
new file mode 100644
index 0000000..963afdc
--- /dev/null
+++ b/car_product/sepolicy/public/te_macros
@@ -0,0 +1,7 @@
+# Define a macro to allow extra HAL dump
+define(`dump_extra_hal', `
+  hal_client_domain(dumpstate, $1);
+  allow $1_server dumpstate:fifo_file write;
+  allow $1_server dumpstate:fd use;
+  allow dumpstate $1:process signal;
+')
diff --git a/car_product/sepolicy/test/hal_vehicle_default.te b/car_product/sepolicy/test/hal_vehicle_default.te
new file mode 100644
index 0000000..8b9f6ee
--- /dev/null
+++ b/car_product/sepolicy/test/hal_vehicle_default.te
@@ -0,0 +1,4 @@
+typeattribute hal_vehicle_default hal_automotive_socket_exemption;
+
+unix_socket_connect(hal_vehicle_default, fwmarkd, netd)
+net_domain(hal_vehicle_default)
diff --git a/car_product/sepolicy/test/kitchensink_app.te b/car_product/sepolicy/test/kitchensink_app.te
index 297b3e7..dcdb1e4 100644
--- a/car_product/sepolicy/test/kitchensink_app.te
+++ b/car_product/sepolicy/test/kitchensink_app.te
@@ -10,7 +10,10 @@
     accessibility_service
     activity_service
     activity_task_service
+    audio_service
+    audioserver_service
     autofill_service
+    carservice_service
     connectivity_service
     content_service
     deviceidle_service
@@ -19,11 +22,14 @@
     input_method_service
     input_service
     location_service
+    mediaserver_service
     network_management_service
     power_service
     sensorservice_service
     surfaceflinger_service
+    telecom_service
     uimode_service
+    wifi_service
 }:service_manager find;
 
 # Read and write /data/data subdirectory.
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index 7d85445..59ce65d 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -475,6 +475,16 @@
         android:label="@string/car_permission_label_enroll_trust"
         android:description="@string/car_permission_desc_enroll_trust" />
 
+    <!-- Allows a test application to control car service's testing mode.
+         This is only for platform level testing.
+         <p>Protection level: signature|privileged
+    -->
+    <permission
+        android:name="android.car.permission.CAR_TEST_SERVICE"
+        android:protectionLevel="signature|privileged"
+        android:label="@string/car_permission_label_car_test_service"
+        android:description="@string/car_permission_desc_car_test_service" />
+
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
     <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
@@ -492,6 +502,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -535,5 +546,11 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
+        <activity android:name="com.android.car.am.ContinuousBlankActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                  android:exported="false"
+                  android:launchMode="singleTask">
+        </activity>
     </application>
 </manifest>
diff --git a/service/res/drawable/action_button_background.xml b/service/res/drawable/action_button_background.xml
new file mode 100644
index 0000000..afed15e
--- /dev/null
+++ b/service/res/drawable/action_button_background.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@*android:color/car_card_ripple_background">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/action_button_background_color" />
+            <corners android:radius="@dimen/action_button_corner_radius"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/service/res/drawable/button_background.xml b/service/res/drawable/button_background.xml
deleted file mode 100644
index c714124..0000000
--- a/service/res/drawable/button_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/button_background"/>
-    <corners android:radius="@dimen/button_radius"/>
-</shape>
diff --git a/service/res/drawable/button_ripple_background.xml b/service/res/drawable/button_ripple_background.xml
deleted file mode 100644
index 418c508..0000000
--- a/service/res/drawable/button_ripple_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_background">
-    <item android:drawable="@drawable/button_background" />
-</ripple>
diff --git a/service/res/drawable/car_ic_ux_restricted_48dp.xml b/service/res/drawable/car_ic_ux_restricted_48dp.xml
new file mode 100644
index 0000000..97fd3d5
--- /dev/null
+++ b/service/res/drawable/car_ic_ux_restricted_48dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+</vector>
diff --git a/service/res/layout/activity_blocking.xml b/service/res/layout/activity_blocking.xml
index 0c10016..f79406d 100644
--- a/service/res/layout/activity_blocking.xml
+++ b/service/res/layout/activity_blocking.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,69 +12,58 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/activity_blocking_activity_background"
-    android:gravity="center">
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:orientation="horizontal"
-        android:gravity="center">
-        <ImageView
-            android:id="@+id/blocked_app_icon"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content" />
-        <TextView
-            android:id="@+id/blocked_app_name"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginStart="@dimen/common_margin"
-            android:textColor="@color/blocking_text"
-            android:textAppearance="@style/ActivityBlockingActivityText" />
-    </LinearLayout>
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/blocking_text"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="@dimen/common_margin"
-        android:gravity="center"
-        android:textAppearance="@style/ActivityBlockingActivityText" />
+  <ImageView
+      android:id="@+id/ux_restricted_icon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/common_margin"
+      android:src="@drawable/car_ic_ux_restricted_48dp" />
 
-    <!-- Show exit button if we need to (and are able to) restart the blocked task -->
-    <TextView
-        android:id="@+id/exit_button_message"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="@dimen/common_margin"
-        android:textAppearance="@style/ActivityBlockingActivityText" />
+  <TextView
+      android:id="@+id/blocking_text"
+      android:layout_width="@dimen/blocking_text_width"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:text="@string/activity_blocked_text"
+      android:textAppearance="@style/ActivityBlockingActivityText" />
+
+  <LinearLayout
+      android:id="@+id/action_button_container"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="48dp"
+      android:layout_gravity="center"
+      android:gravity="center_horizontal"
+      android:orientation="horizontal">
     <Button
         android:id="@+id/exit_button"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="@dimen/common_margin"
-        android:text="@string/exit_button"
-        style="@style/ButtonStyle"/>
+        style="@style/ButtonStyle" />
 
-    <!-- Widgets to display debug info. They should not show for non-user build. -->
     <Button
         android:id="@+id/toggle_debug_info"
-        android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="@dimen/common_margin"
+        style="@style/ButtonStyle"
         android:text="@string/debug_button_text"
-        style="@style/ButtonStyle"/>
-
-    <TextView
-        android:id="@+id/debug_info"
         android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginTop="@dimen/common_margin"
-        android:textAppearance="@style/ActivityBlockingActivityText" />
+        android:layout_marginStart="@dimen/action_button_padding_horizontal"/>
+
+  </LinearLayout>
+
+  <TextView
+      android:id="@+id/debug_info"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/ActivityBlockingActivityText"
+      android:visibility="gone" />
+
 </LinearLayout>
+
diff --git a/service/res/layout/activity_continuous_blank.xml b/service/res/layout/activity_continuous_blank.xml
new file mode 100644
index 0000000..ea62da2
--- /dev/null
+++ b/service/res/layout/activity_continuous_blank.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#000000"
+    android:gravity="center">
+</LinearLayout>
diff --git a/service/res/values-af/strings.xml b/service/res/values-af/strings.xml
index 8da32cf..212959c 100644
--- a/service/res/values-af/strings.xml
+++ b/service/res/values-af/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Hanteer invoergebeurtenisse"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus het misluk"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus reageer nie. Ontprop hoofeenheidkas, prop dit weer in, en herbegin die motor"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Vir jou veiligheid is dié aktiwiteit nie beskikbaar terwyl jy bestuur nie.\nWag totdat jy geparkeer het om voort te gaan."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Jy kan nie hierdie kenmerk gebruik terwyl jy bestuur nie"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Kies <xliff:g id="EXIT_BUTTON">%s</xliff:g> om oor te begin met veilige programkenmerke."</string>
     <string name="exit_button" msgid="5829638404777671253">"Terug"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Maak program toe"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Terug"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"lees diagnostiese data"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lees diagnostiese data van die motor af."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"vee diagnostiese data uit"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Toegang tot motor se kragstaat."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Skryf vertroude toestel in"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Laat inskrywing van vertroude toestelle toe"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Beheer motor se toetsmodus"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Beheer motor se toetsmodus"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Toestel"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gas"</string>
 </resources>
diff --git a/service/res/values-am/strings.xml b/service/res/values-am/strings.xml
index 41b7622..62857d5 100644
--- a/service/res/values-am/strings.xml
+++ b/service/res/values-am/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"የግቤት ክስተቶችን ያስተናግዱ"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN አውቶብስ አልተሳካም"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN አውቶብስ ምላሽ አይሰጥም። የጭንቅላት አሃድ መያዣ ሳጥኑን ይሰኩ እና ይንቀሉ በመቀጠል መኪናውን ዳግም ያስጀምሩ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ለእርስዎ ደህንነት ሲባል፣ ይህ እንቅስቃሴ እርስዎ በሚነዱበት ጊዜ አይገኝም። \nለመቀጠል እንዲችሉ፣ መኪናዎ እስከሚቆም ድረስ ይጠብቁ።"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"እየነዱ ሳለ ይህን ባህሪ መጠቀም አይችሉም"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ከደህንነት አስተማማኝ የሆኑ የመተግበሪያ ባህሪያት ጋር መልሶ ለመጀመር፣ <xliff:g id="EXIT_BUTTON">%s</xliff:g>ን ይምረጡ።"</string>
     <string name="exit_button" msgid="5829638404777671253">"ተመለስ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"መተግበሪያን ዝጋ"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ተመለስ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"የምርመራ ውሂብን አንብብ"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ከመኪናው ላይ የምርመራ ውሂብን ያንብቡ።"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"የምርመራ ውሂብን አጽዳ"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"የመኪናውን የኃይል ሁነታ ይድረሱበት።"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"የታመነ መሣሪያ ያስመዝግቡ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"የታመነ መሣሪያ ምዝገባ ይፍቀዱ"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"የመኪና ሙከራ ሁነታን ተቆጣጠር"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"የመኪና ሙከራ ሁነታን ተቆጣጠር"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"የእኔ መሣሪያ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"እንግዳ"</string>
 </resources>
diff --git a/service/res/values-ar/strings.xml b/service/res/values-ar/strings.xml
index d9b7040..a79636f 100644
--- a/service/res/values-ar/strings.xml
+++ b/service/res/values-ar/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"التعامل مع أحداث الإدخال"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"حدث خطأ في موصّل CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"لا استجابة من موصّل CAN. يمكنك فصل صندوق وحدة الرأس وإعادة تشغيل السيارة."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"حرصًا على سلامتك، لا يتوفّر هذا النشاط أثناء القيادة.\nللمتابعة، يمكنك الانتظار حتى تتوقّف السيارة."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"لا يمكنك استخدام هذه الميزة أثناء القيادة."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"للبدء من جديد باستخدام ميزات تطبيق آمنة، اختَر <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"رجوع"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"إغلاق التطبيق"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"رجوع"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"قراءة البيانات التشخيصية"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"يمكنك قراءة البيانات التشخيصية من السيارة."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"محو البيانات التشخيصية"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"يمكنك الحصول على معلومات عن حالة قدرة السيارة."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"تسجيل الجهاز الموثوق به"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"السماح بتسجيل الأجهزة الموثوق بها"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"وضع اختبار التحكم في السيارة"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"وضع اختبار التحكم في السيارة"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"جهازي"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ضيف"</string>
 </resources>
diff --git a/service/res/values-as/strings.xml b/service/res/values-as/strings.xml
index 0cac303..49fc913 100644
--- a/service/res/values-as/strings.xml
+++ b/service/res/values-as/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ইনপুট ইভেণ্ট নিয়ন্ত্ৰণ কৰিব"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN বাছ বিফল হৈছে"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN বাছে সঁহাৰি দিয়া নাই। হে’ড ইউনিট বাকচটো আঁতৰাই পুনৰ লগাওক"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"আপোনাৰ নিৰাপত্তাৰ বাবে এই কাৰ্যকলাপটো গাড়ী চলাই থকা সময়ত কৰিব নোৱাৰি।\nগাড়ীখন পাৰ্ক কৰি কামটো কৰক।"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"আপুনি গাড়ী চলাই থকাৰ সময়ত এই সুবিধাটো ব্যৱহাৰ কৰিব নোৱাৰে"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"সুৰক্ষিত এপ্ সুবিধাসহ আকৌ আৰম্ভ কৰিবলৈ <xliff:g id="EXIT_BUTTON">%s</xliff:g> বাছনি কৰক।"</string>
     <string name="exit_button" msgid="5829638404777671253">"উভতি যাওক"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"এপ্‌টো বন্ধ কৰক"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"উভতি যাওক"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ডায়গন’ষ্টিক ডেটা পঢ়িব"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"গাড়ীৰ ডায়গ’ষ্টিক তথ্য পঢ়িব।"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ডায়গন’ষ্টিক ডেটা মচিব"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"গাড়ীৰ শক্তিৰ স্থিতি এক্সেছ কৰিব।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"বিশ্বাসী ডিভাইচ পঞ্জীয়ন কৰক"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"বিশ্বাসী ডিভাইচ পঞ্জীয়নৰ অনুমতি দিয়ক"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"বাহনৰ পৰীক্ষণ ম’ড নিয়ন্ত্ৰণ কৰক"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"বাহনৰ পৰীক্ষণ ম’ড নিয়ন্ত্ৰণ কৰক"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"মোৰ ডিভাইচ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"অতিথি"</string>
 </resources>
diff --git a/service/res/values-az/strings.xml b/service/res/values-az/strings.xml
index 5cdfa3d..415a7a8 100644
--- a/service/res/values-az/strings.xml
+++ b/service/res/values-az/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Daxiletmələri idarə etmək"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN idarəetmə mexanizmi uğursuz oldu"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN mexanizmi cavab vermir. Əsas cihaz panelini ayırın və yenidən qoşun, sonra avtomobili yenidən işə salın"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Təhlükəsizliyiniz üçün bu əməliyyat sürüş zamanı əlçatan deyil.\nDavam etmək üçün park edənədək gözləyin."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Avtomobil sürərkən bu funksiyanı istifadə edə bilməzsiniz"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Təhlükəsiz tətbiq xüsusiyyətləri ilə başlamaq üçün <xliff:g id="EXIT_BUTTON">%s</xliff:g> seçin."</string>
     <string name="exit_button" msgid="5829638404777671253">"Geri"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Tətbiqi qapadın"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Geri"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"diaqnoztika məlumatlarını oxumaq"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Avtomobilin diaqnoztika məlumatlarını oxumaq."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diaqnoztika məlumatlarını silmək"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Avtomobilin güc vəziyyətinə giriş."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Güvənli cihazı qeydiyyata alın"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Güvənli cihaz qeydiyyatına icazə verin"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"avtomobilin sınaq rejimini idarə etmək"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"avtomobilin sınaq rejimini idarə etmək"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Cihazım"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Qonaq"</string>
 </resources>
diff --git a/service/res/values-b+sr+Latn/strings.xml b/service/res/values-b+sr+Latn/strings.xml
index e0da81d..7656784 100644
--- a/service/res/values-b+sr+Latn/strings.xml
+++ b/service/res/values-b+sr+Latn/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Upravlja događajima unosa"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Greška CAN magistrale"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN magistrala ne reaguje. Isključite i ponovo uključite glavnu jedinicu i ponovo pokrenite automobil"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Ova aktivnost nije dostupna dok vozite radi vaše bezbednosti.\nDa biste nastavili, prvo se parkirajte."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Ne možete da koristite ovu funkciju dok vozite"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Da biste ponovo počeli sa bezbednim funkcijama aplikacije, izaberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Nazad"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zatvori aplikaciju"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Nazad"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"čitanje dijagnostičkih podataka"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Čitanje dijagnostičkih podataka iz automobila."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"brisanje dijagnostičkih podataka"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Pristup statusu napajanja automobila."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registruj pouzdani uređaj"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Omogući registrovanje pouzdanih uređaja"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrola režima za testiranje automobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrola režima za testiranje automobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moj uređaj"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gost"</string>
 </resources>
diff --git a/service/res/values-be/strings.xml b/service/res/values-be/strings.xml
index b5d46ae..60bc3a6 100644
--- a/service/res/values-be/strings.xml
+++ b/service/res/values-be/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Магчымасць апрацоўваць падзеі ўводу"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-шына парушана"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-шына не адказвае. Перападключыце канектар, а затым выключыце запальванне і паўторна завядзіце аўтамабіль"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Дзеля вашай бяспекі гэта дзеянне недаступнае, калі вы за рулём.\nСпачатку прыпаркуйцеся."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Гэта функцыя недаступная для карыстання, калі аўтамабіль рухаецца"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Каб перазапусціць праграму ў бяспечным рэжыме, націсніце кнопку \"<xliff:g id="EXIT_BUTTON">%s</xliff:g>\"."</string>
     <string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Закрыць праграму"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"атрымліваць даныя дыягностыкі"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Счытванне дыягнастычных даных аўтамабіля"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ачысціць даныя дыягностыкі"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Доступ да інфармацыі пра сілкаванне аўтамабіля."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Зарэгістраваць давераную прыладу"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Дазволіць рэгістрацыю даверанай прылады"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Тэставы рэжым кіравання аўтамабілем"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Тэставы рэжым кіравання аўтамабілем"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мая прылада"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Госць"</string>
 </resources>
diff --git a/service/res/values-bg/strings.xml b/service/res/values-bg/strings.xml
index d5c1fa4..afa35f3 100644
--- a/service/res/values-bg/strings.xml
+++ b/service/res/values-bg/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Обработване на входящи събития"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Грешка в CAN шината"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN шината не реагира. Изключете и включете отново захранването на основното устройство и рестартирайте автомобила"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"От съображения за безопасност тази функция не е достъпна при шофиране.\nЗа да продължите, трябва първо да паркирате."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Не можете да използвате тази функция по време на шофиране"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"За да рестартирате приложението и безопасните му функции, изберете „<xliff:g id="EXIT_BUTTON">%s</xliff:g>“."</string>
     <string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Затваряне"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"четене на диагностични данни"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Четене на диагностични данни от автомобила."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"изчистване на диагностичните данни"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Достъп до състоянието на захранването на автомобила."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Регистриране на надеждно устройство"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Разрешаване на регистрирането на надеждно устройство"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Управление на тестовия режим на автомобила"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Управление на тестовия режим на автомобила"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Моето устройство"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Гост"</string>
 </resources>
diff --git a/service/res/values-bn/strings.xml b/service/res/values-bn/strings.xml
index 3b5957b..32f6df9 100644
--- a/service/res/values-bn/strings.xml
+++ b/service/res/values-bn/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ইনপুট ইভেন্ট হ্যান্ডেল করা"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN বাস কাজ করছে না"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN বাস কাজ করছে না। হেডইউনিট বক্স খুলে নিয়ে আবার লাগান ও গাড়ি রিস্টার্ট করুন"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"আপনার সুরক্ষার জন্য, ড্রাইভ করার সময় এটি করা যাবে না।\nচালিয়ে যেতে, গাড়ি পার্ক করা পর্যন্ত অপেক্ষা করুন।"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ড্রাইভ করার সময় আপনি এই ফিচারটি ব্যবহার করতে পারবেন না"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"অ্যাপের সুরক্ষিত ফিচারগুলি নিয়ে আবার শুরু করতে, <xliff:g id="EXIT_BUTTON">%s</xliff:g> বেছে নিন।"</string>
     <string name="exit_button" msgid="5829638404777671253">"আবার চালু করুন"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"অ্যাপ বন্ধ করুন"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ফিরুন"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ডায়াগনস্টিক ডেটা দেখা"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"গাড়ির ডায়াগনস্টিক সংক্রান্ত ডেটা দেখা।"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ডায়াগনস্টিকস ডেটা সরানো"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"গাড়ির পাওয়ারের স্ট্যাটাস অ্যাক্সেস করা।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"বিশ্বস্ত ডিভাইস নথিভুক্ত করুন"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"বিশ্বস্ত ডিভাইস নথিভুক্ত করার অনুমতি দিন"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"গাড়ির টেস্ট মোড নিয়ন্ত্রণ করুন"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"গাড়ির টেস্ট মোড নিয়ন্ত্রণ করুন"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"আমার ডিভাইস"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"অতিথি"</string>
 </resources>
diff --git a/service/res/values-bs/strings.xml b/service/res/values-bs/strings.xml
index 5770adf..d21a8aa 100644
--- a/service/res/values-bs/strings.xml
+++ b/service/res/values-bs/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Rukovati događajima unosa"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Greška CAN busa"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ne reagira. Isključite i ponovo uključite glavnu jedinicu i ponovo pokrenite automobil"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Radi vaše sigurnosti, ova aktivnost nije dostupna tokom vožnje.\nDa nastavite, sačekajte da se zaustavite."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Nije moguće koristiti ovu funkciju tokom vožnje"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Da počnete ponovo s funkcijama sigurne aplikacije, odaberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Nazad"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zatvori aplikaciju"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Nazad"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"očitati dijagnostičke podatke"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Očitati dijagnostičke podatke automobila."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"brisati dijagnostičke podatke"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Pristupiti podacima o stanju energije automobila."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Prijavi pouzdani uređaj"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Dozvoli prijavu pouzdanih uređaja"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontroliranje testnim načinom automobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontroliranje testnim načinom automobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moj uređaj"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gost"</string>
 </resources>
diff --git a/service/res/values-ca/strings.xml b/service/res/values-ca/strings.xml
index 535b403..209e8f5 100644
--- a/service/res/values-ca/strings.xml
+++ b/service/res/values-ca/strings.xml
@@ -22,8 +22,8 @@
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Accedir a la càmera del cotxe"</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"accedeix a la informació sobre l\'energia del cotxe"</string>
     <string name="car_permission_desc_energy" msgid="3392963810053235407">"Accedir a la informació sobre l\'energia del cotxe"</string>
-    <string name="car_permission_label_hvac" msgid="1499454192558727843">"accedeix al sistema HVAC del cotxe"</string>
-    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Accedir al sistema HVAC del cotxe"</string>
+    <string name="car_permission_label_hvac" msgid="1499454192558727843">"accedir al sistema de calefacció, ventilació i aire condicionat del cotxe"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Accedir al sistema de calefacció, ventilació i aire condicionat del cotxe"</string>
     <string name="car_permission_label_mileage" msgid="4661317074631150551">"accedeix a la informació sobre el quilometratge del cotxe"</string>
     <string name="car_permission_desc_mileage" msgid="7179735693278681090">"Accedir a la informació sobre el quilometratge del cotxe"</string>
     <string name="car_permission_label_speed" msgid="1149027717860529745">"llegeix la velocitat del cotxe"</string>
@@ -43,7 +43,7 @@
     <string name="car_permission_label_audio_volume" msgid="310587969373137690">"controla el volum de l\'àudio del cotxe"</string>
     <string name="car_permission_label_audio_settings" msgid="6524703796944023977">"gestiona la configuració de l\'àudio del cotxe"</string>
     <string name="car_permission_label_mock_vehicle_hal" msgid="7198852512207405935">"emula l\'API vehicle HAL"</string>
-    <string name="car_permission_label_receive_ducking" msgid="4884538660766756573">"rep esdeveniments de reducció del volum de l\'àudio"</string>
+    <string name="car_permission_label_receive_ducking" msgid="4884538660766756573">"rep esdeveniments d\'atenuació d\'àudio"</string>
     <string name="car_permission_desc_receive_ducking" msgid="776376388266656512">"Permet notificar a una aplicació que s\'està baixant el seu volum perquè s\'està reproduint un altre àudio al cotxe."</string>
     <string name="car_permission_desc_mock_vehicle_hal" msgid="5235596491098649155">"Emular l\'API vehicle HAL del cotxe per fer proves internes"</string>
     <string name="car_permission_desc_audio_volume" msgid="536626185654307889">"Controlar el volum d\'àudio del cotxe"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gestionar els esdeveniments d\'entrada"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Ha fallat el bus CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"El bus CAN no respon. Desendolla i torna a endollar el capçal i torna a engegar el cotxe."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Per motius de seguretat, aquesta activitat no està disponible mentre condueixes.\nPer continuar, has d\'estar aparcat."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"No pots fer servir aquesta funció mentre condueixes"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Per tornar a començar amb unes funcions d\'aplicació segures, selecciona <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Enrere"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Tanca l\'aplicació"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Enrere"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"llegeix les dades de diagnòstic"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Llegeix les dades de diagnòstic del cotxe."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"esborra les dades de diagnòstic"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accedeix a l\'estat de la potència del cotxe."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registra un dispositiu de confiança"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permet el registre de dispositius de confiança"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controla el mode de proves del cotxe"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controla el mode de proves del cotxe"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"El meu dispositiu"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Convidat"</string>
 </resources>
diff --git a/service/res/values-cs/strings.xml b/service/res/values-cs/strings.xml
index 369cdbc..432b1e2 100644
--- a/service/res/values-cs/strings.xml
+++ b/service/res/values-cs/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Zpracování vstupních událostí"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Sběrnice CAN selhala"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Sběrnice CAN neodpovídá. Odpojte a opět zapojte autorádio a znovu nastartujte auto"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Tato aktivita není při řízení z bezpečnostních důvodů dostupná.\nPokračovat můžete, až zaparkujete."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Tuto funkci nelze používat při řízení"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Chcete-li začít znovu s bezpečnými funkcemi aplikace, vyberte <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Zpět"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zavřít aplikaci"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Zpět"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"čtení diagnostických dat"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Čtení diagnostických dat z auta."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"vymazat diagnostická data"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Přístup ke stavu nabití auta."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Zaregistrovat důvěryhodné zařízení"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Povolit registraci důvěryhodného zařízení"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Ovládání testovacího režimu auta"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Ovládání testovacího režimu auta"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moje zařízení"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Host"</string>
 </resources>
diff --git a/service/res/values-da/strings.xml b/service/res/values-da/strings.xml
index 5513137..045fb09 100644
--- a/service/res/values-da/strings.xml
+++ b/service/res/values-da/strings.xml
@@ -22,8 +22,8 @@
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Få adgang til bilens kameraer."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"få adgang til oplysninger om bilens energiforbrug"</string>
     <string name="car_permission_desc_energy" msgid="3392963810053235407">"Få adgang til oplysninger om bilens energiforbrug"</string>
-    <string name="car_permission_label_hvac" msgid="1499454192558727843">"få adgang til bilens vvac"</string>
-    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Få adgang til bilens VVAC-system."</string>
+    <string name="car_permission_label_hvac" msgid="1499454192558727843">"få adgang til bilens ventilation"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Få adgang til bilens ventilationssystem."</string>
     <string name="car_permission_label_mileage" msgid="4661317074631150551">"få adgang til oplysninger om bilens kilometertal"</string>
     <string name="car_permission_desc_mileage" msgid="7179735693278681090">"Få adgang til oplysninger om bilens kilometertal."</string>
     <string name="car_permission_label_speed" msgid="1149027717860529745">"tjekke bilens hastighed"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Håndter input"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus (Controller Area Network) mislykkedes"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus (Controller Area Network) svarer ikke. Afbryd forbindelsen til bilens hovedenhed, tilslut den igen, og genstart bilen"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Af hensyn til din sikkerhed kan du ikke få adgang til denne aktivitet, mens du kører.\nParkér, før du kan fortsætte."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Du kan ikke bruge denne funktion, mens du kører"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Vælg <xliff:g id="EXIT_BUTTON">%s</xliff:g> for at starte forfra med sikre appfunktioner."</string>
     <string name="exit_button" msgid="5829638404777671253">"Tilbage"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Luk app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Tilbage"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"tjekke diagnosticeringsdata"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Tjek diagnosticeringsdata fra bilen."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"rydde diagnosticeringsdata"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Få adgang til bilens batteritilstand."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Tilmeld godkendt enhed"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillad tilmelding af godkendt enhed"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Styr bilens testtilstand"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Styr bilens testtilstand"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Min enhed"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gæst"</string>
 </resources>
diff --git a/service/res/values-de/strings.xml b/service/res/values-de/strings.xml
index ff4c461..107e6a2 100644
--- a/service/res/values-de/strings.xml
+++ b/service/res/values-de/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Eingabe-Ereignisse verwalten"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-Bus ausgefallen"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-Bus reagiert nicht. Trenne die Haupteinheit vom Stromnetz, schließe sie wieder an und starte das Auto."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Aus Sicherheitsgründen ist diese Aktivität während der Fahrt nicht verfügbar.\nWarte, bis das Fahrzeug geparkt ist."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Du kannst diese Funktion nicht während der Fahrt nutzen"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Wähle <xliff:g id="EXIT_BUTTON">%s</xliff:g>, um die App mit sicheren Funktionen neu zu starten."</string>
     <string name="exit_button" msgid="5829638404777671253">"Zurück"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"App schließen"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Zurück"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"Diagnosedaten zu lesen"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Diagnosedaten des Autos lesen."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Diagnosedaten zu löschen"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Auf Informationen zum Energiestatus des Autos zugreifen."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Vertrauenswürdiges Gerät registrieren"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Registrieren eines vertrauenswürdigen Geräts erlauben"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Testmodus des Autos steuern"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Testmodus des Autos steuern"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mein Gerät"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gast"</string>
 </resources>
diff --git a/service/res/values-el/strings.xml b/service/res/values-el/strings.xml
index d2846d8..0a61aff 100644
--- a/service/res/values-el/strings.xml
+++ b/service/res/values-el/strings.xml
@@ -30,8 +30,8 @@
     <string name="car_permission_desc_speed" msgid="2047965198165448241">"Πρόσβαση στην ταχύτητα του αυτοκινήτου σας."</string>
     <string name="car_permission_label_vehicle_dynamics_state" msgid="313779267420048367">"πρόσβαση στην κατάσταση δυναμικής του αυτοκινήτου"</string>
     <string name="car_permission_desc_vehicle_dynamics_state" msgid="8891506193446375660">"Πρόσβαση στην κατάσταση δυναμικής του αυτοκινήτου."</string>
-    <string name="car_permission_label_vendor_extension" msgid="7141601811734127361">"πρόσβαση στο κανάλι προμηθευτή του αυτοκινήτου"</string>
-    <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"Πρόσβαση στο κανάλι προμηθευτή του αυτοκινήτου σας, για ανταλλαγή πληροφοριών σχετικά με το αυτοκίνητο."</string>
+    <string name="car_permission_label_vendor_extension" msgid="7141601811734127361">"πρόσβαση στο κανάλι παρόχου υπηρεσιών του αυτοκινήτου"</string>
+    <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"Πρόσβαση στο κανάλι παρόχου υπηρεσιών του αυτοκινήτου σας, για ανταλλαγή πληροφοριών σχετικά με το αυτοκίνητο."</string>
     <string name="car_permission_label_radio" msgid="6009465291685935112">"διαχείριση ραδιοφώνου αυτοκινήτου"</string>
     <string name="car_permission_desc_radio" msgid="3385999027478186964">"Πρόσβαση στο ραδιόφωνο του αυτοκινήτου σας."</string>
     <string name="car_permission_label_projection" msgid="9107156380287576787">"προβολή διεπαφής από το τηλέφωνο στην οθόνη του αυτοκινήτου"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Χειρισμός συμβάντων εισόδου"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Αποτυχία διαύλου CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Ο δίαυλος CAN δεν αποκρίνεται. Αποσυνδέστε και συνδέστε ξανά το πλαίσιο μονάδας κεφαλής και έπειτα επανεκκινήστε το αυτοκίνητο"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Για λόγους ασφαλείας, η δραστηρ. δεν είναι διαθέσιμη όταν οδηγείτε.\nΓια να συνεχίσετε, περιμένετε μέχρι να σταθμεύσετε."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Δεν μπορείτε να χρησιμοποιείτε αυτήν τη λειτουργία όταν οδηγείτε."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Για να ξεκινήσετε από την αρχή με ασφαλείς λειτουργίες εφαρμογής, επιλέξτε <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Πίσω"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Κλείσιμο εφαρμογής"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Πίσω"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"παρακολούθηση δεδομένων διαγνωστικών στοιχείων"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Παρακολούθηση δεδομένων διαγνωστικών στοιχείων από το αυτοκίνητο."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"διαγραφή δεδομένων διαγνωστικών στοιχείων"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Πρόσβαση στην κατάσταση ενέργειας του αυτοκινήτου."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Εγγραφή αξιόπιστης συσκευής"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Να επιτρέπεται η εγγραφή αξιόπιστης συσκευής"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Έλεγχος της λειτουργίας δοκιμής του αυτοκινήτου"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Έλεγχος της λειτουργίας δοκιμής του αυτοκινήτου"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Η συσκευή μου"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Επισκέπτης"</string>
 </resources>
diff --git a/service/res/values-en-rAU/strings.xml b/service/res/values-en-rAU/strings.xml
index 49741f1..cbd442d 100644
--- a/service/res/values-en-rAU/strings.xml
+++ b/service/res/values-en-rAU/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Back"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Guest"</string>
 </resources>
diff --git a/service/res/values-en-rCA/strings.xml b/service/res/values-en-rCA/strings.xml
index 49741f1..cbd442d 100644
--- a/service/res/values-en-rCA/strings.xml
+++ b/service/res/values-en-rCA/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Back"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Guest"</string>
 </resources>
diff --git a/service/res/values-en-rGB/strings.xml b/service/res/values-en-rGB/strings.xml
index 49741f1..cbd442d 100644
--- a/service/res/values-en-rGB/strings.xml
+++ b/service/res/values-en-rGB/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Back"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Guest"</string>
 </resources>
diff --git a/service/res/values-en-rIN/strings.xml b/service/res/values-en-rIN/strings.xml
index 49741f1..cbd442d 100644
--- a/service/res/values-en-rIN/strings.xml
+++ b/service/res/values-en-rIN/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Handle input events"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus failed"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus does not respond. Unplug and plug back in head unit box and restart the car"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"For your safety, this activity isn’t available while driving.\nTo continue, wait until you’ve parked."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"You can’t use this feature while driving"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"To start again with safe app features, select <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Back"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Close app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Back"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"read diagnostic data"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Read diagnostic data from the car."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"clear diagnostic data"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Access car’s power state."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enrol Trusted Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Allow Trusted Device Enrollment"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Control car’s test mode"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Control car’s test mode"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"My Device"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Guest"</string>
 </resources>
diff --git a/service/res/values-en-rXC/strings.xml b/service/res/values-en-rXC/strings.xml
index 5bbe05b..38dea76 100644
--- a/service/res/values-en-rXC/strings.xml
+++ b/service/res/values-en-rXC/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎Handle input events‎‏‎‎‏‎"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎CAN bus failed‎‏‎‎‏‎"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎CAN bus does not respond. Unplug and plug back headunit box and restart the car‎‏‎‎‏‎"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎For your safety, this activity isn’t available while driving.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To continue, wait until you’re parked.‎‏‎‎‏‎"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎You can’t use this feature while driving‎‏‎‎‏‎"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎To start over with safe app features, select ‎‏‎‎‏‏‎<xliff:g id="EXIT_BUTTON">%s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="exit_button" msgid="5829638404777671253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎Back‎‏‎‎‏‎"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎Close app‎‏‎‎‏‎"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎Back‎‏‎‎‏‎"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎read diagnostic data‎‏‎‎‏‎"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎Read diagnostic data from the car.‎‏‎‎‏‎"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎clear diagnostic data‎‏‎‎‏‎"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎Access car’s power state.‎‏‎‎‏‎"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎Enroll Trusted Device‎‏‎‎‏‎"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎Allow Trusted Device Enrollment‎‏‎‎‏‎"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎Control car’s test mode‎‏‎‎‏‎"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎Control car’s test mode‎‏‎‎‏‎"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎My Device‎‏‎‎‏‎"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎Guest‎‏‎‎‏‎"</string>
 </resources>
diff --git a/service/res/values-es-rUS/strings.xml b/service/res/values-es-rUS/strings.xml
index ebcc08c..607ccb0 100644
--- a/service/res/values-es-rUS/strings.xml
+++ b/service/res/values-es-rUS/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"acceder a información del vehículo"</string>
+    <string name="car_permission_label" msgid="741004755205554376">"Acceder a información del vehículo"</string>
     <string name="car_permission_desc" msgid="162499818870052725">"Acceder a la información del auto"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"acceder a la cámara del vehículo"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Acceder a las cámaras del auto"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Controlar eventos de entrada"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Error de bus CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus no responde. Desconecta y vuelve a conectar la caja de la unidad central y enciende nuevamente el auto"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Por razones de seguridad, esta actividad no está disponible al conducir.\nPara continuar espera hasta que estaciones."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"No puedes usar esta función mientras conduces"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Para volver a comenzar con funciones de app seguras, selecciona <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Atrás"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Cerrar app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Atrás"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"leer datos de diagnóstico"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Leer datos de diagnóstico del vehículo."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"borrar datos de diagnóstico"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acceder al estado de potencia del vehículo."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscribir dispositivo de confianza"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir inscripción de dispositivos de confianza"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar el modo de prueba del vehículo"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar el modo de prueba del vehículo"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mi dispositivo"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Invitado"</string>
 </resources>
diff --git a/service/res/values-es/strings.xml b/service/res/values-es/strings.xml
index e2a9e88..9072c1e 100644
--- a/service/res/values-es/strings.xml
+++ b/service/res/values-es/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"acceder a la información del coche"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Acceder a la información del coche."</string>
+    <string name="car_permission_label" msgid="741004755205554376">"acceder a los datos del coche"</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"Acceder a los datos del coche."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"acceder a la cámara del coche"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Acceder a las cámaras del coche."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"acceder a la información sobre el nivel de energía del coche"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gestionar eventos de entrada"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Fallo de bus CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"El bus CAN no responde. Desconecta el cabezal, conéctalo de nuevo y reinicia el coche"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Por tu seguridad, esta actividad no está disponible mientras conduces.\nPuedes continuar cuando hayas aparcado."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"No puedes utilizar esta función mientras conduces"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Para volver a empezar con funciones de aplicaciones seguras, selecciona <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Atrás"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Cerrar aplicación"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Atrás"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"consultar datos de diagnóstico"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Consultar los datos de diagnóstico del coche."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"borrar los datos de diagnóstico"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acceder al estado de la potencia del coche."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrar dispositivo de confianza"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir registro de dispositivos de confianza"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar modo de prueba del coche"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar modo de prueba del coche"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mi dispositivo"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Invitado"</string>
 </resources>
diff --git a/service/res/values-et/strings.xml b/service/res/values-et/strings.xml
index cfaf748..07965d1 100644
--- a/service/res/values-et/strings.xml
+++ b/service/res/values-et/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Sisestussündmuste töötlemine"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-siin ebaõnnestus"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-siin ei reageeri. Eemaldage autoraadio üksus ja pange see tagasi ning taaskäivitage auto"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Teie turvalisuse tõttu ei ole see toiming sõitmise ajal saadaval.\nJätkamiseks oodake, kuni olete parkinud."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Te ei saa seda funktsiooni sõidu ajal kasutada"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Uuesti alustamiseks turvaliste rakenduste funktsioonidega valige <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Tagasi"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Sule rakendus"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Tagasi"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"diagnostikaandmete lugemine"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Auto diagnostikaandmete lugemine."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diagnostikaandmete kustutamine"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Juurdepääs auto võimsuse olekule."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Usaldusväärse seadme registreerimine"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Usaldusväärse seadme registreerimise lubamine"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Auto testrežiimi haldamine"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Auto testrežiimi haldamine"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Minu seade"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Külaline"</string>
 </resources>
diff --git a/service/res/values-eu/strings.xml b/service/res/values-eu/strings.xml
index eed4c05..6b4990c 100644
--- a/service/res/values-eu/strings.xml
+++ b/service/res/values-eu/strings.xml
@@ -58,17 +58,19 @@
     <string name="car_permission_desc_car_cluster_control" msgid="9222776665281176031">"Abiarazi aplikazioak instrumentu lukuan"</string>
     <string name="car_permission_label_bind_instrument_cluster_rendering" msgid="8627480897198377418">"Instrumentu lukuaren errendatzea"</string>
     <string name="car_permission_desc_bind_instrument_cluster_rendering" msgid="5073596870485006783">"Jaso instrumentu lukuaren datuak"</string>
-    <string name="car_permission_label_car_ux_restrictions_configuration" msgid="6801393970411049725">"Erabiltzaileen esperientziaren murriztapenen konfigurazioa"</string>
-    <string name="car_permission_desc_car_ux_restrictions_configuration" msgid="5711926927484813777">"Konfiguratu erabiltzaileen esperientziaren murriztapenak"</string>
+    <string name="car_permission_label_car_ux_restrictions_configuration" msgid="6801393970411049725">"Erabiltzeko moduaren murriztapenen konfigurazioa"</string>
+    <string name="car_permission_desc_car_ux_restrictions_configuration" msgid="5711926927484813777">"Konfiguratu erabiltzeko moduaren murriztapenak"</string>
     <string name="car_permission_label_car_handle_usb_aoap_device" msgid="72783989504378036">"Komunikatu AOAP moduan USB bidezko gailuekin"</string>
     <string name="car_permission_desc_car_handle_usb_aoap_device" msgid="273505990971317034">"Gailuekin AOAP moduan komunikatzeko baimena ematen dio aplikazioari."</string>
     <string name="car_permission_label_bind_input_service" msgid="6698489034024273750">"Autoaren sarrerako zerbitzua"</string>
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kudeatu sarrerako gertaerak"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN autobusak huts egin du"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus-ak ez du erantzuten. Desentxufatu eta entxufatu berriro gailu nagusia eta berrabiarazi autoa."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Zure segurtasuna bermatzeko, eginbide hau ezin da erabili gidatu bitartean.\nAurrera egiteko, itxaron autoa aparkatu arte."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Ezin duzu erabili eginbide hori gidatu bitartean"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Berriro hasi nahi baduzu aplikazioaren eginbide seguruekin, hautatu <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Atzera"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Itxi aplikazioa"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Atzera"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"irakurri diagnostiko-datuak"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Irakurri autoaren diagnostiko-datuak."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"garbitu diagnostiko-datuak"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Atzitu autoaren energia-egoera."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Erregistratu gailu fidagarria"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Eman gailu fidagarriak erregistratzeko baimena"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrolatu autoaren proba modua"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrolatu autoaren proba modua"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Nire gailua"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gonbidatua"</string>
 </resources>
diff --git a/service/res/values-fa/strings.xml b/service/res/values-fa/strings.xml
index 2e29029..93f4c27 100644
--- a/service/res/values-fa/strings.xml
+++ b/service/res/values-fa/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"مدیریت رویدادهای ورودی"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"گذرگاه CAN ناموفق بود"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"گذرگاه CAN پاسخ نمی‌دهد. محفظه ضبط‌وپخش را جدا و سپس وصل کنید و خودرو را دوباره روشن کنید"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"بنا به دلایل ایمنی، این فعالیت درحین رانندگی دردسترس نیست.\n برای ادامه، تا زمان توقف خودرو صبر کنید."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"هنگام رانندگی نمی‌توانید از این ویژگی استفاده کنید"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"برای شروع مجدد با ویژگی‌های برنامه امن، <xliff:g id="EXIT_BUTTON">%s</xliff:g> را انتخاب کنید."</string>
     <string name="exit_button" msgid="5829638404777671253">"برگشت"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"بستن برنامه"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"برگشت"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"خواندن داده‌های عیب‌یابی"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"داده‌های عیب‌یابی خودرو را بخوانید."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"پاک کردن داده‌های عیب‌یابی"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"به وضعیت توان خودرو دسترسی پیدا کنید."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ثبت‌نام دستگاه مطمئن"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"مجاز کردن ثبت‌نام دستگاه مطمئن"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"کنترل حالت آزمایش خودرو"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"کنترل حالت آزمایش خودرو"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"دستگاه من"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"مهمان"</string>
 </resources>
diff --git a/service/res/values-fi/strings.xml b/service/res/values-fi/strings.xml
index 256cdfa..de6b0cb 100644
--- a/service/res/values-fi/strings.xml
+++ b/service/res/values-fi/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"käyttää auton tietoja"</string>
+    <string name="car_permission_label" msgid="741004755205554376">"Pääsy auton tietoihin"</string>
     <string name="car_permission_desc" msgid="162499818870052725">"nähdä auton tiedot"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"käyttää auton kameraa"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"käyttää auton kameroita"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"käsitellä syötteitä"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-väylä hylättiin"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-väylä ei vastaa. Irrota pääyksikkö ja liitä se takaisin. Käynnistä auto sitten uudelleen."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Turvallisuussyistä toiminto ei ole käytettävissä ajon aikana.\nVoit jatkaa, kun olet pysäköinyt auton."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Et voi käyttää ominaisuutta ajon aikana"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Jos haluat aloittaa alusta turvallisilla sovellusominaisuuksilla, valitse <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Takaisin"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Sulje sovellus"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Takaisin"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"nähdä diagnostiikkadataa"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"lukea auton diagnostiikkadataa"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"poistaa diagnostiikkatiedot"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"käyttää auton virtatilaa"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Rekisteröi luotettu laite"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Salli luotetun laitteen rekisteröinti"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Ohjaa auton testaustilaa"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Ohjaa auton testaustilaa"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Oma laite"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Vieras"</string>
 </resources>
diff --git a/service/res/values-fr-rCA/strings.xml b/service/res/values-fr-rCA/strings.xml
index 470879d..23e8d6a 100644
--- a/service/res/values-fr-rCA/strings.xml
+++ b/service/res/values-fr-rCA/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"accéder aux renseignements relatifs à la voiture"</string>
+    <string name="car_permission_label" msgid="741004755205554376">"Accéder aux renseignements relatifs à la voiture"</string>
     <string name="car_permission_desc" msgid="162499818870052725">"Accéder aux renseignements relatifs à la voiture."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"accéder à la caméra de la voiture"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Accéder aux caméras de la voiture."</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gérer les événements d\'entrée"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Défaillance du bus de données CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Le bus de données CAN ne répond pas. Débranchez et rebranchez le boîtier de l\'unité centrale, puis redémarrez la voiture"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Pour votre sécurité, cette activité est bloquée lorsque vous conduisez.\nVous devez être stationné pour continuer."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Vous ne pouvez pas utiliser cette fonctionnalité en conduisant"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Pour recommencer avec des fonctionnalités d\'application sécurisées, sélectionnez <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Retour"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Fermer l\'application"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Retour"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"lire des données de diagnostic"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lire des données de diagnostic à partir de la voiture."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"effacer les données de diagnostic"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accéder à l\'état de l\'alimentation de la voiture."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscription d\'un appareil de confiance"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Autoriser l\'inscription d\'un appareil de confiance"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Contrôler le mode test du véhicule"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Contrôler le mode test du véhicule"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mon appareil"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Invité"</string>
 </resources>
diff --git a/service/res/values-fr/strings.xml b/service/res/values-fr/strings.xml
index 6d562be..22a3be3 100644
--- a/service/res/values-fr/strings.xml
+++ b/service/res/values-fr/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gérer les événements d\'entrée"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Échec du bus de données CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Le bus de données CAN ne répond pas. Débranchez et rebranchez le boîtier de l\'unité principale, puis redémarrez la voiture"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Pour votre sécurité, cette activité n\'est pas disponible pendant la conduite.\nPour continuer, attendez d\'être garé."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Vous ne pouvez pas utiliser cette fonctionnalité en conduisant"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Pour recommencer avec des fonctionnalités d\'application sécurisées, sélectionnez <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Retour"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Fermer l\'application"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Retour"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"Lire les données de diagnostic"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lire les données de diagnostic de la voiture."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Effacer les données de diagnostic"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accéder à l\'état de la puissance de la voiture."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Enregistrer l\'appareil vérifié"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Autoriser l\'enregistrement de l\'appareil vérifié"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Contrôler le mode de test de la voiture"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Contrôler le mode de test de la voiture"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mon appareil"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Invité"</string>
 </resources>
diff --git a/service/res/values-gl/strings.xml b/service/res/values-gl/strings.xml
index efcf7b2..f0b343e 100644
--- a/service/res/values-gl/strings.xml
+++ b/service/res/values-gl/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Controlar os eventos de entrada"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Produciuse un erro no bus CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"O bus CAN non responde. Desconecta a caixa da unidade principal, conéctaa de novo e reinicia o coche"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Pola túa seguranza, esta actividade non está dispoñible mentres conduces.\nPodes continuar cando aparques."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Non podes utilizar esta función mentres conduces"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Para comezar de novo coas funcións de aplicacións seguras, selecciona o botón <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Atrás"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Pechar aplicación"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Atrás"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ler datos de diagnóstico"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ler datos de diagnóstico do coche."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"borrar datos de diagnóstico"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acceder ao estado da potencia do coche."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscribir dispositivo de confianza"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir inscrición de dispositivos de confianza"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar o modo de proba do coche"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar o modo de proba do coche"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Dispositivo"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Convidado"</string>
 </resources>
diff --git a/service/res/values-gu/strings.xml b/service/res/values-gu/strings.xml
index 7c00a7d..78e94b3 100644
--- a/service/res/values-gu/strings.xml
+++ b/service/res/values-gu/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ઇનપુટ ઇવેન્ટ્સને હૅન્ડલ કરો"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN બસ નિષ્ફળ રહી"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN બસ પ્રતિસાદ આપતી નથી. હેડયુનિટ બોક્સને અનપ્લગ કરી ફરી પ્લગ કરો અને કારને ફરી શરૂ કરો"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"તમારી સલામતી માટે કાર ચલાવતી વખતે આ પ્રવૃત્તિ ઉપલબ્ધ નથી.\nચાલુ રાખવા માટે કાર પાર્ક થવા સુધી રાહ જુઓ."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ડ્રાઇવ કરતી વખતે તમે આ સુવિધાનો ઉપયોગ કરી શકતા નથી"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"સુરક્ષિત ઍપ્લિકેશન સુવિધાઓ સાથે ફરી શરૂ કરવા, <xliff:g id="EXIT_BUTTON">%s</xliff:g> પસંદ કરો."</string>
     <string name="exit_button" msgid="5829638404777671253">"પાછળ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ઍપ બંધ કરો"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"પાછળ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"નિદાનનો ડેટા વાંચો"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"કારમાંથી નિદાનનો ડેટા વાંચો."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"નિદાનનો ડેટા સાફ કરો"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"કારના પાવરની સ્થિતિને ઍક્સેસ કરો."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"વિશ્વસનીય ડિવાઇસની નોંધણી કરો"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"વિશ્વસનીય ડિવાઇસના નોંધણીની મંજૂરી આપો"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"કારના પરીક્ષણ મોડને નિયંત્રિત કરો"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"કારના પરીક્ષણ મોડને નિયંત્રિત કરો"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"મારું ડિવાઇસ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"અતિથિ"</string>
 </resources>
diff --git a/service/res/values-hi/strings.xml b/service/res/values-hi/strings.xml
index ff8429a..4352d7d 100644
--- a/service/res/values-hi/strings.xml
+++ b/service/res/values-hi/strings.xml
@@ -16,27 +16,27 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"कार की जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"आपकी कार की जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_label_camera" msgid="3725702064841827180">"कार का कैमरा एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_camera" msgid="917024932164501426">"आपकी कार के कैमरे एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_energy" msgid="7409144323527821558">"कार की ऊर्जा की जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_energy" msgid="3392963810053235407">"आपकी कार की ऊर्जा से जुड़ी जानकारी एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_hvac" msgid="1499454192558727843">"कार का एचवीएसी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"आपकी कार का एचवीएसी एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_mileage" msgid="4661317074631150551">"कार के माइलेज की जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_mileage" msgid="7179735693278681090">"आपकी कार की माइलेज से जुड़ी जानकारी एक्सेस कर सकता है."</string>
+    <string name="car_permission_label" msgid="741004755205554376">"कार की जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"आपकी कार की जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_label_camera" msgid="3725702064841827180">"कार का कैमरा ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_camera" msgid="917024932164501426">"आपकी कार के कैमरे ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_energy" msgid="7409144323527821558">"कार की ऊर्जा की जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_energy" msgid="3392963810053235407">"आपकी कार की ऊर्जा से जुड़ी जानकारी ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_hvac" msgid="1499454192558727843">"कार का एचवीएसी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"आपकी कार का एचवीएसी ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_mileage" msgid="4661317074631150551">"कार के माइलेज की जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_mileage" msgid="7179735693278681090">"आपकी कार की माइलेज से जुड़ी जानकारी ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_speed" msgid="1149027717860529745">"कार की रफ़्तार की जानकारी देख सकता है"</string>
-    <string name="car_permission_desc_speed" msgid="2047965198165448241">"आपकी कार की रफ़्तार की जानकारी एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_vehicle_dynamics_state" msgid="313779267420048367">"कार के चलने की स्थिति एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_vehicle_dynamics_state" msgid="8891506193446375660">"आपकी कार के चलने से जुड़ी जानकारी एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_vendor_extension" msgid="7141601811734127361">"कार बनाने वाली कंपनी से जुड़ी जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"कार की खास जानकारी लेने-देने के लिए आपकी कार का विक्रेता, चैनल एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_speed" msgid="2047965198165448241">"आपकी कार की रफ़्तार की जानकारी ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_vehicle_dynamics_state" msgid="313779267420048367">"कार के चलने की स्थिति ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_vehicle_dynamics_state" msgid="8891506193446375660">"आपकी कार के चलने से जुड़ी जानकारी ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_vendor_extension" msgid="7141601811734127361">"कार बनाने वाली कंपनी से जुड़ी जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"कार की खास जानकारी लेने-देने के लिए आपकी कार का विक्रेता, चैनल ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_radio" msgid="6009465291685935112">"कार का रेडियो मैनेज कर सकता है"</string>
-    <string name="car_permission_desc_radio" msgid="3385999027478186964">"आपकी कार का रेडियो एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_radio" msgid="3385999027478186964">"आपकी कार का रेडियो ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_projection" msgid="9107156380287576787">"फ़ोन से कार की डिसप्ले पर किसी इंटरफ़ेस को प्रोजेक्ट कर सकता है"</string>
     <string name="car_permission_desc_projection" msgid="2352178999656292944">"ऐप्लिकेशन कार की डिसप्ले पर, फ़ोन से किसी इंटरफ़ेस को प्रोजेक्ट कर सकता है."</string>
-    <string name="car_permission_label_access_projection_status" msgid="4231618890836627402">"प्रोजेक्ट करने की स्थिति को एक्सेस कर सकता है"</string>
+    <string name="car_permission_label_access_projection_status" msgid="4231618890836627402">"प्रोजेक्ट करने की स्थिति को ऐक्सेस कर सकता है"</string>
     <string name="car_permission_desc_access_projection_status" msgid="8497351979100616278">"ऐप्लिकेशन, कार की डिसप्ले पर प्रोजेक्ट किए जा रहे दूसरे ऐप्लिकेशन की स्थिति देख सकता है."</string>
     <string name="car_permission_label_bind_projection_service" msgid="5362076216606651526">"प्रोजेक्ट करने की सुविधा इस्तेमाल कर सकता है"</string>
     <string name="car_permission_desc_bind_projection_service" msgid="2282657787853408639">"उपोयगकर्ता को किसी प्रोजेक्ट करने की सुविधा के टॉप-लेवल इंटरफ़ेस से जोड़ता है. सामान्य ऐप्लिकेशन के लिए इसकी कभी ज़रूरत नहीं होती."</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"इनपुट से जुड़े इवेंट प्रबंधित कर सकता है"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"\'CAN बस\' काम नहीं कर पा रहा है"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"\'CAN बस\' जवाब नहीं दे रहा है. हेडयूनिट बॉक्स का प्लग निकालकर वापस लगाएं और कार को रीस्टार्ट करें"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"आपकी सुरक्षा के लिए, गाड़ी चलाते समय यह गतिविधि मौजूद नहीं रहती है.\nजारी रखने के लिए गाड़ी पार्क करनी होगी."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"आप गाड़ी चलाते समय इस सुविधा का इस्तेमाल नहीं कर सकते"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"सुरक्षित ऐप्लिकेशन सुविधाएं फिर से शुरू करने के लिए, <xliff:g id="EXIT_BUTTON">%s</xliff:g> चुनें."</string>
     <string name="exit_button" msgid="5829638404777671253">"वापस शुरू करें"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ऐप्लिकेशन बंद करें"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"वापस जाएं"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"गड़बड़ी की पहचान का डेटा देख सकता है"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"कार की \'गड़बड़ी की पहचान का डेटा\' देख सकता है."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"गड़बड़ी की पहचान का डेटा मिटा सकता है"</string>
@@ -83,12 +85,12 @@
     <string name="car_permission_desc_storage_monitoring" msgid="2075712271139671318">"फ़्लैश डिवाइस की मेमोरी के इस्तेमाल की निगरानी कर सकता है"</string>
     <string name="car_permission_label_driving_state" msgid="7754624599537393650">"गाड़ी चलाते समय होने वाले बदलावों की स्थिति को सुन सकता है"</string>
     <string name="car_permission_desc_driving_state" msgid="2684025262811635737">"गाड़ी चलाते समय होने वाले बदलावों को सुन सकता है."</string>
-    <string name="car_permission_label_car_engine_detailed" msgid="8911992719173587337">"कार के इंजन की जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_car_engine_detailed" msgid="1746863362811347700">"आपकी कार के इंजन की पूरी जानकारी एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_car_energy_ports" msgid="8548990315169219454">"कार की ईंधन टंकी का ढक्कन और चार्जिंग पोर्ट एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_car_energy_ports" msgid="7771185999828794949">"कार की ईंधन टंकी का ढक्कन और चार्जिंग पोर्ट एक्सेस कर सकता है."</string>
+    <string name="car_permission_label_car_engine_detailed" msgid="8911992719173587337">"कार के इंजन की जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_car_engine_detailed" msgid="1746863362811347700">"आपकी कार के इंजन की पूरी जानकारी ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_car_energy_ports" msgid="8548990315169219454">"कार की ईंधन टंकी का ढक्कन और चार्जिंग पोर्ट ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_car_energy_ports" msgid="7771185999828794949">"कार की ईंधन टंकी का ढक्कन और चार्जिंग पोर्ट ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_car_identification" msgid="5896712510164020478">"कार की पहचान देख सकता है"</string>
-    <string name="car_permission_desc_car_identification" msgid="4132040867171275059">"कार की पहचान एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_identification" msgid="4132040867171275059">"कार की पहचान ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_control_car_doors" msgid="3032058819250195700">"कार के दरवाज़े नियंत्रित कर सकता है"</string>
     <string name="car_permission_desc_control_car_doors" msgid="6287353311980590092">"कार के दरवाज़े नियंत्रित कर सकता है."</string>
     <string name="car_permission_label_control_car_windows" msgid="2452854429996653029">"कार की खिड़कियां नियंत्रित कर सकता है"</string>
@@ -97,31 +99,34 @@
     <string name="car_permission_desc_control_car_mirrors" msgid="1224135684068855032">"कार के शीशे नियंत्रित कर सकता है."</string>
     <string name="car_permission_label_control_car_seats" msgid="1826934820585497135">"कार की सीटें नियंत्रित कर सकता है"</string>
     <string name="car_permission_desc_control_car_seats" msgid="2407536601226470563">"कार की सीटें नियंत्रित कर सकता है."</string>
-    <string name="car_permission_label_car_info" msgid="4707513570676492315">"कार की बुनियादी जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_car_info" msgid="2118081474543537653">"कार की बुनियादी जानकारी एक्सेस कर सकता है."</string>
+    <string name="car_permission_label_car_info" msgid="4707513570676492315">"कार की बुनियादी जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_car_info" msgid="2118081474543537653">"कार की बुनियादी जानकारी ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_car_exterior_lights" msgid="541304469604902110">"कार के बाहरी हिस्से में लगी लाइटों की स्थिति देख सकता है"</string>
-    <string name="car_permission_desc_car_exterior_lights" msgid="4038037584100849318">"कार के बाहरी हिस्से में लगी लाइटों की स्थिति एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_exterior_lights" msgid="4038037584100849318">"कार के बाहरी हिस्से में लगी लाइटों की स्थिति ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_control_car_exterior_lights" msgid="101357531386232141">"कार के बाहरी हिस्से में लगी लाइटें नियंत्रित कर सकता है"</string>
     <string name="car_permission_desc_control_car_exterior_lights" msgid="6332252612685264180">"कार के बाहरी हिस्से में लगी लाइटें नियंत्रित कर सकता है."</string>
     <string name="car_permission_label_car_interior_lights" msgid="8506302199784427680">"कार के अंदर लगी लाइटों की स्थिति देख सकता है"</string>
-    <string name="car_permission_desc_car_interior_lights" msgid="6204775354692372506">"कार के अंदर लगी लाइटों की स्थिति एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_interior_lights" msgid="6204775354692372506">"कार के अंदर लगी लाइटों की स्थिति ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_control_car_interior_lights" msgid="6685386372012664281">"कार के अंदर लगी लाइटें नियंत्रित कर सकता है"</string>
     <string name="car_permission_desc_control_car_interior_lights" msgid="797201814109701538">"कार के अंदर लगी लाइटें नियंत्रित कर सकता है."</string>
     <string name="car_permission_label_car_exterior_environment" msgid="3385924985991299436">"कार के बाहर के तापमान की जानकारी देख सकता है"</string>
-    <string name="car_permission_desc_car_exterior_environment" msgid="1716656004731603379">"कार के बाहर के तापमान की जानकारी एक्सेस कर सकता है."</string>
-    <string name="car_permission_label_car_tires" msgid="4379255261197836840">"कार के टायरों की जानकारी एक्सेस कर सकता है"</string>
-    <string name="car_permission_desc_car_tires" msgid="8134496466769810134">"कार के टायर की जानकारी एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_exterior_environment" msgid="1716656004731603379">"कार के बाहर के तापमान की जानकारी ऐक्सेस कर सकता है."</string>
+    <string name="car_permission_label_car_tires" msgid="4379255261197836840">"कार के टायरों की जानकारी ऐक्सेस कर सकता है"</string>
+    <string name="car_permission_desc_car_tires" msgid="8134496466769810134">"कार के टायर की जानकारी ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_car_steering" msgid="7779530447441232479">"कार के स्टीयरिंग एंगल की जानकारी देख सकता है"</string>
-    <string name="car_permission_desc_car_steering" msgid="1357331844530708138">"कार के स्टीयरिंग एंगल की जानकारी एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_steering" msgid="1357331844530708138">"कार के स्टीयरिंग एंगल की जानकारी ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_read_car_display_units" msgid="7617008314862097183">"कार के डिसप्ले यूनिट की जानकारी देख सकता है"</string>
     <string name="car_permission_desc_read_car_display_units" msgid="6891898275208542385">"डिसप्ले यूनिट देख सकता है."</string>
     <string name="car_permission_label_control_car_display_units" msgid="4975303668183173076">"कार के डिसप्ले यूनिट नियंत्रित कर सकता है"</string>
     <string name="car_permission_desc_control_car_display_units" msgid="8744397195158556945">"डिसप्ले यूनिट नियंत्रित कर सकता है."</string>
     <string name="car_permission_label_car_powertrain" msgid="4586122326622134886">"कार के पावरट्रेन की जानकारी देख सकता है"</string>
-    <string name="car_permission_desc_car_powertrain" msgid="1116007372551797796">"कार के पावरट्रेन की जानकारी एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_powertrain" msgid="1116007372551797796">"कार के पावरट्रेन की जानकारी ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_car_power" msgid="8111448088314368268">"कार के पावर की स्थिति देख सकता है"</string>
-    <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कार के पावर की स्थिति एक्सेस कर सकता है."</string>
+    <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कार के पावर की स्थिति ऐक्सेस कर सकता है."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"भरोसेमंद डिवाइस का नाम दर्ज करें"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"भरोसेमंद डिवाइस का नाम दर्ज करने की अनुमति दें"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"कार के जांच मोड को नियंत्रित करें"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"कार के जांच मोड को नियंत्रित करें"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"मेरा डिवाइस"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"मेहमान"</string>
 </resources>
diff --git a/service/res/values-hr/strings.xml b/service/res/values-hr/strings.xml
index 2d2060b..feb4108 100644
--- a/service/res/values-hr/strings.xml
+++ b/service/res/values-hr/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"rukovati događajima unosa"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Pogreška CAN busa"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ne odgovara. Iskopčajte i ponovo ukopčajte glavnu jedinicu i ponovo pokrenite automobil"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Radi vaše sigurnosti ta aktivnost nije dostupna tijekom vožnje.\nDa biste nastavili, pričekajte dok se ne zaustavite."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Tu značajku ne možete upotrebljavati tijekom vožnje"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Da biste započeli ponovo sa sigurnim značajkama aplikacije, odaberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Natrag"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zatvori aplikaciju"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Natrag"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"čitati dijagnostičke podatke"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"čitati dijagnostičke podatke automobila"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"izbrisati dijagnostičke podatke"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"pristupiti stanju napajanja automobila"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Prijavi pouzdani uređaj"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Dopusti prijavu pouzdanih uređaja"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Upravljajte probnim načinom automobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Upravljajte probnim načinom automobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moj uređaj"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gost"</string>
 </resources>
diff --git a/service/res/values-hu/strings.xml b/service/res/values-hu/strings.xml
index f427b07..68657a8 100644
--- a/service/res/values-hu/strings.xml
+++ b/service/res/values-hu/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kezelheti a beviteli eseményeket"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"A CAN-busz hibát észlelt"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"A CAN-busz nem válaszol. Csatlakoztassa újra a fejegységet, és indítsa újra az autót."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Az Ön biztonsága érdekében ez a tevékenység nem végezhető vezetés közben.\nLeparkolás után folytathatja a tevékenységet."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Vezetés közben nem használhatja ezt a funkciót"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Ha biztonságos alkalmazásfunkciókkal szeretné újrakezdeni, válassza a következő gombot: <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Vissza"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Alkalmazás bezárása"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Vissza"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"olvashatja a diagnosztikai adatokat"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Olvashatja az autó diagnosztikai adatait."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"törölheti a diagnosztikai adatokat"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Hozzáférhet az autó energiaszintjével kapcsolatos adataihoz."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Megbízható eszköz regisztrálása"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Megbízható eszköz regisztrálásának engedélyezése"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Vezérelheti az autó tesztüzemmódját"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Vezérelheti az autó tesztüzemmódját"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Saját eszköz"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Vendég"</string>
 </resources>
diff --git a/service/res/values-hy/strings.xml b/service/res/values-hy/strings.xml
index a706dc4..23f5812 100644
--- a/service/res/values-hy/strings.xml
+++ b/service/res/values-hy/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Մշակել ներածման իրադարձությունները"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN անվադողի սխալ"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN անվադողը չի պատասխանում: Անջատեք և նորից միացրեք միակցիչը, ապա անջատեք վառոցքը և վերագործարկեք մեքենան:"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Անվտանգության նկատառումներով այս գործողությունը հասանելի չէ վարելու ռեժիմում:\nՇարունակելու համար կայանեք մեքենան:"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Դուք չեք կարող օգտագործել այս գործառույթը մեքենա վարելիս"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Հավելվածն անվտանգ ռեժիմում վերագործարկելու համար սեղմեք<xliff:g id="EXIT_BUTTON">%s</xliff:g> կոճակը:"</string>
     <string name="exit_button" msgid="5829638404777671253">"Հետ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Փակել հավելվածը"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Հետ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"կարդալ ախտորոշման մասին տվյալները"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Կարդալ մեքենայի ախտորոշման տվյալները։"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"մաքրել ախտորոշման տվյալները"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Օգտագործել մեքենայի էլեկտրասնուցման կարգավիճակի մասին տվյալները։"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Գրանցել վստահելի սարք"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Թույլատրել վստահելի սարքի գրանցումը"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Կառավարել ավտոմեքենայի փորձարկման ռեժիմը"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Կառավարել ավտոմեքենայի փորձարկման ռեժիմը"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Իմ սարքը"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Հյուր"</string>
 </resources>
diff --git a/service/res/values-in/strings.xml b/service/res/values-in/strings.xml
index 3651eaa..3eef766 100644
--- a/service/res/values-in/strings.xml
+++ b/service/res/values-in/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Menangani aktivitas masukan"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus gagal"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus tidak merespons. Cabut dan colokkan kembali boks headunit, lalu nyalakan ulang mobil"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Demi keamanan Anda, aktivitas ini tidak tersedia saat Anda mengemudi.\nUntuk melanjutkan, tunggu hingga mobil terparkir."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Anda tidak dapat menggunakan fitur ini saat mengemudi"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Untuk mulai dari awal dengan fitur apl yang aman, pilih <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Kembali"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Tutup aplikasi"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Kembali"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"membaca data diagnostik"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Membaca data diagnostik dari mobil."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"menghapus data diagnostik"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Mengakses status daya mobil."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Daftarkan Perangkat Dipercaya"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Izinkan Pendaftaran Perangkat Dipercaya"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Mode uji untuk mengontrol mobil"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Mode uji untuk mengontrol mobil"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Perangkat Saya"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Tamu"</string>
 </resources>
diff --git a/service/res/values-is/strings.xml b/service/res/values-is/strings.xml
index 64f68f5..301e4bd 100644
--- a/service/res/values-is/strings.xml
+++ b/service/res/values-is/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Stjórna inntakstilvikum"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Bilun í CAN-gagnabraut"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-gagnabraut svarar ekki. Taktu stjórneiningarboxið úr sambandi, settu það aftur í samband og gangsettu bílinn aftur."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Af öryggisástæðum er þessi aðgerð ekki í boði við akstur.\nLeggðu ökutækinu áður en þú heldur áfram."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Þú getur ekki notað þennan eiginleika við akstur"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Til að byrja aftur að setja upp örugga forritseiginleika skaltu velja <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Til baka"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Loka forriti"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Til baka"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"lesa greiningargögn"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lesa greiningargögn úr bílnum."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"hreinsa greiningargögn"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Fá aðgang að orkustöðu bílsins."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Skrá sem traust tæki"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Heimila skráningu sem traust tæki"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Stjórna prófunarstillingu bíls"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Stjórna prófunarstillingu bíls"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Tækið mitt"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gestur"</string>
 </resources>
diff --git a/service/res/values-it/strings.xml b/service/res/values-it/strings.xml
index 07aad4e..be4af19 100644
--- a/service/res/values-it/strings.xml
+++ b/service/res/values-it/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"Accesso alle informazioni dell\'automobile"</string>
+    <string name="car_permission_label" msgid="741004755205554376">"accesso ai dati dell\'auto"</string>
     <string name="car_permission_desc" msgid="162499818870052725">"Consente di accedere alle informazioni dell\'automobile."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"Accesso alla videocamera dell\'automobile"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Consente di accedere alle videocamere dell\'automobile."</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Consente di gestire gli eventi di input."</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Comunicazione tramite bus CAN non riuscita"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Il bus CAN non risponde. Scollega e ricollega l\'unità principale e riaccendi il motore."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Per motivi di sicurezza, questa attività non è disponibile durante la guida.\nPotrai continuare quando avrai parcheggiato."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Non è possibile usare questa funzionalità durante la guida"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Seleziona <xliff:g id="EXIT_BUTTON">%s</xliff:g> per ricominciare con le funzionalità sicure dell\'app."</string>
     <string name="exit_button" msgid="5829638404777671253">"Indietro"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Chiudi app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Indietro"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"Lettura dei dati diagnostici"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Consente di leggere i dati diagnostici dell\'automobile."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Cancellazione dei dati diagnostici"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Consente di accedere allo stato di alimentazione dell\'automobile."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrazione di dispositivi attendibili"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Consenti la registrazione di dispositivi attendibili"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controllo della modalità di test dell\'auto"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controllo della modalità di test dell\'auto"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mio dispositivo"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Ospite"</string>
 </resources>
diff --git a/service/res/values-iw/strings.xml b/service/res/values-iw/strings.xml
index 1770cf9..f4e9edb 100644
--- a/service/res/values-iw/strings.xml
+++ b/service/res/values-iw/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ניהול אירועי קלט"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"פרוטוקול CAN bus נכשל"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"פרוטוקול CAN bus לא מגיב. יש לנתק ולחבר שוב את מערכת הסטריאו ולהתניע מחדש את הרכב"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"מטעמי בטיחות, פעילות זו אינה זמינה בזמן נהיגה.\nכדי להמשיך, צריך להמתין עד לחניית הרכב."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"לא ניתן להשתמש בתכונה הזו בזמן נהיגה"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"כדי להפעיל מחדש את האפליקציה במצב בטוח, יש ללחוץ על <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"הקודם"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"סגירת האפליקציה"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"חזרה"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"קריאת נתוני אבחון"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"קריאת נתוני אבחון מהרכב."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"מחיקת נתוני האבחון"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"גישה למצב הטעינה של הרכב."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"רישום מכשיר מהימן"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"הפעלת רישום של מכשירים מהימנים"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"שליטה במצב הבדיקה של הרכב"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"שליטה במצב הבדיקה של הרכב"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"המכשיר שלי"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"אורח"</string>
 </resources>
diff --git a/service/res/values-ja/strings.xml b/service/res/values-ja/strings.xml
index 9c8ad93..5c92e38 100644
--- a/service/res/values-ja/strings.xml
+++ b/service/res/values-ja/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="car_permission_label" msgid="741004755205554376">"車の情報へのアクセス"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"車の情報にアクセスします。"</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"車の情報にアクセスできます。"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"車載カメラへのアクセス"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"車載カメラにアクセスします。"</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"車のエネルギー情報へのアクセス"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"入力イベントを処理します"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN バスでエラーが発生しました"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN バスが応答しません。ヘッドユニット ボックスのプラグを抜いて接続し直し、車を再始動してください"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"安全上の理由により、運転中はこのアクティビティをご利用いただけません。\n続行するには駐車してください。"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"運転中はこの機能を利用できません"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"アプリをセーフモードで再起動するには、<xliff:g id="EXIT_BUTTON">%s</xliff:g> を選択します。"</string>
     <string name="exit_button" msgid="5829638404777671253">"戻る"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"アプリを閉じる"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"戻る"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"診断データの読み取り"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"車から診断データを読み取ります。"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"診断データの消去"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"車の電力状態にアクセスします。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"信頼できるデバイスの登録"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"信頼できるデバイスの登録を許可"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"車のテストモードの制御"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"車のテストモードの制御"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"自分のデバイス"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ゲスト"</string>
 </resources>
diff --git a/service/res/values-ka/strings.xml b/service/res/values-ka/strings.xml
index d8343a8..9fb70b1 100644
--- a/service/res/values-ka/strings.xml
+++ b/service/res/values-ka/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"შეტანის მოვლენების დამუშავება"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"წარმოიშვა CAN-სალტის შეცდომა"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-სალტე არ რეაგირებს. გამოაერთეთ და ხელახლა მიაერთეთ საინფორმაციო-გასართობი მოწყობილობა, შემდეგ კი ხელახლა დაქოქეთ მანქანა"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ეს აქტივობა მიუწვდომელია მანქანის მართვისას, უსაფრთხოების მოსაზრებებიდან გამომდინარე.\nგთხოვთ, ჯერ გააჩეროთ მანქანა."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"მანქანის მართვისას ამ ფუნქციას ვერ გამოიყენებთ"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"აპის უსაფრთხო რეჟიმში გასაშვებად აირჩიეთ „<xliff:g id="EXIT_BUTTON">%s</xliff:g>“."</string>
     <string name="exit_button" msgid="5829638404777671253">"უკან"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"აპის დახურვა"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"უკან"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"დიაგნოსტიკური მონაცემების წაკითხვა"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"დიაგნოსტიკური მონაცემების წაკითხვა მანქანიდან."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"დიაგნოსტიკური მონაცემების გასუფთავება"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"მანქანის ელკვების მდგომარეობაზე წვდომა."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"სანდო მოწყობილობის რეგისტრაცია"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"სანდო მოწყობილობის რეგისტრაციის დაშვება"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"მანქანის სატესტო რეჟიმის გაკონტროლება"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"მანქანის სატესტო რეჟიმის გაკონტროლება"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ჩემი მოწყობილობა"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"სტუმარი"</string>
 </resources>
diff --git a/service/res/values-kk/strings.xml b/service/res/values-kk/strings.xml
index b031e9d..c3d0aea 100644
--- a/service/res/values-kk/strings.xml
+++ b/service/res/values-kk/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Деректерді енгізу оқиғаларын басқаруға болады"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN шинасы істен шықты"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN шинасы жауап бермейді. Негізгі модульді ажыратып, қайта жалғаңыз және көлікті қайта оталдырыңыз"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Көлік жүргізгенде, қауіпсіздік мақсатында бұл әрекетті орындау мүмкін емес.\nЖалғастыру үшін көлікті тұраққа қойыңыз."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Бұл функцияны көлік жүргізген кезде пайдалана алмайсыз."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Қолданбаны қауіпсіз күйде қайта іске қосу үшін <xliff:g id="EXIT_BUTTON">%s</xliff:g> түймесін басыңыз."</string>
     <string name="exit_button" msgid="5829638404777671253">"Артқа"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Қолданбаны жабу"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Артқа"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"диагностикалық деректерді көру"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Көліктің диагностикалық деректерін көру."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"диагностикалық деректерді өшіру"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Көлік қуатының күйін көру."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Сенімді құрылғыларды тіркеу"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Сенімді құрылғыларды тіркеуге рұқсат ету"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Көліктің сынақ режимін бақылау"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Көліктің сынақ режимін бақылау"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Құрылғым"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Қонақ"</string>
 </resources>
diff --git a/service/res/values-km/strings.xml b/service/res/values-km/strings.xml
index 3039b03..7648697 100644
--- a/service/res/values-km/strings.xml
+++ b/service/res/values-km/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"គ្រប់គ្រង​ព្រឹត្តិការណ៍​បញ្ចូល"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"មិនអាច​ដំណើរការ CAN bus បានទេ"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus មិនឆ្លើយតបទេ។ សូមផ្ដាច់ រួចភ្ជាប់​ប្រអប់​ឧបករណ៍ចាក់តន្ត្រី​ម្តងទៀត បន្ទាប់មក​បញ្ឆេះ​រថយន្ត​ឡើងវិញ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ដើម្បី​សុវត្ថិភាព​របស់អ្នក សកម្មភាពនេះ​មិនអាចប្រើបានទេ ពេល​កំពុងបើកបរ។\nដើម្បីបន្ត សូមរង់ចាំ​រហូតទាល់តែ​អ្នកចត​រថយន្តរួច។"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"អ្នកមិនអាចប្រើ​មុខងារនេះ​បានទេ ខណៈពេលកំពុង​បើកបរ"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ដើម្បី​ចាប់ផ្តើមឡើងវិញ​ដោយប្រើ​មុខងារកម្មវិធី​ដែលមានសុវត្ថិភាព សូមជ្រើសរើស <xliff:g id="EXIT_BUTTON">%s</xliff:g> ។"</string>
     <string name="exit_button" msgid="5829638404777671253">"ថយក្រោយ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"បិទកម្មវិធី"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ថយក្រោយ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"អានទិន្នន័យ​វិភាគ"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"អាន​អំពីទិន្នន័យ​វិភាគពី​រថយន្ត។"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"សម្អាត​ទិន្នន័យ​វិភាគ"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ចូលប្រើស្ថានភាព​ថាមពល​របស់រថយន្ត។"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ចុះ​ឈ្មោះ​ឧបករណ៍​ដែល​ទុក​ចិត្ត"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"អនុញ្ញាតឱ្យចុះ​ឈ្មោះឧបករណ៍​ដែល​ទុក​ចិត្ត"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"គ្រប់គ្រង​មុខងារ​ធ្វើតេស្តរបស់​រថយន្ត"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"គ្រប់គ្រង​មុខងារ​ធ្វើតេស្តរបស់​រថយន្ត"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ឧបករណ៍របស់ខ្ញុំ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ភ្ញៀវ"</string>
 </resources>
diff --git a/service/res/values-kn/strings.xml b/service/res/values-kn/strings.xml
index 0473b2d..36f565e 100644
--- a/service/res/values-kn/strings.xml
+++ b/service/res/values-kn/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ಊಡಿಕೆ ಘಟನೆಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"ಸಿಎಎನ್ ಬಸ್ ಕೆಟ್ಟಿದೆ"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ಬಸ್ ಸ್ಪಂದಿಸುತ್ತಿಲ್ಲ. ಹೆಡ್ ಯುನಿಟ್ ಪೆಟ್ಟಿಗೆಯನ್ನು ಅನ್‌ಪ್ಲಗ್ ಮಾಡಿ ಮತ್ತೆ ಪ್ಲಗ್ ಮಾಡಿ ಕಾರನ್ನು ಪುನರಾರಂಭಿಸಿ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ನಿಮ್ಮ ಸುರಕ್ಷೆಗಾಗಿ, ಈ ಚಟುವಟಿಕೆಯು ವಾಹನ ಚಲಾಯಿಸುತ್ತಿರುವಾಗ ಲಭ್ಯವಿಲ್ಲ. ಮುಂದುವರೆಯಲು \n ಮಾಡಿ, ನೀವು ಪಾರ್ಕ್ ಮಾಡುವ ತನಕ ಕಾಯಿರಿ."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ನೀವು ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ಆಪ್‌ನ ಸುರಕ್ಷೆ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಒಳಗೊಂಡು ಮತ್ತೆ ಪ್ರಾರಂಭಿಸಲು, <xliff:g id="EXIT_BUTTON">%s</xliff:g> ಆಯ್ಕೆ ಮಾಡಿ."</string>
     <string name="exit_button" msgid="5829638404777671253">"ಹಿಂದಕ್ಕೆ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ಆ್ಯಪ್ ಮುಚ್ಚಿರಿ"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ಹಿಂದೆ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ಡಯಾಗ್ನೋಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ಓದಿ"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ಕಾರಿನಲ್ಲಿರುವ ಅದರ ಡಯಾಗ್ನೋಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ಓದಿ."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ಡಯಾಗ್ನೋಸ್ಟಿಕ್ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ಕಾರಿನ ಶಕ್ತಿಯ ಸ್ಥಿತಿಯ ಮಾಹಿತಿಯನ್ನು ಪ್ರವೇಶಿಸಿ."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನಗಳನ್ನು ನೋಂದಾಯಿಸಿ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನಗಳ ನೋಂದಣಿಯನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ಕಾರ್‌ನ ಪರೀಕ್ಷಾ ಮೋಡ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ಕಾರ್‌ನ ಪರೀಕ್ಷಾ ಮೋಡ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ನನ್ನ ಸಾಧನ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ಅತಿಥಿ"</string>
 </resources>
diff --git a/service/res/values-ko/strings.xml b/service/res/values-ko/strings.xml
index 4853d47..2f67908 100644
--- a/service/res/values-ko/strings.xml
+++ b/service/res/values-ko/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"입력 이벤트 처리"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN 버스 실패"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN 버스가 응답하지 않습니다. 헤드유닛 박스를 분리한 후 다시 연결한 다음 시동을 다시 걸어 보세요."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"안전을 위해 운전 중에는 이용할 수 없는 활동입니다.\n계속하려면 먼저 주차하세요."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"운전 중에는 이 기능을 사용하실 수 없습니다."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"안전한 앱 기능으로 다시 시작하려면 <xliff:g id="EXIT_BUTTON">%s</xliff:g>을(를) 선택하세요."</string>
     <string name="exit_button" msgid="5829638404777671253">"뒤로"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"앱 닫기"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"뒤로"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"진단 데이터 읽기"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"차량의 진단 데이터를 읽습니다."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"진단 데이터 삭제"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"차량 전원 상태에 액세스합니다."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"신뢰할 수 있는 기기 등록"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"신뢰할 수 있는 기기 등록 허용"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"차량 테스트 모드 제어"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"차량 테스트 모드 제어"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"내 기기"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"게스트"</string>
 </resources>
diff --git a/service/res/values-ky/strings.xml b/service/res/values-ky/strings.xml
index f2a21df..a239eb7 100644
--- a/service/res/values-ky/strings.xml
+++ b/service/res/values-ky/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Киргизүү аракеттерин башкаруу"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN иштебей калды"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN жооп бербей жатат. Башкы шайман блогун сууруп, кайра сайгандан кийин унааны кайра жүргүзүңүз"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Коопсуздугуңузду коргоо максатында, бул иш-аракетти унаа айдап баратканда аткарууга болбойт.\nТоктоп туруп, улантыңыз."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Бул функцияны унаа айдап баратканда колдоно албайсыз"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Колдонмонун коопсуз функцияларын иштетүү үчүн <xliff:g id="EXIT_BUTTON">%s</xliff:g> баскычын басыңыз."</string>
     <string name="exit_button" msgid="5829638404777671253">"Артка"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Колдонмону жабуу"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Артка"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"мүчүлүштүктөрдү аныктоо дайындарын окуу"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Унаадагы мүчүлүштүктөрдү аныктоо дайындарын окуу."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"мүчүлүштүктөрдү аныктоо дайындарын тазалоо"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Унаанын кубаттуулук абалын көрүү."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Ишенимдүү түзмөктү каттоо"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Ишенимдүү түзмөктү каттоого уруксат берүү"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Унаанын сыноо режимин көзөмөлдөө"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Унаанын сыноо режимин көзөмөлдөө"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Түзмөгүм"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Конок"</string>
 </resources>
diff --git a/service/res/values-lo/strings.xml b/service/res/values-lo/strings.xml
index 2fe6c4f..37bc6f6 100644
--- a/service/res/values-lo/strings.xml
+++ b/service/res/values-lo/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ຈັດການເຫດການປ້ອນຂໍ້ມູນ"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus ບໍ່ສຳເລັດ"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ບໍ່ຕອບສະໜອງ. ຖອດປລັກກ່ອງເຄື່ອງຫຼິ້ນວິທະຍຸ (Headunit) ແລ້ວສຽບເຂົ້າຄືນໃໝ່ ແລະ ຣິສະຕາດລົດ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ເພື່ອຄວາມປອດໄພຂອງທ່ານ, ກິດຈະກຳນີ້ບໍ່ມີໃຫ້ນໍາໃຊ້ໃນຂະນະທີ່ທ່ານກຳລັງຂັບລົດຢູ່. \nເພື່ອສືບຕໍ່, ກະລຸນາລໍຖ້າຈົນກວ່າວ່າທ່ານຈອດລົດ."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ທ່ານບໍ່ສາມາດໃຊ້ຄຸນສົມບັດນີ້ໃນຂະນະທີ່ຂັບລົດໄດ້"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ເພື່ອເລີ່ມຕົ້ນຄືນໃໝ່ດ້ວຍຄຸນສົມບັດແອັບທີ່ປອດໄພ,​ ກະລຸນາເລືອກ <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"ກັບຄືນ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ປິດແອັບ"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ກັບຄືນ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ອ່ານຂໍ້ມູນການວິເຄາະ"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ອ່ານຂໍ້ມູນການວິເຄາະຈາກລົດ."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ລຶບລ້າງຂໍ້ມູນການວິເຄາະ"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ເຂົ້າເຖິງສະຖານະພະລັງງານຂອງລົດ."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ລົງທະບຽນອຸປະກອນທີ່ເຊື່ອຖືໄດ້"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ອະນຸຍາດການລົງທະບຽນອຸປະກອນທີ່ເຊື່ອຖືໄດ້"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ຄວບຄຸມໂໝດທົດສອບຂອງລົດ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ຄວບຄຸມໂໝດທົດສອບຂອງລົດ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ອຸປະກອນຂອງຂ້ອຍ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ແຂກ"</string>
 </resources>
diff --git a/service/res/values-lt/strings.xml b/service/res/values-lt/strings.xml
index 2342259..ba49a7f 100644
--- a/service/res/values-lt/strings.xml
+++ b/service/res/values-lt/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Apdoroti įvesties įvykius."</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN BUS klaida"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN BUS nereaguoja. Atjunkite ir vėl prijunkite pagrindinio įtaiso dėžutę."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Siekiant užtikrinti jūsų saugą, ši veikla nepasiekiama vairuojant.\nJei norite tęsti, palaukite, kol sustosite."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Negalite naudoti šios funkcijos vairuodami"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Jei norite pradėti iš naujo naudodami saugias programos funkcijas, pasirinkite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Atgal"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Uždaryti programą"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Atgal"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"nuskaityti diagnostikos duomenis"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Nuskaityti automobilio diagnostikos duomenis."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"išvalyti diagnostikos duomenis"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Pasiekti automobilio maitinimo būseną."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Užregistruoti patikimą įrenginį"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Leisti užregistruoti patikimą įrenginį"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Valdyti automobilio bandomąjį režimą"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Valdyti automobilio bandomąjį režimą"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mano įrenginys"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Svečias"</string>
 </resources>
diff --git a/service/res/values-lv/strings.xml b/service/res/values-lv/strings.xml
index f926f13..de2ce2d 100644
--- a/service/res/values-lv/strings.xml
+++ b/service/res/values-lv/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Apstrādāt ievades notikumus."</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Radās atteice datu maģistrālē"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Datu maģistrāle nereaģē. Atvienojiet un atkal pievienojiet stereosistēmas paneļa kabeli un atkārtoti iedarbiniet automašīnu"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Drošības apsvērumu dēļ šī darbība nav pieejama braukšanas laikā.\nTurpiniet, kad automašīna būs novietota stāvēšanai."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Jūs nevarat izmantot šo funkciju braukšanas laikā."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Lai atsāktu darbu ar drošām lietotnes funkcijām, atlasiet pogu <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Atpakaļ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Aizvērt lietotni"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Atpakaļ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"nolasīt diagnostikas datus"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Nolasīt diagnostikas datus no automašīnas."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"notīrīt diagnostikas datus"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Piekļūt automašīnas aizdedzes stāvoklim."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Reģistrēt uzticamu ierīci"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Atļaut uzticamu ierīču reģistrāciju"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"kontrolēt automašīnas testa režīmu"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrolēt automašīnas testa režīmu"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mana ierīce"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Viesis"</string>
 </resources>
diff --git a/service/res/values-mk/strings.xml b/service/res/values-mk/strings.xml
index b419e52..f554d96 100644
--- a/service/res/values-mk/strings.xml
+++ b/service/res/values-mk/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Ракува со влезните настани"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-магистралата не успеа"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-магистралата не реагира. Откачете ја и повторно прикачете ја кутијата на главната единица и рестартирајте го автомобилот"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"За ваша безбедност, оваа активност не е достапна додека возите.\nЗа да продолжите, почекајте да се паркирате."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Не може да ја користите функцијава додека возите"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"За да започнете одново со безбедносните фунции на апликацијата, изберете <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Затвори апликација"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ги чита дијагностичките податоци"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Чита дијагностички податоци од автомобилот."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"чисти дијагностички податоци"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Пристапува до состојбата на моќност на автомобилот."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Регистрирајте доверлив уред"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Дозволете регистрација на доверлив уред"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Контролирање на режимот за тестирање на автомобилот"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Контролирање на режимот за тестирање на автомобилот"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мојот уред"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Гостин"</string>
 </resources>
diff --git a/service/res/values-ml/strings.xml b/service/res/values-ml/strings.xml
index 6e6007f..e7463cd 100644
--- a/service/res/values-ml/strings.xml
+++ b/service/res/values-ml/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ഇൻപുട്ട് ഇവന്റുകൾ കൈകാര്യം ചെയ്യുക"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN ബസ് പരാജയപ്പെട്ടു"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ബസ് പ്രതികരിക്കുന്നില്ല. ഹെഡ്‌യൂണിറ്റ് ബോക്‌സ്, അൺപ്ലഗ് ചെയ്‌ത്, വീണ്ടും പ്ലഗ് ചെയ്‌ത്, കാർ റീസ്‌റ്റാർട്ട് ചെയ്യുക"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"നിങ്ങളുടെ സുരക്ഷയ്ക്ക്, ഡ്രൈവ് ചെയ്യുമ്പോൾ ഈ ആക്റ്റിവിറ്റി ലഭ്യമല്ല.\nതുടരാൻ, നിങ്ങൾ പാർക്ക് ചെയ്യുന്നതുവരെ കാത്തിരിക്കുക."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ഡ്രെെവ് ചെയ്യുമ്പോൾ നിങ്ങൾ ഈ ഫീച്ചർ ഉപയോഗിക്കരുത്"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"സുരക്ഷിതമായ ആപ്പ് ഫീച്ചറുകൾ ഉപയോഗിച്ച് പുനരാരംഭിക്കാൻ, <xliff:g id="EXIT_BUTTON">%s</xliff:g> തിരഞ്ഞെടുക്കുക."</string>
     <string name="exit_button" msgid="5829638404777671253">"മടങ്ങുക"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ആപ്പ് അടയ്‌ക്കുക"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"മടങ്ങുക"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"പ്രശ്‌നനിർണ്ണയ ഡാറ്റ വായിക്കുക"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"കാറിൽ നിന്നുള്ള പ്രശ്‌നനിർണ്ണയ ഡാറ്റ വായിക്കുക."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"പ്രശ്‌നനിർണ്ണയ ഡാറ്റ മായ്‌ക്കുക"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"കാറിൻ്റെ പവർ നില ആക്‌സസ് ചെയ്യുക."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"വിശ്വസ്‌ത ഉപകരണം എൻറോൾ ചെയ്യുക"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"വിശ്വസ്‌ത ഉപകരണ എൻറോൾമെന്റ് അനുവദിക്കുക"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"കാറിന്റെ ടെസ്റ്റ് മോഡ് നിയന്ത്രിക്കുക"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"കാറിന്റെ ടെസ്റ്റ് മോഡ് നിയന്ത്രിക്കുക"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"എന്റെ ഉപകരണം"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"അതിഥി"</string>
 </resources>
diff --git a/service/res/values-mn/strings.xml b/service/res/values-mn/strings.xml
index 83da614..b5f57dc 100644
--- a/service/res/values-mn/strings.xml
+++ b/service/res/values-mn/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Оролтын арга хэмжээг боловсруулах"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus амжилтгүй болсон"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus хариу өгөхгүй байна. Хөгжим тоглуулагчийн хайрцгийг салгаад, дахин залгаж, машиныг дахин эхлүүлнэ үү"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Таны аюулгүй байдлын үүднээс жолоодох явцад энэ үйл ажиллагааг хийх боломжгүй.\nМашинаа зогсоолд байршуулаад үргэлжлүүлнэ үү."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Та энэ онцлогийг жолоо барьж байхдаа ашиглах боломжгүй"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Аппын аюулгүй онцлогуудтайгаар дахин эхлүүлэхийн тулд <xliff:g id="EXIT_BUTTON">%s</xliff:g>-г сонгоно уу."</string>
     <string name="exit_button" msgid="5829638404777671253">"Буцах"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Аппыг хаах"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Буцах"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"оношилгооны өгөгдлийг унших"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Машины оношилгооны өгөгдлийг унших."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"оношилгооны өгөгдлийг устгах"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Машины хөдөлгүүрийн хүчний төлөвт хандах."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Итгэмжлэгдсэн төхөөрөмж бүртгэх"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Итгэмжлэгдсэн төхөөрөмж бүртгэхийг зөвшөөрөх"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Машины тест горимыг хянах"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Машины тест горимыг хянах"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Миний төхөөрөмж"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Зочин"</string>
 </resources>
diff --git a/service/res/values-mr/strings.xml b/service/res/values-mr/strings.xml
index efdc646..b04502c 100644
--- a/service/res/values-mr/strings.xml
+++ b/service/res/values-mr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="car_permission_label" msgid="741004755205554376">"कारची माहिती अ‍ॅक्सेस करा"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"तुमच्या कारची माहिती अॅक्सेस करा."</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"तुमच्या कारची माहिती ॲक्सेस करा."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"कारचा कॅमेरा अ‍ॅक्सेस करा"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"तुमच्या कारचा(चे) कॅमेरा(रे) अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"कारच्या ऊर्जेची माहिती अ‍ॅक्सेस करा"</string>
@@ -44,12 +44,12 @@
     <string name="car_permission_label_audio_settings" msgid="6524703796944023977">"कारच्या ऑडिओ सेटिंग्ज व्यवस्थापित करा"</string>
     <string name="car_permission_label_mock_vehicle_hal" msgid="7198852512207405935">"वाहन HAL चे अनुकरण करा"</string>
     <string name="car_permission_label_receive_ducking" msgid="4884538660766756573">"डक केल्याच्या सूचना मिळवा"</string>
-    <string name="car_permission_desc_receive_ducking" msgid="776376388266656512">"कारमधील इतर ऑडिओ प्ले होत असल्याने अॅपचा व्हॉल्यूम कमी केला जातो तेव्हा ते अॅपला सूचित केले जाण्याची अनुमती देते."</string>
+    <string name="car_permission_desc_receive_ducking" msgid="776376388266656512">"कारमधील इतर ऑडिओ प्ले होत असल्याने ॲपचा व्हॉल्यूम कमी केला जातो तेव्हा ते ॲपला सूचित केले जाण्याची अनुमती देते."</string>
     <string name="car_permission_desc_mock_vehicle_hal" msgid="5235596491098649155">"अंतर्गत चाचणी उद्देशांसाठी तुमच्या कारच्या वाहन HAL चे अनुकरण करा."</string>
     <string name="car_permission_desc_audio_volume" msgid="536626185654307889">"तुमच्या कारचा ऑडिओ व्हॉल्यूम नियंत्रित करा."</string>
     <string name="car_permission_desc_audio_settings" msgid="7192007170677915937">"तुमच्या कारची ऑडिओ सेटिंग्ज नियंत्रित करा."</string>
-    <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"अॅप्लिकेशन ब्लॉक करणे"</string>
-    <string name="car_permission_desc_control_app_blocking" msgid="7539378161760696190">"ड्रायव्हिंग करत असताना अॅप्लिकेशन ब्लॉक करणे नियंत्रित करा."</string>
+    <string name="car_permission_label_control_app_blocking" msgid="9112678596919993386">"ॲप्लिकेशन ब्लॉक करणे"</string>
+    <string name="car_permission_desc_control_app_blocking" msgid="7539378161760696190">"ड्रायव्हिंग करत असताना ॲप्लिकेशन ब्लॉक करणे नियंत्रित करा."</string>
     <string name="car_permission_car_navigation_manager" msgid="5895461364007854077">"नेव्हिगेशन व्यवस्थापक"</string>
     <string name="car_permission_desc_car_navigation_manager" msgid="6188751054665471537">"इंस्ट्रुमेंट क्लस्टरला नेव्हिगेशन डेटाचा अहवाल द्या"</string>
     <string name="car_permission_car_display_in_cluster" msgid="4005987646292458684">"इंस्ट्रुमेंट क्लस्टरवर थेट रेंडरिंग"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"इनपुट इव्हेंट हाताळा"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN बस अयशस्वी"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN बस प्रतिसाद देत नाही. हेडयुनिट बॉक्स अनप्लग करून पुन्हा प्लग करा आणि कार रीस्टार्ट करा"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"तुमच्या सुरक्षेसाठी, ड्रायव्हिंग करत असताना ही अ‍ॅक्टिव्हिटी उपलब्ध नाही.\nसुरू ठेवण्यासाठी, पार्क करेपर्यंत वाट पहा."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"तुम्ही ड्राइव्ह करताना हे वैशिष्ट्य वापरू शकत नाही"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"सुरक्षित अ‍ॅप वैशिष्ट्यांसोबत पुन्हा सुरुवात करण्यासाठी, <xliff:g id="EXIT_BUTTON">%s</xliff:g> निवडा."</string>
     <string name="exit_button" msgid="5829638404777671253">"मागे जा"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"अ‍ॅप बंद करा"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"मागे जा"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"निदान डेटा वाचा"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"कारचा निदान डेटा वाचा."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"निदान डेटा साफ करा"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कारची पॉवर स्थिती अ‍ॅक्सेस करा."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"विश्वसनीय डिव्हाइसची नोंदणी करा"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"विश्वसनीय डिव्हाइसच्या नोंदणीला अनुमती द्या"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"कारचा चाचणी मोड नियंत्रित करा"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"कारचा चाचणी मोड नियंत्रित करा"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"माझे डिव्हाइस"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"अतिथी"</string>
 </resources>
diff --git a/service/res/values-ms/strings.xml b/service/res/values-ms/strings.xml
index 6869364..ad4927b 100644
--- a/service/res/values-ms/strings.xml
+++ b/service/res/values-ms/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kendalikan peristiwa input"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Bas CAN gagal"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Bas CAN tidak bertindak balas. Cabut dan palamkan kembali kotak unit stereo dan mulakan semula kereta"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Untuk keselamatan anda, aktiviti ini tidak tersedia semasa memandu.\nUntuk meneruskan, tunggu kereta diberhentikan."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Anda tidak boleh menggunakan ciri ini semasa memandu"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Untuk bermula semula dengan ciri apl selamat, pilih <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Kembali"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Tutup apl"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Kembali"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"baca data diagnostik"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Baca data diagnostik daripada kereta."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"kosongkan data diagnostik"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Akses keadaan kuasa kereta."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Daftarkan Peranti yang Dipercayai"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Benarkan Pendaftaran Peranti yang Dipercayai"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Mod ujian kereta kawalan"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Mod ujian kereta kawalan"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Peranti Saya"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Tetamu"</string>
 </resources>
diff --git a/service/res/values-my/strings.xml b/service/res/values-my/strings.xml
index e2e8572..6c6637d 100644
--- a/service/res/values-my/strings.xml
+++ b/service/res/values-my/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"အချက်အလက်ထည့်သွင်းခြင်း အစီအစဉ်များကို စီမံပါမည်"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"\"CAN bus\" စနစ် အသုံးပြုမှု မအောင်မြင်ပါ"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus စနစ်က တုန့်ပြန်မှုမရှိပါ။ စက်အထိုင်ဘောက်စ်ကို ပလတ်ဖြုတ်ပြီး ပြန်တပ်ကာ ကားကို ပြန်လည်စတင်ပါ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"သင့် လုံခြုံမှုအတွက် ဤလုပ်ဆောင်ချက်ကို ကားမောင်းနေစဉ် အသုံးမပြုနိုင်ပါ။\nဆက်လက်လုပ်ဆောင်ရန် ကားရပ်နားသည်အထိစောင့်ပါ။"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ကားမောင်းနေစဉ် ဤဝန်ဆောင်မှုကို သုံး၍မရပါ"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"စိတ်ချရသော အက်ပ်လုပ်ဆောင်ချက်များနှင့်အတူ အစမှပြန်စရန် <xliff:g id="EXIT_BUTTON">%s</xliff:g> ကို ရွေးချယ်ပါ။"</string>
     <string name="exit_button" msgid="5829638404777671253">"နောက်သို့"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"အက်ပ်ကိုပိတ်ရန်"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"နောက်သို့"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"အမှားရှာပြင်ခြင်းဒေတာများကို ကြည့်ပါမည်"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ကားအတွင်း အမှားရှာပြင်ခြင်းဒေတာကို ကြည့်ပါမည်။"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"အမှားရှာပြင်ခြင်းဒေတာများကို ရှင်းလင်းပါမည်"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ကား၏ ပါဝါအခြေအနေကို ရယူပါမည်။"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ယုံကြည်ရသည့် ကိရိယာကို စာရင်းသွင်းရန်"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ယုံကြည်ရသည့် ကိရိယာအား စာရင်းသွင်းခြင်းကို ခွင့်ပြုရန်"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ကား၏ စမ်းသပ်မုဒ်ကို ထိန်းချုပ်ရန်"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ကား၏ စမ်းသပ်မုဒ်ကို ထိန်းချုပ်ရန်"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ကျွန်ုပ်၏စက်"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ဧည့်သည်"</string>
 </resources>
diff --git a/service/res/values-nb/strings.xml b/service/res/values-nb/strings.xml
index 62108e6..16e2fa9 100644
--- a/service/res/values-nb/strings.xml
+++ b/service/res/values-nb/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Behandling av inndatahendelser"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus mislyktes"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus svarer ikke. Koble bilens hovedenhet ut og inn igjen, og start bilen på nytt"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Av sikkerhetshensyn er denne aktiviteten utilgjengelig når du kjører.\nDu kan ikke fortsette før du stopper bilen."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Du kan ikke bruke denne funksjonen når du kjører"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"For å starte på nytt med sikre appfunksjoner, velg <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Tilbake"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Lukk appen"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Tilbake"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"lese diagnostikkdata"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Les diagnostikkdata fra bilen."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"slette diagnostikkdata"</string>
@@ -121,7 +123,10 @@
     <string name="car_permission_desc_car_powertrain" msgid="1116007372551797796">"Tilgang til informasjon om bilens drivlinje."</string>
     <string name="car_permission_label_car_power" msgid="8111448088314368268">"lese bilens batterinivå"</string>
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Tilgang til bilens batterinivå."</string>
-    <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrer en pålitelig enhet"</string>
-    <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillat registrering av pålitelige enheter"</string>
+    <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrer en godkjent enhet"</string>
+    <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillat registrering av godkjente enheter"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrollér bilens testmodus"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrollér bilens testmodus"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Enheten min"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gjest"</string>
 </resources>
diff --git a/service/res/values-ne/strings.xml b/service/res/values-ne/strings.xml
index add0fb9..aa4b6c6 100644
--- a/service/res/values-ne/strings.xml
+++ b/service/res/values-ne/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"इनपुट गरिएका कार्यक्रमहरू व्यवस्थापन गर्ने"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus असफल भयो"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus ले प्रतिक्रिया जनाएन। हेडयुनिट बाकसलाई प्लगबाट निकालेर फेरि प्लगमा घुसाउनुहोस् र कार पुनःसुरु गर्नुहोस्‌"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"तपाईंको सुरक्षाका लागि, तपाईंले सवारी साधन चलाइरहेका बेलामा यो क्रियाकलाप उपलब्ध हुँदैन।\nजारी राख्न, पार्क नगरुन्जेल पर्खनुहोस्‌।"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"तपाईं सवारी साधन चलाइरहेका बेला यो सुविधा प्रयोग गर्न सक्नुहुन्न"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"अनुप्रयोगका सुरक्षित सुविधाहरूको प्रयोग गरी फेरि सुरु गर्न <xliff:g id="EXIT_BUTTON">%s</xliff:g> चयन गर्नुहोस्‌।"</string>
     <string name="exit_button" msgid="5829638404777671253">"पछाडि"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"अनुप्रयोग बन्द गर्नुहोस्"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"पछाडि"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"निदानसम्बन्धी डेटा पढ्ने"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"कारको निदानसम्बन्धी डेटा पढ्ने।"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"निदानसम्बन्धी डेटा हटाउने"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"कारको शक्तिको स्थितिमाथि पहुँच राख्ने।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"विश्वसनीय यन्त्र दर्ता गर्नुहोस्"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"विश्वसनीय यन्त्र दर्ता गर्ने अनुमति दिनुहोस्"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"कारको परीक्षण मोड नियन्त्रण गर्नुहोस्"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"कारको परीक्षण मोड नियन्त्रण गर्नुहोस्"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"मेरो यन्त्र"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"अतिथि"</string>
 </resources>
diff --git a/service/res/values-nl/strings.xml b/service/res/values-nl/strings.xml
index 0959bb8..785fd9b 100644
--- a/service/res/values-nl/strings.xml
+++ b/service/res/values-nl/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"toegang tot gegevens van auto"</string>
+    <string name="car_permission_label" msgid="741004755205554376">"Toegang tot gegevens van auto"</string>
     <string name="car_permission_desc" msgid="162499818870052725">"toegang krijgen tot je autogegevens."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"toegang tot camera van auto"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Toegang tot de camera(\'s) van je auto."</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Invoergebeurtenissen verwerken"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN-bus is mislukt"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bus reageert niet. Koppel de hoofdeenheid los en sluit deze vervolgens weer aan. Start de auto daarna opnieuw."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Voor jouw veiligheid is deze activiteit niet beschikbaar als je aan het rijden bent.\nJe moet parkeren om door te gaan."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Je kunt deze functie niet gebruiken tijdens het rijden"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Selecteer <xliff:g id="EXIT_BUTTON">%s</xliff:g> om opnieuw te beginnen met de veilige app-functies."</string>
     <string name="exit_button" msgid="5829638404777671253">"Vorige"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"App sluiten"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Terug"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"diagnostische gegevens lezen"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Diagnostische gegevens van auto lezen."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diagnostische gegevens wissen"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Toegang tot stroomstatus van auto."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Vertrouwd apparaat inschrijven"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Inschrijving van vertrouwd apparaat toestaan"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Testmodus van auto bedienen"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Testmodus van auto bedienen"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Mijn apparaat"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gast"</string>
 </resources>
diff --git a/service/res/values-or/strings.xml b/service/res/values-or/strings.xml
index 2d90b94..b02e150 100644
--- a/service/res/values-or/strings.xml
+++ b/service/res/values-or/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ଇନ୍‍ପୁଟ୍ ଇଭେଣ୍ଟଗୁଡ଼ିକ ପରିଚାଳନା କରିପାରେ"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN ବସ୍ ବିଫଳ ହେଲା"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ବସ୍ ପ୍ରତିକ୍ରିୟା ଦେଉନାହିଁ। ହେଡୟୁନିଟ୍ ବାକ୍ସର ପ୍ଲଗ୍ କାଢ଼ି ପୁଣି ଲଗାନ୍ତୁ ଏବଂ କାର୍‍କୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ଆପଣଙ୍କ ସୁରକ୍ଷା ପାଇଁ, ଡ୍ରାଇଭିଂ କରିବା ସମୟରେ ଏହି ଗତିବିଧି ଉପଲବ୍ଧ ନାହିଁ।\nଜାରି ରଖିବା ପାଇଁ, ପାର୍କ କରିବା ପର୍ଯ୍ୟନ୍ତ ଅପେକ୍ଷା କରନ୍ତୁ।"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ଆପଣ ଡ୍ରାଇଭ୍‍ କରିବା ସମୟରେ ଏହି ଫିଚର୍‍ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ସୁରକ୍ଷିତ ଆପ୍ ବୈଶିଷ୍ଟ୍ୟଗୁଡ଼ିକୁ ନେ‍ଇ ପୁଣି ଆରମ୍ଭ କରିବା ପାଇଁ, <xliff:g id="EXIT_BUTTON">%s</xliff:g> ଚୟନ କରନ୍ତୁ।"</string>
     <string name="exit_button" msgid="5829638404777671253">"ପଛକୁ ଫେରନ୍ତୁ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ଆପ୍‍ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ପଛକୁ ଫେରନ୍ତୁ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ଡାଏଗ୍ନୋଷ୍ଟିକ୍ ଡାଟାକୁ ପଢ଼ିବ"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"କାର୍‍ ମଧ୍ୟରୁ ଡାଏଗ୍ନୋଷ୍ଟିକ୍ ଡାଟାକୁ ପଢ଼ିବ।"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ଡାଏଗ୍ନୋଷ୍ଟିକ୍ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"କାର୍\'ର ପାୱାର୍ ଷ୍ଟେଟ୍‌କୁ ଆକ୍‍‍ସେସ୍ କରନ୍ତୁ।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ଚିହ୍ନା ଡିଭାଇସ୍‌ର ନାମାଙ୍କନ କରନ୍ତୁ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ଚିହ୍ନା ଡିଭାଇସ୍‌ ନାମାଙ୍କନକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"କାର୍‍ର ପରୀକ୍ଷଣ ମୋଡ୍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"କାର୍‍ର ପରୀକ୍ଷଣ ମୋଡ୍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ମୋ ଡିଭାଇସ୍"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ଅତିଥି"</string>
 </resources>
diff --git a/service/res/values-pa/strings.xml b/service/res/values-pa/strings.xml
index d3700ed..1205efd 100644
--- a/service/res/values-pa/strings.xml
+++ b/service/res/values-pa/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ਇਨਪੁੱਟ ਇਵੈਂਟਾਂ ਦੀ ਸੰਭਾਲ"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN ਬੱਸ ਅਸਫਲ ਰਹੀ"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN ਬੱਸ ਕੰਮ ਨਹੀਂ ਕਰਦੀ। ਹੈੱਡ ਯੂਨਿਟ ਬਾਕਸ ਨੂੰ ਅਨਪਲੱਗ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਪਲੱਗ ਲਗਾ ਕੇ ਕਾਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ਤੁਹਾਡੀ ਸੁਰੱਖਿਆ ਲਈ, ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਇਹ ਸਰਗਰਮੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।\nਜਾਰੀ ਰੱਖਣ ਲਈ, ਗੱਡੀ ਰੋਕਣ ਤੱਕ ਉਡੀਕ ਕਰੋ।"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ਤੁਸੀਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਗੱਡੀ ਚਲਾਉਂਦੇ ਸਮੇਂ ਨਹੀਂ ਵਰਤ ਸਕਦੇ"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ਸੁਰੱਖਿਅਤ ਐਪ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨਾਲ ਮੁੜ ਤੋਂ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, <xliff:g id="EXIT_BUTTON">%s</xliff:g> ਚੁਣੋ।"</string>
     <string name="exit_button" msgid="5829638404777671253">"ਪਿੱਛੇ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ਐਪ ਬੰਦ ਕਰੋ"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ਪਿੱਛੇ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ਤਸ਼ਖੀਸੀ ਡਾਟੇ ਨੂੰ ਪੜ੍ਹਨਾ"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"ਕਾਰ ਦਾ ਤਸ਼ਖੀਸੀ ਡਾਟਾ ਪੜ੍ਹਨਾ।"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ਤਸ਼ਖੀਸੀ ਡਾਟਾ ਕਲੀਅਰ ਕਰਨਾ"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"ਕਾਰ ਦੀ ਪਾਵਰ ਸਥਿਤੀ ਤੱਕ ਪਹੁੰਚ।"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸਾਂ ਦਰਜ ਕਰੋ"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸਾਂ ਨੂੰ ਦਰਜਾਬੰਦੀ ਕਰਨ ਦਿਓ"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ਕਾਰ ਦੇ ਜਾਂਚ ਮੋਡ \'ਤੇ ਕੰਟਰੋਲ"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ਕਾਰ ਦੇ ਜਾਂਚ ਮੋਡ \'ਤੇ ਕੰਟਰੋਲ"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"ਮੇਰਾ ਡੀਵਾਈਸ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ਮਹਿਮਾਨ"</string>
 </resources>
diff --git a/service/res/values-pl/strings.xml b/service/res/values-pl/strings.xml
index 593181e..733cda3 100644
--- a/service/res/values-pl/strings.xml
+++ b/service/res/values-pl/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Obsługa zdarzeń wprowadzania danych"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Błąd magistrali CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Magistrala CAN nie odpowiada. Odłącz i jeszcze raz podłącz moduł główny i ponownie uruchom samochód."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Dla Twojego bezpieczeństwa ta funkcja jest wyłączona podczas jazdy.\nAby jej użyć, zaparkuj samochód."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Podczas jazdy nie można korzystać z tej funkcji"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Aby jeszcze raz przejść do funkcji bezpieczeństwa w aplikacji, wybierz <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Wstecz"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zamknij aplikację"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Wstecz"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"odczytywanie danych diagnostycznych"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Odczytywanie danych diagnostycznych samochodu."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"czyszczenie danych diagnostycznych"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Dostęp do stanu zasilania w samochodzie."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Zarejestruj zaufane urządzenie"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Zezwalaj na rejestrowanie zaufanych urządzeń"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Sterowanie trybem testowym w samochodzie"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Sterowanie trybem testowym w samochodzie"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moje urządzenie"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gość"</string>
 </resources>
diff --git a/service/res/values-pt-rPT/strings.xml b/service/res/values-pt-rPT/strings.xml
index 3ba192b..dfcc04a 100644
--- a/service/res/values-pt-rPT/strings.xml
+++ b/service/res/values-pt-rPT/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Processe eventos de entrada."</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Falha no CAN bus."</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"O CAN bus não responde. Desligue e volte a ligar a caixa da unidade principal e reinicie o automóvel."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Para sua segurança, esta atividade não está disponível enquanto estiver a conduzir.\nPode continuar após estacionar."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Não pode utilizar esta funcionalidade enquanto conduz."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Para começar de novo com funcionalidades de aplicações seguras, selecione <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Anterior"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Fechar app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Anterior"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ler os dados de diagnóstico"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ler os dados de diagnóstico do automóvel."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"limpar os dados de diagnóstico"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Aceder ao estado de energia do automóvel."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscrever dispositivo fidedigno"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir a inscrição de dispositivos fidedignos"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar o modo de teste do automóvel"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar o modo de teste do automóvel"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Dispositivo"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Convidado"</string>
 </resources>
diff --git a/service/res/values-pt/strings.xml b/service/res/values-pt/strings.xml
index 3a002c3..5688116 100644
--- a/service/res/values-pt/strings.xml
+++ b/service/res/values-pt/strings.xml
@@ -16,14 +16,14 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"acessar as informações do carro"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Acessar as informações do carro."</string>
+    <string name="car_permission_label" msgid="741004755205554376">"acessar informações do carro"</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"Acessar informações do carro."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"acessar a câmera do carro"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Acessar câmeras do carro."</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"acessar as informações de energia do carro"</string>
     <string name="car_permission_desc_energy" msgid="3392963810053235407">"Acessar informações de abastecimento do carro."</string>
-    <string name="car_permission_label_hvac" msgid="1499454192558727843">"acessar o HVAC (Aquecimento, ventilação e ar condicionado) do carro"</string>
-    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Acessar o HVAC (Aquecimento, ventilação e ar condicionado) do carro."</string>
+    <string name="car_permission_label_hvac" msgid="1499454192558727843">"acessar o HVAC (Aquecimento, ventilação e ar-condicionado) do carro"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Acessar o HVAC (Aquecimento, ventilação e ar-condicionado) do carro."</string>
     <string name="car_permission_label_mileage" msgid="4661317074631150551">"acessar informações de quilometragem do carro"</string>
     <string name="car_permission_desc_mileage" msgid="7179735693278681090">"Acessar informações sobre a quilometragem do carro."</string>
     <string name="car_permission_label_speed" msgid="1149027717860529745">"ler a velocidade do carro"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gerenciar eventos de entrada"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Falha no barramento CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"O barramento CAN parou de responder. Desconecte e conecte novamente a caixa da unidade principal, depois ligue o carro"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Para sua segurança, essa atividade não está disponível enquanto você dirige.\nPara continuar, aguarde até estacionar."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Não é possível usar esse recurso enquanto você dirige"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Para reiniciar o app com recursos de segurança, selecione <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Voltar"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Fechar app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Voltar"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ler dados de diagnóstico"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ler dados de diagnóstico do carro."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"limpar dados de diagnóstico"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Acessar estado da potência do carro."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Inscrever dispositivo confiável"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permitir inscrição de dispositivo confiável"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlar modo de teste do carro"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlar modo de teste do carro"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Meu dispositivo"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Visitante"</string>
 </resources>
diff --git a/service/res/values-ro/strings.xml b/service/res/values-ro/strings.xml
index 6f48c30..470f90d 100644
--- a/service/res/values-ro/strings.xml
+++ b/service/res/values-ro/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Gestionează evenimentele de intrare"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Magistrala CAN nu a reușit"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Magistrala CAN nu răspunde. Deconectați și reconectați unitatea radio, apoi reporniți mașina"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Pentru siguranța dvs., activitatea nu este disponibilă în timp ce conduceți.\nCa să continuați, așteptați să parcați."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Nu puteți folosi această funcție în timp ce conduceți"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Pentru a începe din nou cu funcțiile pentru aplicații sigure, selectați <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Înapoi"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Închideți aplicația"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Înapoi"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"Citește datele de diagnosticare"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Citește datele de diagnosticare de la mașină."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"Șterge datele de diagnosticare"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Accesează starea de încărcare a mașinii."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Înscrieți un dispozitiv de încredere"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Permiteți înscrierea unui dispozitiv de încredere"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Controlați modul de testare a mașinii"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controlați modul de testare a mașinii"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Dispozitivul meu"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Invitat"</string>
 </resources>
diff --git a/service/res/values-ru/strings.xml b/service/res/values-ru/strings.xml
index 205d54a..2362d73 100644
--- a/service/res/values-ru/strings.xml
+++ b/service/res/values-ru/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="car_permission_label" msgid="741004755205554376">"доступ к данным об автомобиле"</string>
-    <string name="car_permission_desc" msgid="162499818870052725">"Предоставить приложению доступ к данным автомобиля"</string>
+    <string name="car_permission_label" msgid="741004755205554376">"Доступ к данным об автомобиле"</string>
+    <string name="car_permission_desc" msgid="162499818870052725">"получать доступ к данным автомобиля."</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"доступ к камере автомобиля"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Доступ к камерам автомобиля"</string>
     <string name="car_permission_label_energy" msgid="7409144323527821558">"доступ к данным об энергоресурсах автомобиля"</string>
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Возможность обрабатывать события ввода"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Произошла ошибка шины CAN."</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Шина CAN не отвечает. Переподключите коннектор, а затем выключите зажигание и заведите машину снова."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Во время вождения это действие недоступно.\nСначала вам нужно припарковаться."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Эту функцию нельзя использовать во время вождения."</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Чтобы перезапустить приложение в безопасном режиме, нажмите кнопку \"<xliff:g id="EXIT_BUTTON">%s</xliff:g>\"."</string>
     <string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Закрыть приложение"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"чтение диагностических данных"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Чтение диагностических данных автомобиля."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"удаление диагностических данных"</string>
@@ -97,7 +99,7 @@
     <string name="car_permission_desc_control_car_mirrors" msgid="1224135684068855032">"Управление зеркалами."</string>
     <string name="car_permission_label_control_car_seats" msgid="1826934820585497135">"управление сиденьями"</string>
     <string name="car_permission_desc_control_car_seats" msgid="2407536601226470563">"Управление сиденьями."</string>
-    <string name="car_permission_label_car_info" msgid="4707513570676492315">"доступ к общим данным об автомобиле"</string>
+    <string name="car_permission_label_car_info" msgid="4707513570676492315">"Доступ к общим данным об автомобиле"</string>
     <string name="car_permission_desc_car_info" msgid="2118081474543537653">"Доступ к общим данным об автомобиле."</string>
     <string name="car_permission_label_car_exterior_lights" msgid="541304469604902110">"чтение данных о состоянии внешних осветительных приборов"</string>
     <string name="car_permission_desc_car_exterior_lights" msgid="4038037584100849318">"Доступ к данным о состоянии внешних осветительных приборов."</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Доступ к данным об электропитании автомобиля."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Регистрация надежных устройств"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Разрешить регистрацию надежных устройств."</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Управление тестовым режимом"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Управление тестовым режимом"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мое устройство"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Гость"</string>
 </resources>
diff --git a/service/res/values-si/strings.xml b/service/res/values-si/strings.xml
index 49e9ce4..490d677 100644
--- a/service/res/values-si/strings.xml
+++ b/service/res/values-si/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ආදාන සිදුවීම් පරිහරණ කරන්න"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN බස් අසාර්ථකයි"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN බස් ප්‍රතිචාර නොදක්වයි. හෙඩ්යුනිට් පෙට්ටිය පේනු ඉවත් කර ආපසු පේනුගත කර, මෝටර් රථය යළි අරඹන්න"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"ඔබේ ආරක්‍ෂාව සඳහා, ඔබ රිය පදවන විට මෙම ක්‍රියාකාරකම නොලැබේ.\nඉදිරියට යාමට, ඔබ ගාල් කරන තෙක් රැඳී සිටින්න."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"රිය පදවන අතරේ ඔබට මෙම විශේෂාංගය භාවිතා කළ නොහැක"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ආරක්‍ෂිත යෙදුම් විශේෂාංග සමඟ පටන් ගැනීමට, <xliff:g id="EXIT_BUTTON">%s</xliff:g> තෝරන්න."</string>
     <string name="exit_button" msgid="5829638404777671253">"ආපසු"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"යෙදුම වසන්න"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"ආපසු"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"දෝෂනිර්ණ දත්ත කියවන්න"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"මෝටර් රථයෙන් දෝෂනිර්ණ දත්ත කියවන්න."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"දෝෂනිර්ණ දත්ත හිස් කරන්න"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"මෝටර් රථයේ බල තත්ත්වයට ප්‍රවේශ වන්න."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"විශ්වාසී උපාංගය ඇතුළත් කරන්න"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"විශ්වාසී උපාංග ඇතුළත් කිරීමට ඉඩ දෙන්න"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"මෝටර් රථයේ පරීක්ෂණ ප්‍රකාරය පාලනය"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"මෝටර් රථයේ පරීක්ෂණ ප්‍රකාරය පාලනය"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"මගේ උපාංගය"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"අමුත්තා"</string>
 </resources>
diff --git a/service/res/values-sk/strings.xml b/service/res/values-sk/strings.xml
index 8e5cb3e..46dfc59 100644
--- a/service/res/values-sk/strings.xml
+++ b/service/res/values-sk/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Spravovať udalosti vstupu"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Zbernica CAN zlyhala"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Zbernica CAN nereaguje. Odpojte autorádio a znova ho pripojte. Potom auto znova naštartujte."</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Z bezpečnostných dôvodov nie je táto aktivita k dispozícii počas jazdy.\nAk chcete pokračovať, počkajte, kým budete parkovať."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Túto funkciu nie je možné používať za jazdy"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Ak chcete začať odznova s bezpečnými funkciami aplikácie, vyberte tlačidlo <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Späť"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zavrieť aplikáciu"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Späť"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"čítať diagnostické údaje"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Čítanie diagnostických údajov z auta."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"vymazať diagnostické údaje"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Prístup k stavu napájania auta."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrovať dôveryhodné zariadenie"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Povoliť registráciu dôveryhodného zariadenia"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Ovládanie testovacieho režimu auta"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Ovládanie testovacieho režimu auta"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moje zariadenie"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Hosť"</string>
 </resources>
diff --git a/service/res/values-sl/strings.xml b/service/res/values-sl/strings.xml
index 2e00b3a..54bab6d 100644
--- a/service/res/values-sl/strings.xml
+++ b/service/res/values-sl/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Obravnava dogodkov vnosa"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Napaka vodila CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Vodilo CAN se ne odziva. Odklopite in znova priklopite ohišje avtomobilskega vmesnika ter znova zaženite avtomobil"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Zaradi varnosti ta dejavnost med vožnjo ni na voljo.\nČe želite nadaljevati, počakajte, da bo vozilo parkirano."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Te funkcije med vožnjo ne morete uporabljati"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Če želite začeti znova z varnimi funkcijami aplikacij, izberite <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Nazaj"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Zapri aplikacijo"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Nazaj"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"branje diagnostičnih podatkov"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Branje diagnostičnih podatkov avtomobila."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"brisanje diagnostičnih podatkov"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Dostop do stanja napajanja avtomobila."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Včlani zaupanja vredno napravo"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Omogočanje včlanitve zaupanja vredne naprave"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Nadziranje preizkusnega načina avtomobila"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Nadziranje preizkusnega načina avtomobila"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Moja naprava"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gost"</string>
 </resources>
diff --git a/service/res/values-sq/strings.xml b/service/res/values-sq/strings.xml
index f7f4684..dc82e47 100644
--- a/service/res/values-sq/strings.xml
+++ b/service/res/values-sq/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Menaxho ngjarjet e hyrjes"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Kanali i komunikimit CAN dështoi"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Kanali i komunikimit CAN nuk përgjigjet. Shkëput dhe lidh përsëri kutinë e njësisë kryesore dhe rindiz makinës"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Për sigurinë tënde, ky aktivitet nuk ofrohet kur je duke drejtuar makinën.\nPër të vazhduar, prit deri sa të parkosh."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Nuk mund ta përdorësh këtë veçori gjatë drejtimit të makinës"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Për të filluar nga e para me funksionet e sigurta të aplikacionit, zgjidh <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Prapa"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Mbyll aplikacionin"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Pas"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"lexo të dhënat diagnostikuese"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Lexo të dhënat diagnostikuese nga makina."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"pastro të dhënat diagnostikuese"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Qasu te gjendja e fuqisë së makinës."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Regjistro pajisjen e besuar"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Lejo regjistrimin e pajisjes së besuar"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrollo modalitetin e testimit të makinës"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrollo modalitetin e testimit të makinës"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Pajisja ime"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"I ftuar"</string>
 </resources>
diff --git a/service/res/values-sr/strings.xml b/service/res/values-sr/strings.xml
index 0983a07..0d05a02 100644
--- a/service/res/values-sr/strings.xml
+++ b/service/res/values-sr/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Управља догађајима уноса"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Грешка CAN магистрале"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN магистрала не реагује. Искључите и поново укључите главну јединицу и поново покрените аутомобил"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Ова активност није доступна док возите ради ваше безбедности.\nДа бисте наставили, прво се паркирајте."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Не можете да користите ову функцију док возите"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Да бисте поново почели са безбедним функцијама апликације, изаберите <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Затвори апликацију"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"читање дијагностичких података"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Читање дијагностичких података из аутомобила."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"брисање дијагностичких података"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Приступ статусу напајања аутомобила."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Региструј поуздани уређај"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Омогући регистровање поузданих уређаја"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Контрола режима за тестирање аутомобила"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Контрола режима за тестирање аутомобила"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мој уређај"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Гост"</string>
 </resources>
diff --git a/service/res/values-sv/strings.xml b/service/res/values-sv/strings.xml
index 3f0ea0c..05f586c 100644
--- a/service/res/values-sv/strings.xml
+++ b/service/res/values-sv/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Hantera indatahändelser"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Fel i CAN-bussen"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-bussen svarar inte. Koppla från huvudenheten och koppla in den igen. Starta sedan om bilen"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Av säkerhetsskäl är den här aktiviteten inte tillgänglig under körning.\nDu kan fortsätta med detta när du har parkerat."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Du kan inte använda funktionen medan du kör"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Välj <xliff:g id="EXIT_BUTTON">%s</xliff:g> om du vill starta om appen med säkra funktioner."</string>
     <string name="exit_button" msgid="5829638404777671253">"Tillbaka"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Stäng appen"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Tillbaka"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"läsa diagnostikdata"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Läsa diagnostisk data om bilen."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"rensa diagnostikdata"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Åtkomst till bilens laddning."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Registrera betrodd enhet"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Tillåt registrering av betrodda enheter"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Styra bilens testläge"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Styra bilens testläge"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Min enhet"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Gäst"</string>
 </resources>
diff --git a/service/res/values-sw/strings.xml b/service/res/values-sw/strings.xml
index 0619eac..132e340 100644
--- a/service/res/values-sw/strings.xml
+++ b/service/res/values-sw/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Kudhibiti matukio ya kuweka data"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Imeshindwa kuleta maelezo ya kebo CAN"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Kebo ya CAN haifanyi kazi. Ondoa kisha urudishe tena kisanduku cha sehemu kuu na uzime kisha uwashe gari"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Kwa usalama wako, shughuli haipatikani wakati unaendesha gari. \nIli uendelee, subiri hadi utakapoegesha gari."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Huwezi kutumia kipengele hiki wakati unaendesha gari"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Ili uanzishe tena ukitumia vipengele salama vya programu, chagua <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Rudi Nyuma"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Funga programu"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Nyuma"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"kusoma data ya uchunguzi"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Kusoma data ya uchunguzi kwenye gari."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"kufuta data ya uchunguzi wa gari"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Kufikia hali ya nishati ya gari."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Sajili Vifaa Unavyoviamini"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Ruhusu Usajili wa Vifaa Unavyoviamini"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kudhibiti hali ya jaribio la gari"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kudhibiti hali ya jaribio la gari"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Kifaa Changu"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Mgeni"</string>
 </resources>
diff --git a/service/res/values-ta/strings.xml b/service/res/values-ta/strings.xml
index 8eab4ef..51bf2ab 100644
--- a/service/res/values-ta/strings.xml
+++ b/service/res/values-ta/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"உற்பத்தியாளர் வழங்கும் சேவைகளைக் கையாளுதல்"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN bus அமைப்பு தோல்வியடைந்தது"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN bus அமைப்பு இயங்கவில்லை. ஹெட்யூனிட் பாக்ஸைப் பிளக்கில் இருந்து அகற்றிச் செருகியபின் காரை மீண்டும் தொடங்கவும்"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"உங்கள் பாதுகாப்பை முன்னிட்டு இந்தச் செயல்பாடு, வாகனம் ஓட்டும்போது இயங்காது.\nதொடர வாகனத்தை நிறுத்தும்வரை காத்திருக்கவும்."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"வாகனம் ஓட்டும்போது இந்த அம்சத்தைப் பயன்படுத்த முடியாது"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"ஆப்ஸைப் பாதுகாப்பான அம்சங்களுடன் மீண்டும் தொடங்க <xliff:g id="EXIT_BUTTON">%s</xliff:g>ஐத் தேர்ந்தெடுக்கவும்."</string>
     <string name="exit_button" msgid="5829638404777671253">"பின்செல்"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ஆப்ஸை மூடுக"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"முந்தையது"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"ஆய்வுத் தரவை அறிய வேண்டும்"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"கார் தொடர்பான ஆய்வுத் தரவை அறிய வேண்டும்."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ஆய்வுத் தரவை அழிக்க வேண்டும்"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"காரின் ஆற்றல் நிலையை அணுக வேண்டும்."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"’நம்பகமான சாதனம்’ என்று பதிவு செய்"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"’நம்பகமான சாதனம்’ என்று பதிவு செய்வதை அனுமதிக்கும்"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"காரின் சோதனைப் பயன்முறையைக் கட்டுப்படுத்த வேண்டும்"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"காரின் சோதனைப் பயன்முறையைக் கட்டுப்படுத்த வேண்டும்"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"எனது சாதனம்"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"விருந்தினர்"</string>
 </resources>
diff --git a/service/res/values-te/strings.xml b/service/res/values-te/strings.xml
index 494e476..fb11edf 100644
--- a/service/res/values-te/strings.xml
+++ b/service/res/values-te/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ఇన్‌పుట్ ఈవెంట్‌లను హ్యాండిల్ చేయండి"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN బస్సు విఫలమైంది"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN బస్సు స్పందించలేదు. హెడ్ యూనిట్ బాక్స్‌‍‌ని ప్లగ్ మరియు అన్‌ప్లగ్ చేసి కారుని పునఃప్రారంభించుము"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"మీ భద్రత విషయమై, ఈ కార్యాచరణ మీరు డ్రైవింగ్‌లో ఉన్నప్పుడు అందుబాటులో లేదు.\n కొనసాగించడానికి, మీరు పార్క్ చేయబడేవరకు వేచి ఉండండి."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"డ్రైవింగ్‌లో ఉండగా మీరు ఈ ఫీచర్‌ని ఉపయోగించలేరు"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"సురక్షిత యాప్ లక్షణాలతో ప్రారంభించడానికి, <xliff:g id="EXIT_BUTTON">%s</xliff:g>ని ఎంచుకోండి."</string>
     <string name="exit_button" msgid="5829638404777671253">"వెనుకకు"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"యాప్‌ను మూసివేయండి"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"వెనుకకు"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"సమస్య విశ్లేషణ డేటాను తెలుసుకోగలవు"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"కారు నుండి విశ్లేషణ డేటాను తెలుసుకోగలవు."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"సమస్య విశ్లేషణ డేటాను క్లియర్ చేయగలవు"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"కారు పవర్ స్థితిని యాక్సెస్ చేయగలవు."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"విశ్వసనీయ పరికరాన్ని నమోదు చేయండి"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"విశ్వసనీయ పరికర నమోదును అనుమతించండి"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"కారు యొక్క పరీక్ష మోడ్‌ను నియంత్రించండి"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"కారు యొక్క పరీక్ష మోడ్‌ను నియంత్రించండి"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"నా పరికరం"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"అతిథి"</string>
 </resources>
diff --git a/service/res/values-th/strings.xml b/service/res/values-th/strings.xml
index 197bc75..22786e2 100644
--- a/service/res/values-th/strings.xml
+++ b/service/res/values-th/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"จัดการเหตุการณ์การป้อนข้อมูล"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN Bus ล้มเหลว"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN Bus ไม่ตอบสนอง ถอดปลั๊กกล่องเครื่องเล่นวิทยุ (Headunit) แล้วเสียบกลับเข้าไป สตาร์ทรถอีกครั้ง"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"เพื่อความปลอดภัย กิจกรรมนี้จะไม่เปิดให้ใช้งานขณะขับรถ\nคุณต้องจอดรถให้เรียบร้อยก่อน จึงจะดำเนินการต่อได้"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"คุณใช้ฟีเจอร์นี้ขณะขับรถไม่ได้"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"เลือก <xliff:g id="EXIT_BUTTON">%s</xliff:g> เพื่อเริ่มต้นใหม่โดยใช้ฟีเจอร์แอปที่ปลอดภัย"</string>
     <string name="exit_button" msgid="5829638404777671253">"กลับ"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ปิดแอป"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"กลับ"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"อ่านข้อมูลการวินิจฉัย"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"อ่านข้อมูลการวินิจฉัยจากรถ"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"ล้างข้อมูลการวินิจฉัย"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"เข้าถึงสถานะพลังงานของรถ"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"ลงทะเบียนอุปกรณ์ที่เชื่อถือได้"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"อนุญาตการลงทะเบียนอุปกรณ์ที่เชื่อถือได้"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"ควบคุมโหมดการทดสอบของรถยนต์"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"ควบคุมโหมดการทดสอบของรถยนต์"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"อุปกรณ์ของฉัน"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"ผู้มาเยือน"</string>
 </resources>
diff --git a/service/res/values-tl/strings.xml b/service/res/values-tl/strings.xml
index d50637f..3f49db7 100644
--- a/service/res/values-tl/strings.xml
+++ b/service/res/values-tl/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Pangasiwaan ang mga event ng input"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Hindi gumana ang CAN bus"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Hindi tumugon ang CAN bus. Hugutin at muling isaksak ang headunit box at i-restart ang sasakyan"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Para sa seguridad, hindi available ang aktibidad habang nagmamaneho.\nPara magpatuloy, maghintay hanggang sa makaparada."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Hindi mo puwedeng gamitin ang feature na ito habang nagmamaneho"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Para magsimula sa mga ligtas na feature ng app, piliin ang <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Bumalik"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Isara ang app"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Bumalik"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"basahin ang data ng mga diagnostic"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Basahin ang data ng mga diagnostic mula sa sasakyan."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"i-clear ang data ng mga diagnostic"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"I-access ang status ng power ng sasakyan."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Mag-enroll ng Pinagkakatiwalaang Device"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Payagan ang Pag-enroll ng Pinagkakatiwalaang Device"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kontrolin ang test mode ng kotse"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kontrolin ang test mode ng kotse"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Aking Device"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Bisita"</string>
 </resources>
diff --git a/service/res/values-tr/strings.xml b/service/res/values-tr/strings.xml
index 861d4cb..6ab1526 100644
--- a/service/res/values-tr/strings.xml
+++ b/service/res/values-tr/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Giriş olaylarını işleme"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN veri yolu başarısız"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN veri yolu yanıt vermiyor. Ana birim kutusunu söküp tekrar takın ve aracı yeniden çalıştırın"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Güvenliğiniz için bu etkinlik sürüş sırasında gerçekleştirilemez.\nDevam etmek için park edene dek bekleyin."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Sürüş sırasında bu özelliği kullanamazsınız"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Güvenli uygulama özellikleriyle baştan başlamak için <xliff:g id="EXIT_BUTTON">%s</xliff:g> düğmesini seçin."</string>
     <string name="exit_button" msgid="5829638404777671253">"Geri"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Uygulamayı kapat"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Geri"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"teşhis verilerini okuma"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Araçtan teşhis verilerini okuma."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"teşhis verilerini temizleme"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Aracın güç durumuna erişim."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Güvenilen Cihazı Kaydet"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Güvenilen Cihaz Kaydına İzin Ver"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Aracın test modunu kontrol etme"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Aracın test modunu kontrol etme"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Cihazım"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Misafir"</string>
 </resources>
diff --git a/service/res/values-uk/strings.xml b/service/res/values-uk/strings.xml
index 24fc867..d8dd8e7 100644
--- a/service/res/values-uk/strings.xml
+++ b/service/res/values-uk/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Обробка вхідних подій"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Помилка CAN-шини"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN-шина не відповідає. Від’єднайте та знову під’єднайте головний пристрій аудіосистеми й заведіть автомобіль ще раз"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Задля вашої безпеки ці дії недоступні під час поїздки.\nЩоб продовжити, зупиніть автомобіль."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Ця функція недоступна під час руху"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Щоб почати знову з безпечними функціями додатка, натисніть кнопку \"<xliff:g id="EXIT_BUTTON">%s</xliff:g>\"."</string>
     <string name="exit_button" msgid="5829638404777671253">"Назад"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Закрити додаток"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Назад"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"перегляд даних діагностики"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Перегляд даних діагностики автомобіля."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"очищення даних діагностики"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Доступ до даних про рівень заряду автомобіля."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Зареєструвати надійний пристрій"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Дозволити реєстрацію надійних пристроїв"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Керувати режимом тестування автомобіля"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Керувати режимом тестування автомобіля"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Мій пристрій"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Гість"</string>
 </resources>
diff --git a/service/res/values-ur/strings.xml b/service/res/values-ur/strings.xml
index 58f1aca..953af22 100644
--- a/service/res/values-ur/strings.xml
+++ b/service/res/values-ur/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"ایونٹس کے ان پٹ کو ہینڈل کریں"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"کین بس ناکام ہو گئی"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"کین بس جواب نہیں دیتی ہے۔ ہیڈیونٹ باکس کو ان پلگ کر کے دوبارہ پلگ کریں اور کار کو دوبارہ شروع کریں"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"آپ کی حفاظت کے لیے یہ سرگرمی آپ کے کار چلانے کے دوران دستیاب نہیں ہے۔\n جاری رکھنے کے لیے کار کے پارک ہونے تک انتظار کریں۔"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"ڈرائیونگ کے دوران آپ یہ خصوصیت استعمال نہیں کر سکتے ہیں"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"محفوظ اپپ کی خصوصیات کے ساتھ شروع کرنے کے لیے <xliff:g id="EXIT_BUTTON">%s</xliff:g> پر کلک کریں۔"</string>
     <string name="exit_button" msgid="5829638404777671253">"پیچھے"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"ایپ بند کریں"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"پیچھے"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"تشخیصی ڈیٹا پڑھیں"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"کار کے تشخیصی ڈیٹا کے بارے میں پڑھیں۔"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"تشخیصی ڈیٹا صاف کریں"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"کار کے پاور کی صورتحال تک رسائی حاصل کریں۔"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"بھروسہ مند آلات کا اندراج کریں"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"بھروسہ مند آلات کے اندراج کی اجازت دیں"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"کار کے ٹیسٹ وضع کو کنٹرول کریں"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"کار کے ٹیسٹ وضع کو کنٹرول کریں"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"میرا آلہ"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"مہمان"</string>
 </resources>
diff --git a/service/res/values-uz/strings.xml b/service/res/values-uz/strings.xml
index f6bfb87..80b2c71 100644
--- a/service/res/values-uz/strings.xml
+++ b/service/res/values-uz/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Matn kiritish hodisalari bilan ishlash imkoniyati"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN shinalarida xatolik yuz berdi"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN javob bermayapti. Konnektorni chiqaring va qayta ulang, keyin avtomobilni oʻt oldiring"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Avtomobil haydayotganingizda bu harakatni amalga oshira olmaysiz.\nUni bajarish uchun avtomobilni toʻxtating."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Avtomobilda harakatlanayotganda bu funksiyadan foydalanish imkonsiz"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Ilovani xavfsiz rejimda ishga tushirish uchun <xliff:g id="EXIT_BUTTON">%s</xliff:g> tugmasini bosing."</string>
     <string name="exit_button" msgid="5829638404777671253">"Orqaga"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Ilovani yopish"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Orqaga"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"diagnostika axborotini ochish"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Avtomobildan diagnostika axborotini olish."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"diagnostika axborotini tozalash"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Avtomobilning elektr quvvati haqidagi axborotga kirish"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Ishonchli qurilma registratsiyasi"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Ishonchli qurilma registratsiyasiga ruxsat berish"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Avtomobilning sinov rejimini boshqarish"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Avtomobilning sinov rejimini boshqarish"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Qurilmam"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Mehmon"</string>
 </resources>
diff --git a/service/res/values-vi/strings.xml b/service/res/values-vi/strings.xml
index 57be52a..0476a99 100644
--- a/service/res/values-vi/strings.xml
+++ b/service/res/values-vi/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Xử lý sự kiện nhập"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Đường dẫn chính CAN không hoạt động"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Đường dẫn chính CAN không phản hồi. Rút rồi cắm lại hộp bộ đầu và khởi động lại ô tô"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Vì lý do an toàn, bạn không sử dụng được hoạt động này trong khi lái xe.\nHãy đợi cho tới khi bạn đỗ xe để tiếp tục."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Bạn không thể dùng tính năng này khi đang lái xe"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Để bắt đầu lại với các tính năng an toàn của ứng dụng, hãy chọn <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Quay lại"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Tắt ứng dụng"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Quay lại"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"đọc dữ liệu chẩn đoán"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Đọc dữ liệu chẩn đoán từ ô tô."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"xóa dữ liệu chẩn đoán"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Truy cập vào trạng thái nguồn của ô tô."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Đăng ký thiết bị tin cậy"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Cho phép đăng ký thiết bị tin cậy"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Kiểm soát chế độ kiểm tra của ô tô"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Kiểm soát chế độ kiểm tra của ô tô"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Thiết bị của tôi"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Khách"</string>
 </resources>
diff --git a/service/res/values-zh-rCN/strings.xml b/service/res/values-zh-rCN/strings.xml
index b30acc4..9484694 100644
--- a/service/res/values-zh-rCN/strings.xml
+++ b/service/res/values-zh-rCN/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"处理输入事件"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"CAN 总线故障"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"CAN 总线没有响应。请将主机盒插头拔下并插回，然后重新启动汽车"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"为了确保您的安全，您无法在开车时执行这项活动。\n要继续，请先停车。"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"您不能在驾车时使用此功能"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"要重新开始使用安全的应用功能，请选择<xliff:g id="EXIT_BUTTON">%s</xliff:g>。"</string>
     <string name="exit_button" msgid="5829638404777671253">"返回"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"关闭应用"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"返回"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"读取诊断数据"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"读取汽车的诊断数据。"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"清除诊断数据"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"访问汽车的电源状态信息。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"注册可信设备"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"允许注册可信设备"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"控制汽车的测试模式"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"控制汽车的测试模式"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"我的设备"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"访客"</string>
 </resources>
diff --git a/service/res/values-zh-rHK/strings.xml b/service/res/values-zh-rHK/strings.xml
index e344bfb..98397b0 100644
--- a/service/res/values-zh-rHK/strings.xml
+++ b/service/res/values-zh-rHK/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"處理輸入活動"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"控制器區域網路操作失敗"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"控制器區域網路未有回覆。請拔除並重新插上汽車音響主機，然後重新啟動汽車"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"基於安全理由，駕駛時無法執行此操作。\n如要繼續，請留待泊車後操作。"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"您無法在駕駛時使用此功能"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"如要以安全應用程式功能重新啟動，請選擇 <xliff:g id="EXIT_BUTTON">%s</xliff:g>。"</string>
     <string name="exit_button" msgid="5829638404777671253">"返回"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"關閉應用程式"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"返回"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"讀取診斷資料"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"讀取來自汽車的診斷資料。"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"清除診斷資料"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"存取汽車的能源狀態。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"註冊信任的裝置"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"允許註冊信任的裝置"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"控制汽車的測試模式"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"控制汽車的測試模式"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"我的裝置"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"訪客"</string>
 </resources>
diff --git a/service/res/values-zh-rTW/strings.xml b/service/res/values-zh-rTW/strings.xml
index 1848811..62239ae 100644
--- a/service/res/values-zh-rTW/strings.xml
+++ b/service/res/values-zh-rTW/strings.xml
@@ -66,15 +66,17 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"處理輸入事件"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"控制器區域網路發生問題"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"控制器區域網路無回應。請將主機盒插頭拔下並插回，然後重新啟動車輛"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"為了你的安全，開車期間不得進行這個活動。\n如要繼續，請先停車。"</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"開車時無法使用這項功能"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"如要使用安全應用程式功能重新啟動，請選取「離開」按鈕 <xliff:g id="EXIT_BUTTON">%s</xliff:g>。"</string>
     <string name="exit_button" msgid="5829638404777671253">"返回"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"關閉應用程式"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"返回"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"讀取診斷資料"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"讀取車輛的診斷資料。"</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"清除診斷資料"</string>
     <string name="car_permission_desc_diag_clear" msgid="7453222114866042786">"清除車輛的診斷資料。"</string>
-    <string name="car_permission_label_vms_publisher" msgid="3049934078926106641">"VMS 發佈者"</string>
-    <string name="car_permission_desc_vms_publisher" msgid="5589489298597386828">"發佈 VMS 訊息"</string>
+    <string name="car_permission_label_vms_publisher" msgid="3049934078926106641">"VMS 發布者"</string>
+    <string name="car_permission_desc_vms_publisher" msgid="5589489298597386828">"發布 VMS 訊息"</string>
     <string name="car_permission_label_vms_subscriber" msgid="5648841182059222299">"VMS 訂閱者"</string>
     <string name="car_permission_desc_vms_subscriber" msgid="7551009457847673620">"訂閱 VMS 訊息"</string>
     <string name="car_permission_label_bind_vms_client" msgid="4889732900973280313">"VMS 用戶端服務"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"存取車輛的電源狀態。"</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"註冊信任的裝置"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"允許註冊信任的裝置"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"控制車輛的測試模式"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"控制車輛的測試模式"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"我的裝置"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"訪客"</string>
 </resources>
diff --git a/service/res/values-zu/strings.xml b/service/res/values-zu/strings.xml
index 7225857..515dc06 100644
--- a/service/res/values-zu/strings.xml
+++ b/service/res/values-zu/strings.xml
@@ -66,9 +66,11 @@
     <string name="car_permission_desc_bind_input_service" msgid="1670323419931890170">"Phatha imicimbi yokungena"</string>
     <string name="car_can_bus_failure" msgid="2334035748788283914">"Ibhasi ye-CAN yehlulekile"</string>
     <string name="car_can_bus_failure_desc" msgid="4125516222786484733">"Ibhasi ye-CAN ayiphenduli. Nqamula futhi uxhume ibhokisi le-headunit ukuze uqalise kabusha imoto"</string>
-    <string name="activity_blocked_text" msgid="5342114426610711378">"Ngokuphepha kwakho, lo msebenzi awutholakali uma ushayela.\nUkuze uqhubeke, linda uze umiswe."</string>
+    <string name="activity_blocked_text" msgid="8088902789540147995">"Awukwazi ukusebenzisa lesi sici ngenkathi ushayela"</string>
     <string name="exit_button_message" msgid="8554690915924055685">"Ukuze uqalise futhi ngezici zohlelo lokusebenza, khetha <xliff:g id="EXIT_BUTTON">%s</xliff:g>."</string>
     <string name="exit_button" msgid="5829638404777671253">"Emuva"</string>
+    <string name="exit_button_close_application" msgid="8824289547809332460">"Vala uhlelo lokusebenza"</string>
+    <string name="exit_button_go_back" msgid="3469083862100560326">"Emuva"</string>
     <string name="car_permission_label_diag_read" msgid="7248894224877702604">"funda idatha yokuxilonga"</string>
     <string name="car_permission_desc_diag_read" msgid="1121426363040966178">"Ukufunda idatha yokuxilonga kusuka emotweni."</string>
     <string name="car_permission_label_diag_clear" msgid="4783070510879698157">"sula idatha yokuxilonga"</string>
@@ -123,5 +125,8 @@
     <string name="car_permission_desc_car_power" msgid="9202079903668652864">"Finyelela amandla emoto."</string>
     <string name="car_permission_label_enroll_trust" msgid="3512907900486690218">"Bhalisa Amadivayisi Athenjwayo"</string>
     <string name="car_permission_desc_enroll_trust" msgid="4148649994602185130">"Vumela ukubhaliswa kwamadivayisi athenjwayo"</string>
+    <string name="car_permission_label_car_test_service" msgid="9159328930558208708">"Lawula imodi yokuhlola yemoto"</string>
+    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Lawula imodi yokuhlola yemoto"</string>
     <string name="trust_device_default_name" msgid="4213625926070261253">"Idivayisi yami"</string>
+    <string name="default_guest_name" msgid="2912812799433131476">"Isihambeli"</string>
 </resources>
diff --git a/service/res/values/attrs.xml b/service/res/values/attrs.xml
index eec51a8..e026cae 100644
--- a/service/res/values/attrs.xml
+++ b/service/res/values/attrs.xml
@@ -99,14 +99,11 @@
             <flag name="no_voice_transcription" value="256"/>
             <flag name="fully_restricted" value="511"/>
         </attr>
-        <!-- UX restrictions service supports returning different sets of UX restrictions for
-        the same driving state, through configurations for each "mode". -->
-        <attr name="mode">
-            <!-- Default mode. -->
-            <flag name="baseline" value="0"/>
-            <!-- Mode for passenger to interact with system. -->
-            <flag name="passenger" value="1"/>
-        </attr>
+        <!-- UX restrictions service supports returning different sets of UX restrictions for the
+             same driving state, through configurations for each "mode". These modes can be
+             specified by any string name, for example, "passenger". "baseline" is the default
+             value. -->
+        <attr name="mode" format="string"/>
     </declare-styleable>
 
     <!-- 2. Some of UX restrictions can be parametrized. -->
diff --git a/service/res/values/colors.xml b/service/res/values/colors.xml
index 6764116..109a4a4 100644
--- a/service/res/values/colors.xml
+++ b/service/res/values/colors.xml
@@ -18,18 +18,17 @@
 -->
 <resources>
     <!-- Semi-transparent background color of blocking activity. -->
-    <!-- In Call background scrim: grey 200 -->
-    <color name="activity_blocking_activity_background">#ffeeeeee</color>
+    <color name="activity_blocking_activity_background">#c7000000</color>
 
     <!-- Color of text in blocking activity. -->
-    <color name="blocking_text">#ff212121</color>
+    <color name="blocking_text">#ffffff</color>
 
     <!-- Background color of button. -->
-    <color name="button_background">#ff00796b</color>
+    <color name="action_button_background_color">@*android:color/car_grey_868</color>
 
     <!-- Color of button text. -->
-    <color name="button_text">#fffafafa</color>
+    <color name="button_text">#ffffffff</color>
 
     <!-- Ripple color of button background. -->
-    <color name="ripple_background">#3d000000</color>
+    <color name="ripple_background">@*android:color/car_card_ripple_background_dark</color>
 </resources>
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index dffe9b9..afd8555 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -20,6 +20,7 @@
 <!-- Resources to configure car service based on each OEM's preference. -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
     <!--  Configuration to enable usage of dynamic audio routing. If this is set to false,
           dynamic audio routing is disabled and audio works in legacy mode. It may be useful
           during initial development where audio hal does not support bus based addressing yet. -->
@@ -63,7 +64,7 @@
           The current implementations expects the following system packages/activities to be
           whitelisted. For general guidelines to design distraction optimized apps, please refer
           to Android Auto Driver Distraction Guidelines. -->
-    <string name="systemActivityWhitelist" translatable="false">com.android.systemui,com.google.android.permissioncontroller/com.android.packageinstaller.permission.ui.GrantPermissionsActivity,android/com.android.internal.app.ResolverActivity,com.android.mtp/com.android.mtp.ReceiverActivity</string>
+    <string name="systemActivityWhitelist" translatable="false">com.android.systemui,com.google.android.permissioncontroller/com.android.packageinstaller.permission.ui.GrantPermissionsActivity,com.android.permissioncontroller/com.android.packageinstaller.permission.ui.GrantPermissionsActivity,android/com.android.internal.app.ResolverActivity,com.android.mtp/com.android.mtp.ReceiverActivity,com.android.server.telecom/com.android.server.telecom.components.UserCallActivity</string>
     <!--  Comma separated list of activities that will be blocked during restricted state.
           Format of each entry is either to specify package name to whitelist the whole package
           or use format of "packagename/activity_classname" for tagging each activities.-->
@@ -73,6 +74,8 @@
     </string-array>
     <!-- Default home activity -->
     <string name="defaultHomeActivity" translatable="false"><!--com.your.package/com.your.package.Activity--></string>
+    <!-- The vendor-defined HAL property used to collect VMS client metrics. Disabled by default.-->
+    <integer name="vmsHalClientMetricsProperty">0</integer>
     <!--  The com.android.car.vms.VmsClientManager will bind to this list of clients running as system user -->
     <string-array translatable="false" name="vmsPublisherSystemClients">
     </string-array>
@@ -201,6 +204,11 @@
          created. -->
     <bool name="config_projectionAccessPointTethering" translatable="false">false</bool>
 
+    <!-- The package name of a service to be launched by CarService to bind to an active media
+         service on the current  user.
+         TODO(b/139497602): Remove dependency on Media Center, handle in CarMediaService -->
+    <string name="serviceMediaConnection" translatable="false">com.android.car.media</string>
+
     <!-- service/characteristics uuid for adding new escrow token -->
     <string name="enrollment_service_uuid" translatable="false">5e2a68a4-27be-43f9-8d1e-4546976fabd7</string>
     <string name="enrollment_server_write_uuid" translatable="false">5e2a68a5-27be-43f9-8d1e-4546976fabd7</string>
@@ -217,4 +225,33 @@
          There is no default bugreporting app.-->
     <string name="config_car_bugreport_application" translatable="false"></string>
 
+    <!-- Specifies notice UI that will be launched when user starts a car or do user
+         switching. It is recommended to use dialog with at least TYPE_APPLICATION_OVERLAY window
+         type to show the UI regardless of activity launches. Target package will be auto-granted
+         necessary permission for TYPE_APPLICATION_OVERLAY window type. The UI package should
+         resolve permission by itself to use any higher priority window type.
+         Setting this string to empty will disable the feature. -->
+    <string name="config_userNoticeUiService" translatable="false">com.google.android.car.kitchensink/.UserNoiticeDemoUiService</string>
+
+    <!-- Configuration to enable media center to autoplay when the media source is changed.
+         There are 3 supported configurations:
+         0 - never play on change
+         1 - always play
+         2 - retain per source, play based on last remembered playback state for the new source
+         3 - retain previous state, play based on previous source's playback state -->
+    <integer name="config_mediaSourceChangedAutoplay">2</integer>
+    <!-- Configuration to enable media center to autoplay on boot -->
+    <integer name="config_mediaBootAutoplay">2</integer>
+
+    <!-- Disable switching the user while the system is resuming from Suspend to RAM.
+         This default says to prevent changing the user during Resume. -->
+    <bool name="config_disableUserSwitchDuringResume" translatable="false">true</bool>
+
+    <!-- Class name of the custom country detector to be used. Override the default value in the
+         device specific config file.  -->
+    <string name="config_customCountryDetector" translatable="false">com.android.server.location.ComprehensiveCountryDetector</string>
+
+    <!-- Controls the use of bluetooth voice recognition when long pressing the voice assist
+         button. -->
+    <bool name="enableLongPressBluetoothVoiceRecognition" translatable="false">true</bool>
 </resources>
diff --git a/service/res/values/dimens.xml b/service/res/values/dimens.xml
index 23653db..1cf1308 100644
--- a/service/res/values/dimens.xml
+++ b/service/res/values/dimens.xml
@@ -18,15 +18,17 @@
 -->
 <resources>
     <!-- Text size in ActivityBlockingActivity. -->
-    <dimen name="blocking_text_size">32sp</dimen>
-    <!-- Widget margin. It should be half the height of button. -->
-    <dimen name="common_margin">28dp</dimen>
-    <!-- Minimum height of button in ActivityBlockingActivity. -->
-    <dimen name="button_min_height">56dp</dimen>
-    <!-- Minimum width of button in ActivityBlockingActivity. -->
-    <dimen name="button_min_width">156dp</dimen>
-    <!-- Padding of button in ActivityBlockingActivity. -->
-    <dimen name="button_padding">16dp</dimen>
-    <!-- Radius of button in ActivityBlockingActivity. -->
-    <dimen name="button_radius">4dp</dimen>
+    <dimen name="blocking_text_size">@*android:dimen/car_body1_size</dimen>
+    <dimen name="blocking_text_width">706dp</dimen>
+
+    <dimen name="common_margin">32dp</dimen>
+
+    <!-- Dimensions for the Buttons in ActivityBlockingActivity -->
+    <dimen name="action_button_height">76dp</dimen>
+    <dimen name="action_button_top_margin">48dp</dimen>
+    <dimen name="action_button_corner_radius">38dp</dimen>
+    <dimen name="action_button_max_width">268dp</dimen>
+    <dimen name="action_button_min_width">@*android:dimen/car_button_min_width</dimen>
+    <dimen name="action_button_text_size">@*android:dimen/car_body3_size</dimen>
+    <dimen name="action_button_padding_horizontal">@*android:dimen/car_padding_4</dimen>
 </resources>
diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index ad6149a..3884450 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -115,11 +115,15 @@
         box and restart the car</string>
 
     <!-- Blocking activity: Message to show to user when a feature of current application is not allowed. [CHAR LIMIT=120] -->
-    <string name="activity_blocked_text">For your safety, this activity isn\u2019t available while driving.\nTo continue, wait until you\u2019re parked.</string>
+    <string name="activity_blocked_text">You can\u2019t use this feature while driving</string>
     <!-- Blocking activity: Message to accompany the exit_button that restarts the blocked app. [CHAR LIMIT=120] -->
     <string name="exit_button_message">To start over with safe app features, select <xliff:g id="exit_button" example="Back">%s</xliff:g>.</string>
     <!-- Blocking activity: Text for button that restarts the current blocked application. [CHAR LIMIT=15] -->
     <string name="exit_button">Back</string>
+    <!-- Blocking activity: Text for button that closes current blocked application. [CHAR LIMIT=20] -->
+    <string name="exit_button_close_application">Close app</string>
+    <!-- Blocking activity: Text for button that closes current blocked application. [CHAR LIMIT=15] -->
+    <string name="exit_button_go_back">Back</string>
     <!-- Blocking activity: Text for button that shows debug info in non-user build. -->
     <string name="debug_button_text" translatable="false">Debug Info</string>
 
@@ -256,10 +260,18 @@
     <string name="car_permission_label_enroll_trust">Enroll Trusted Device</string>
     <string name="car_permission_desc_enroll_trust">Allow Trusted Device Enrollment</string>
 
+    <!-- Permission text: Control car's test mode [CHAR LIMIT=NONE] -->
+    <string name="car_permission_label_car_test_service">Control car\u2019s test mode</string>
+    <!-- Permission text: Control car's test mode [CHAR LIMIT=NONE] -->
+    <string name="car_permission_desc_car_test_service">Control car\u2019s test mode</string>
+
     <!-- The default name of device enrolled as trust device [CHAR LIMIT=NONE] -->
     <string name="trust_device_default_name">My Device</string>
 
-    <!-- The package name of the media application that will be selected as the default [CHAR LIMIT=NONE] -->
-    <string name="default_media_application" translatable="false">com.android.bluetooth</string>
+    <!-- The ComponentName of the media source that will be selected as the default [CHAR LIMIT=NONE] -->
+    <string name="default_media_source" translatable="false">com.android.bluetooth/com.android.bluetooth.avrcpcontroller.BluetoothMediaBrowserService</string>
+
+    <!-- Default name for new guest users [CHAR LIMIT=20] -->
+    <string name="default_guest_name">Guest</string>
 
 </resources>
diff --git a/service/res/values/styles.xml b/service/res/values/styles.xml
index 35b0b29..e9c8942 100644
--- a/service/res/values/styles.xml
+++ b/service/res/values/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 The Android Open Source Project
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,23 +15,31 @@
 <resources>
     <!-- TextAppearances for ActivityBlockingActivity. -->
     <style name="ActivityBlockingActivityText">
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">roboto-regular</item>
         <item name="android:textColor">@color/blocking_text</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textSize">@dimen/blocking_text_size</item>
     </style>
 
+    <!-- TextAppearances for Button Text in ActivityBlockingActivity. -->
+    <style name="ActionButtonText" parent="android:TextAppearance.DeviceDefault">
+        <item name="android:fontFamily">roboto-regular</item>
+        <item name="android:textColor">@color/blocking_text</item>
+        <item name="android:textSize">@*android:dimen/car_body3_size</item>
+    </style>
+
     <!-- Style for buttons in ActivityBlockingActivity. -->
     <style name="ButtonStyle">
-        <item name="android:background">@drawable/button_ripple_background</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:minHeight">@dimen/button_min_height</item>
-        <item name="android:minWidth">@dimen/button_min_width</item>
-        <item name="android:paddingHorizontal">@dimen/button_padding</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textAlignment">center</item>
-        <item name="android:textAppearance">@style/ActivityBlockingActivityText</item>
-        <item name="android:textColor">@color/button_text</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">@dimen/action_button_height</item>
+        <item name="android:minWidth">@dimen/action_button_min_width</item>
+        <item name="android:maxWidth">@dimen/action_button_max_width</item>
+        <item name="android:textAppearance">@style/ActionButtonText</item>
+        <item name="android:textColor">@color/blocking_text</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:background">@drawable/action_button_background</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingHorizontal">@dimen/action_button_padding_horizontal</item>
     </style>
 </resources>
 
diff --git a/service/src/com/android/car/BinderInterfaceContainer.java b/service/src/com/android/car/BinderInterfaceContainer.java
index a03b633..5d57b16 100644
--- a/service/src/com/android/car/BinderInterfaceContainer.java
+++ b/service/src/com/android/car/BinderInterfaceContainer.java
@@ -122,8 +122,10 @@
     public synchronized void clear() {
         Collection<BinderInterface<T>> interfaces = getInterfaces();
         for (BinderInterface<T> bInterface : interfaces) {
-            removeBinder(bInterface.binderInterface);
+            IBinder binder = bInterface.binderInterface.asBinder();
+            binder.unlinkToDeath(bInterface, 0);
         }
+        mBinders.clear();
     }
 
     private void handleBinderDeath(BinderInterface<T> bInterface) {
diff --git a/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java b/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java
index 4bb2790..c0f393a 100644
--- a/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java
+++ b/service/src/com/android/car/BluetoothDeviceConnectionPolicy.java
@@ -117,7 +117,7 @@
             }
         }
     }
-    private BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
+    private final BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
 
     /**
      * Create a new BluetoothDeviceConnectionPolicy object, responsible for encapsulating the
@@ -153,6 +153,7 @@
         mUserId = userId;
         mContext = Objects.requireNonNull(context);
         mCarBluetoothService = bluetoothService;
+        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
         mBluetoothAdapter = Objects.requireNonNull(BluetoothAdapter.getDefaultAdapter());
     }
 
@@ -160,9 +161,8 @@
      * Setup the Bluetooth profile service connections and Vehicle Event listeners.
      * and start the state machine -{@link BluetoothAutoConnectStateMachine}
      */
-    public synchronized void init() {
+    public void init() {
         logd("init()");
-        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
         IntentFilter profileFilter = new IntentFilter();
         profileFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         mContext.registerReceiverAsUser(mBluetoothBroadcastReceiver, UserHandle.CURRENT,
@@ -190,7 +190,7 @@
      * Clean up slate. Close the Bluetooth profile service connections and quit the state machine -
      * {@link BluetoothAutoConnectStateMachine}
      */
-    public synchronized void release() {
+    public void release() {
         logd("release()");
         if (mCarPowerManager != null) {
             mCarPowerManager.clearListener();
@@ -198,7 +198,6 @@
         }
         if (mBluetoothBroadcastReceiver != null) {
             mContext.unregisterReceiver(mBluetoothBroadcastReceiver);
-            mBluetoothBroadcastReceiver = null;
         }
     }
 
@@ -250,7 +249,7 @@
     /**
      * Print the verbose status of the object
      */
-    public synchronized void dump(PrintWriter writer, String indent) {
+    public void dump(PrintWriter writer, String indent) {
         writer.println(indent + TAG + ":");
         writer.println(indent + "\tUserId: " + mUserId);
     }
diff --git a/service/src/com/android/car/BluetoothProfileDeviceManager.java b/service/src/com/android/car/BluetoothProfileDeviceManager.java
index 505a05b..e73d9ea 100644
--- a/service/src/com/android/car/BluetoothProfileDeviceManager.java
+++ b/service/src/com/android/car/BluetoothProfileDeviceManager.java
@@ -46,6 +46,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.internal.annotations.GuardedBy;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -114,23 +116,30 @@
                         }, new int[] {}));
     }
 
+    // Fixed per-profile information for the profile this object manages
     private final int mProfileId;
     private final String mSettingsKey;
     private final String mProfileConnectionAction;
     private final ParcelUuid[] mProfileUuids;
     private final int[] mProfileTriggers;
+
+    // Central priority list of devices
+    private final Object mPrioritizedDevicesLock = new Object();
+    @GuardedBy("mPrioritizedDevicesLock")
     private ArrayList<BluetoothDevice> mPrioritizedDevices;
 
-    private BluetoothAdapter mBluetoothAdapter;
-    private BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
-
-    private ICarBluetoothUserService mBluetoothUserProxies;
-
+    // Auto connection process state
     private final Object mAutoConnectLock = new Object();
+    @GuardedBy("mAutoConnectLock")
     private boolean mConnecting = false;
+    @GuardedBy("mAutoConnectLock")
     private int mAutoConnectPriority;
+    @GuardedBy("mAutoConnectLock")
     private ArrayList<BluetoothDevice> mAutoConnectingDevices;
 
+    private final BluetoothAdapter mBluetoothAdapter;
+    private final BluetoothBroadcastReceiver mBluetoothBroadcastReceiver;
+    private final ICarBluetoothUserService mBluetoothUserProxies;
     private final Handler mHandler = new Handler(Looper.getMainLooper());
 
     /**
@@ -313,6 +322,7 @@
         mProfileUuids = bpi.mUuids;
         mProfileTriggers = bpi.mProfileTriggers;
 
+        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
         mBluetoothAdapter = Objects.requireNonNull(BluetoothAdapter.getDefaultAdapter());
     }
 
@@ -327,7 +337,7 @@
             mAutoConnectPriority = -1;
             mAutoConnectingDevices = null;
         }
-        mBluetoothBroadcastReceiver = new BluetoothBroadcastReceiver();
+
         IntentFilter profileFilter = new IntentFilter();
         profileFilter.addAction(mProfileConnectionAction);
         profileFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
@@ -347,7 +357,6 @@
             if (mContext != null) {
                 mContext.unregisterReceiver(mBluetoothBroadcastReceiver);
             }
-            mBluetoothBroadcastReceiver = null;
         }
         cancelAutoConnecting();
         commit();
@@ -392,7 +401,7 @@
             }
         }
 
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             mPrioritizedDevices = devices;
         }
 
@@ -408,7 +417,7 @@
     private boolean commit() {
         StringBuilder sb = new StringBuilder();
         String delimiter = "";
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             for (BluetoothDevice device : mPrioritizedDevices) {
                 sb.append(delimiter);
                 sb.append(device.getAddress());
@@ -434,7 +443,7 @@
             addDevice(device); // No-op if device is already in the priority list
         }
 
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             ArrayList<BluetoothDevice> devices = getDeviceListSnapshot();
             for (BluetoothDevice device : devices) {
                 if (!bondedDevices.contains(device)) {
@@ -451,7 +460,7 @@
      */
     public ArrayList<BluetoothDevice> getDeviceListSnapshot() {
         ArrayList<BluetoothDevice> devices = new ArrayList<>();
-        synchronized (this) {
+        synchronized (mPrioritizedDevicesLock) {
             devices = (ArrayList) mPrioritizedDevices.clone();
         }
         return devices;
@@ -462,12 +471,14 @@
      *
      * @param device - The device you wish to add
      */
-    public synchronized void addDevice(BluetoothDevice device) {
+    public void addDevice(BluetoothDevice device) {
         if (device == null) return;
-        if (mPrioritizedDevices.contains(device)) return;
-        logd("Add device " + device);
-        mPrioritizedDevices.add(device);
-        commit();
+        synchronized (mPrioritizedDevicesLock) {
+            if (mPrioritizedDevices.contains(device)) return;
+            logd("Add device " + device);
+            mPrioritizedDevices.add(device);
+            commit();
+        }
     }
 
     /**
@@ -475,12 +486,14 @@
      *
      * @param device - The device you wish to remove
      */
-    public synchronized void removeDevice(BluetoothDevice device) {
+    public void removeDevice(BluetoothDevice device) {
         if (device == null) return;
-        if (!mPrioritizedDevices.contains(device)) return;
-        logd("Remove device " + device);
-        mPrioritizedDevices.remove(device);
-        commit();
+        synchronized (mPrioritizedDevicesLock) {
+            if (!mPrioritizedDevices.contains(device)) return;
+            logd("Remove device " + device);
+            mPrioritizedDevices.remove(device);
+            commit();
+        }
     }
 
     /**
@@ -489,10 +502,12 @@
      * @param device - The device you want the priority of
      * @return The priority of the device, or -1 if the device is not in the list
      */
-    public synchronized int getDeviceConnectionPriority(BluetoothDevice device) {
+    public int getDeviceConnectionPriority(BluetoothDevice device) {
         if (device == null) return -1;
         logd("Get connection priority of " + device);
-        return mPrioritizedDevices.indexOf(device);
+        synchronized (mPrioritizedDevicesLock) {
+            return mPrioritizedDevices.indexOf(device);
+        }
     }
 
     /**
@@ -505,16 +520,18 @@
      * @param device - The device you want to set the priority of
      * @param priority - The priority you want to the device to have
      */
-    public synchronized void setDeviceConnectionPriority(BluetoothDevice device, int priority) {
-        if (device == null || priority < 0 || priority > mPrioritizedDevices.size()
-                || getDeviceConnectionPriority(device) == priority) return;
-        if (mPrioritizedDevices.contains(device)) {
-            mPrioritizedDevices.remove(device);
-            if (priority > mPrioritizedDevices.size()) priority = mPrioritizedDevices.size();
+    public void setDeviceConnectionPriority(BluetoothDevice device, int priority) {
+        synchronized (mPrioritizedDevicesLock) {
+            if (device == null || priority < 0 || priority > mPrioritizedDevices.size()
+                    || getDeviceConnectionPriority(device) == priority) return;
+            if (mPrioritizedDevices.contains(device)) {
+                mPrioritizedDevices.remove(device);
+                if (priority > mPrioritizedDevices.size()) priority = mPrioritizedDevices.size();
+            }
+            logd("Set connection priority of " + device + " to " + priority);
+            mPrioritizedDevices.add(priority, device);
+            commit();
         }
-        logd("Set connection priority of " + device + " to " + priority);
-        mPrioritizedDevices.add(priority, device);
-        commit();
     }
 
     /**
diff --git a/service/src/com/android/car/BluetoothProfileInhibitManager.java b/service/src/com/android/car/BluetoothProfileInhibitManager.java
index 4dcc6b7..691592f 100644
--- a/service/src/com/android/car/BluetoothProfileInhibitManager.java
+++ b/service/src/com/android/car/BluetoothProfileInhibitManager.java
@@ -56,14 +56,16 @@
     private final int mUserId;
     private final ICarBluetoothUserService mBluetoothUserProxies;
 
-    @GuardedBy("this")
+    private final Object mProfileInhibitsLock = new Object();
+
+    @GuardedBy("mProfileInhibitsLock")
     private final SetMultimap<BluetoothConnection, InhibitRecord> mProfileInhibits =
             new SetMultimap<>();
 
-    @GuardedBy("this")
+    @GuardedBy("mProfileInhibitsLock")
     private final HashSet<InhibitRecord> mRestoredInhibits = new HashSet<>();
 
-    @GuardedBy("this")
+    @GuardedBy("mProfileInhibitsLock")
     private final HashSet<BluetoothConnection> mAlreadyDisabledProfiles = new HashSet<>();
 
     private final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -190,7 +192,7 @@
         }
 
         public boolean removeSelf() {
-            synchronized (BluetoothProfileInhibitManager.this) {
+            synchronized (mProfileInhibitsLock) {
                 if (mRemoved) {
                     return true;
                 }
@@ -328,9 +330,7 @@
 
         BluetoothConnection params = new BluetoothConnection(profile, device);
         InhibitRecord record;
-        synchronized (this) {
-            record = findInhibitRecord(params, token);
-        }
+        record = findInhibitRecord(params, token);
 
         if (record == null) {
             Log.e(TAG, "Record not found");
@@ -343,64 +343,66 @@
     /**
      * Add a profile inhibit record, disabling the profile if necessary.
      */
-    private synchronized boolean addInhibitRecord(InhibitRecord record) {
-        BluetoothConnection params = record.getParams();
-        if (!isProxyAvailable(params.getProfile())) {
-            return false;
-        }
-
-        Set<InhibitRecord> previousRecords = mProfileInhibits.get(params);
-        if (findInhibitRecord(params, record.getToken()) != null) {
-            Log.e(TAG, "Inhibit request already registered - skipping duplicate");
-            return false;
-        }
-
-        try {
-            record.getToken().linkToDeath(record, 0);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Could not link to death on inhibit token (already dead?)", e);
-            return false;
-        }
-
-        boolean isNewlyAdded = previousRecords.isEmpty();
-        mProfileInhibits.put(params, record);
-
-        if (isNewlyAdded) {
-            try {
-                int priority =
-                        mBluetoothUserProxies.getProfilePriority(
-                                params.getProfile(),
-                                params.getDevice());
-                if (priority == BluetoothProfile.PRIORITY_OFF) {
-                    // This profile was already disabled (and not as the result of an inhibit).
-                    // Add it to the already-disabled list, and do nothing else.
-                    mAlreadyDisabledProfiles.add(params);
-
-                    logd("Profile " + Utils.getProfileName(params.getProfile())
-                            + " already disabled for device " + params.getDevice()
-                            + " - suppressing re-enable");
-                } else {
-                    mBluetoothUserProxies.setProfilePriority(
-                            params.getProfile(),
-                            params.getDevice(),
-                            BluetoothProfile.PRIORITY_OFF);
-                    mBluetoothUserProxies.bluetoothDisconnectFromProfile(
-                            params.getProfile(),
-                            params.getDevice());
-                    logd("Disabled profile "
-                            + Utils.getProfileName(params.getProfile())
-                            + " for device " + params.getDevice());
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "Could not disable profile", e);
-                record.getToken().unlinkToDeath(record, 0);
-                mProfileInhibits.remove(params, record);
+    private boolean addInhibitRecord(InhibitRecord record) {
+        synchronized (mProfileInhibitsLock) {
+            BluetoothConnection params = record.getParams();
+            if (!isProxyAvailable(params.getProfile())) {
                 return false;
             }
-        }
 
-        commit();
-        return true;
+            Set<InhibitRecord> previousRecords = mProfileInhibits.get(params);
+            if (findInhibitRecord(params, record.getToken()) != null) {
+                Log.e(TAG, "Inhibit request already registered - skipping duplicate");
+                return false;
+            }
+
+            try {
+                record.getToken().linkToDeath(record, 0);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Could not link to death on inhibit token (already dead?)", e);
+                return false;
+            }
+
+            boolean isNewlyAdded = previousRecords.isEmpty();
+            mProfileInhibits.put(params, record);
+
+            if (isNewlyAdded) {
+                try {
+                    int priority =
+                            mBluetoothUserProxies.getProfilePriority(
+                                    params.getProfile(),
+                                    params.getDevice());
+                    if (priority == BluetoothProfile.PRIORITY_OFF) {
+                        // This profile was already disabled (and not as the result of an inhibit).
+                        // Add it to the already-disabled list, and do nothing else.
+                        mAlreadyDisabledProfiles.add(params);
+
+                        logd("Profile " + Utils.getProfileName(params.getProfile())
+                                + " already disabled for device " + params.getDevice()
+                                + " - suppressing re-enable");
+                    } else {
+                        mBluetoothUserProxies.setProfilePriority(
+                                params.getProfile(),
+                                params.getDevice(),
+                                BluetoothProfile.PRIORITY_OFF);
+                        mBluetoothUserProxies.bluetoothDisconnectFromProfile(
+                                params.getProfile(),
+                                params.getDevice());
+                        logd("Disabled profile "
+                                + Utils.getProfileName(params.getProfile())
+                                + " for device " + params.getDevice());
+                    }
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Could not disable profile", e);
+                    record.getToken().unlinkToDeath(record, 0);
+                    mProfileInhibits.remove(params, record);
+                    return false;
+                }
+            }
+
+            commit();
+            return true;
+        }
     }
 
     /**
@@ -411,41 +413,45 @@
      * @return InhibitRecord for the connection parameters and token if exists, null otherwise.
      */
     private InhibitRecord findInhibitRecord(BluetoothConnection params, IBinder token) {
-        return mProfileInhibits.get(params)
-            .stream()
-            .filter(r -> r.getToken() == token)
-            .findAny()
-            .orElse(null);
+        synchronized (mProfileInhibitsLock) {
+            return mProfileInhibits.get(params)
+                .stream()
+                .filter(r -> r.getToken() == token)
+                .findAny()
+                .orElse(null);
+        }
     }
 
     /**
      * Remove a given profile inhibit record, reconnecting if necessary.
      */
-    private synchronized boolean removeInhibitRecord(InhibitRecord record) {
-        BluetoothConnection params = record.getParams();
-        if (!isProxyAvailable(params.getProfile())) {
-            return false;
-        }
-        if (!mProfileInhibits.containsEntry(params, record)) {
-            Log.e(TAG, "Record already removed");
-            // Removing something a second time vacuously succeeds.
-            return true;
-        }
-
-        // Re-enable profile before unlinking and removing the record, in case of error.
-        // The profile should be re-enabled if this record is the only one left for that
-        // device and profile combination.
-        if (mProfileInhibits.get(params).size() == 1) {
-            if (!restoreProfilePriority(params)) {
+    private boolean removeInhibitRecord(InhibitRecord record) {
+        synchronized (mProfileInhibitsLock) {
+            BluetoothConnection params = record.getParams();
+            if (!isProxyAvailable(params.getProfile())) {
                 return false;
             }
+            if (!mProfileInhibits.containsEntry(params, record)) {
+                Log.e(TAG, "Record already removed");
+                // Removing something a second time vacuously succeeds.
+                return true;
+            }
+
+            // Re-enable profile before unlinking and removing the record, in case of error.
+            // The profile should be re-enabled if this record is the only one left for that
+            // device and profile combination.
+            if (mProfileInhibits.get(params).size() == 1) {
+                if (!restoreProfilePriority(params)) {
+                    return false;
+                }
+            }
+
+            record.getToken().unlinkToDeath(record, 0);
+            mProfileInhibits.remove(params, record);
+
+            commit();
+            return true;
         }
-
-        record.getToken().unlinkToDeath(record, 0);
-        mProfileInhibits.remove(params, record);
-
-        commit();
-        return true;
     }
 
     /**
@@ -504,46 +510,51 @@
      * Keep trying to remove all profile inhibits that were restored from settings
      * until all such inhibits have been removed.
      */
-    private synchronized void removeRestoredProfileInhibits() {
-        tryRemoveRestoredProfileInhibits();
+    private void removeRestoredProfileInhibits() {
+        synchronized (mProfileInhibitsLock) {
+            tryRemoveRestoredProfileInhibits();
 
-        if (!mRestoredInhibits.isEmpty()) {
-            logd("Could not remove all restored profile inhibits - "
-                        + "trying again in " + RESTORE_BACKOFF_MILLIS + "ms");
-            mHandler.postDelayed(
-                    this::removeRestoredProfileInhibits,
-                    RESTORED_PROFILE_INHIBIT_TOKEN,
-                    RESTORE_BACKOFF_MILLIS);
+            if (!mRestoredInhibits.isEmpty()) {
+                logd("Could not remove all restored profile inhibits - "
+                            + "trying again in " + RESTORE_BACKOFF_MILLIS + "ms");
+                mHandler.postDelayed(
+                        this::removeRestoredProfileInhibits,
+                        RESTORED_PROFILE_INHIBIT_TOKEN,
+                        RESTORE_BACKOFF_MILLIS);
+            }
         }
     }
 
     /**
      * Release all active inhibit records prior to user switch or shutdown
      */
-    private synchronized void releaseAllInhibitsBeforeUnbind() {
+    private  void releaseAllInhibitsBeforeUnbind() {
         logd("Unbinding CarBluetoothUserService - releasing all profile inhibits");
-        for (BluetoothConnection params : mProfileInhibits.keySet()) {
-            for (InhibitRecord record : mProfileInhibits.get(params)) {
-                record.removeSelf();
+
+        synchronized (mProfileInhibitsLock) {
+            for (BluetoothConnection params : mProfileInhibits.keySet()) {
+                for (InhibitRecord record : mProfileInhibits.get(params)) {
+                    record.removeSelf();
+                }
             }
+
+            // Some inhibits might be hanging around because they couldn't be cleaned up.
+            // Make sure they get persisted...
+            commit();
+
+            // ...then clear them from the map.
+            mProfileInhibits.clear();
+
+            // We don't need to maintain previously-disabled profiles any more - they were already
+            // skipped in saveProfileInhibitsToSettings() above, and they don't need any
+            // further handling when the user resumes.
+            mAlreadyDisabledProfiles.clear();
+
+            // Clean up bookkeeping for restored inhibits. (If any are still around, they'll be
+            // restored again when this user restarts.)
+            mHandler.removeCallbacksAndMessages(RESTORED_PROFILE_INHIBIT_TOKEN);
+            mRestoredInhibits.clear();
         }
-
-        // Some inhibits might be hanging around because they couldn't be cleaned up.
-        // Make sure they get persisted...
-        commit();
-
-        // ...then clear them from the map.
-        mProfileInhibits.clear();
-
-        // We don't need to maintain previously-disabled profiles any more - they were already
-        // skipped in saveProfileInhibitsToSettings() above, and they don't need any
-        // further handling when the user resumes.
-        mAlreadyDisabledProfiles.clear();
-
-        // Clean up bookkeeping for restored inhibits. (If any are still around, they'll be
-        // restored again when this user restarts.)
-        mHandler.removeCallbacksAndMessages(RESTORED_PROFILE_INHIBIT_TOKEN);
-        mRestoredInhibits.clear();
     }
 
     /**
@@ -564,7 +575,7 @@
     /**
      * Print the verbose status of the object
      */
-    public synchronized void dump(PrintWriter writer, String indent) {
+    public void dump(PrintWriter writer, String indent) {
         writer.println(indent + TAG + ":");
 
         // User metadata
@@ -572,7 +583,7 @@
 
         // Current inhibits
         String inhibits;
-        synchronized (this) {
+        synchronized (mProfileInhibitsLock) {
             inhibits = mProfileInhibits.keySet().toString();
         }
         writer.println(indent + "\tInhibited profiles: " + inhibits);
diff --git a/service/src/com/android/car/CarBluetoothService.java b/service/src/com/android/car/CarBluetoothService.java
index 0c992e1..92f79ed 100644
--- a/service/src/com/android/car/CarBluetoothService.java
+++ b/service/src/com/android/car/CarBluetoothService.java
@@ -28,6 +28,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.internal.annotations.GuardedBy;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -63,20 +65,31 @@
             BluetoothProfile.PAN
     );
 
+    // Each time PerUserCarService connects we need to get new Bluetooth profile proxies and refresh
+    // all our internal objects to use them. When it disconnects we're to assume our proxies are
+    // invalid. This lock protects all our internal objects.
+    private final Object mPerUserLock = new Object();
+
     // Set of Bluetooth Profile Device Managers, own the priority connection lists, updated on user
     // switch
-    private SparseArray<BluetoothProfileDeviceManager> mProfileDeviceManagers = new SparseArray<>();
+    private final SparseArray<BluetoothProfileDeviceManager> mProfileDeviceManagers =
+            new SparseArray<>();
 
     // Profile-Inhibit Manager that will temporarily inhibit connections on profiles, per user
+    @GuardedBy("mPerUserLock")
     private BluetoothProfileInhibitManager mInhibitManager = null;
 
     // Default Bluetooth device connection policy, per user, enabled with an overlay
     private final boolean mUseDefaultPolicy;
+    @GuardedBy("mPerUserLock")
     private BluetoothDeviceConnectionPolicy mBluetoothDeviceConnectionPolicy = null;
 
     // Listen for user switch events from the PerUserCarService
+    @GuardedBy("mPerUserLock")
     private int mUserId;
+    @GuardedBy("mPerUserLock")
     private ICarUserService mCarUserService;
+    @GuardedBy("mPerUserLock")
     private ICarBluetoothUserService mCarBluetoothUserService;
     private final PerUserCarServiceHelper mUserServiceHelper;
     private final PerUserCarServiceHelper.ServiceCallback mUserServiceCallback =
@@ -84,8 +97,14 @@
         @Override
         public void onServiceConnected(ICarUserService carUserService) {
             logd("Connected to PerUserCarService");
-            synchronized (this) {
+            synchronized (mPerUserLock) {
+                // Explicitly clear out existing per-user objects since we can't rely on the
+                // onServiceDisconnected and onPreUnbind calls to always be called before this
+                destroyUser();
+
                 mCarUserService = carUserService;
+
+                // Create new objects with our new set of profile proxies
                 initializeUser();
             }
         }
@@ -99,9 +118,7 @@
         @Override
         public void onServiceDisconnected() {
             logd("Disconnected from PerUserCarService");
-            synchronized (this) {
-                mCarUserService = null;
-            }
+            destroyUser();
         }
     };
 
@@ -126,7 +143,7 @@
      * Wait for the user service helper to report a user before initializing a user.
      */
     @Override
-    public synchronized void init() {
+    public void init() {
         logd("init()");
         mUserServiceHelper.registerServiceCallback(mUserServiceCallback);
     }
@@ -137,11 +154,10 @@
      * Clean up the user context once we've detached from the user service helper, if any.
      */
     @Override
-    public synchronized void release() {
+    public void release() {
         logd("release()");
         mUserServiceHelper.unregisterServiceCallback(mUserServiceCallback);
         destroyUser();
-        mCarUserService = null;
     }
 
     /**
@@ -158,32 +174,37 @@
      *
      * Only call this following a known user switch once we've connected to the user service helper.
      */
-    private synchronized void initializeUser() {
+    private void initializeUser() {
         logd("Initializing new user");
-        mUserId = ActivityManager.getCurrentUser();
-        createBluetoothUserService();
-        createBluetoothProfileDeviceManagers();
-        createBluetoothProfileInhibitManager();
+        synchronized (mPerUserLock) {
+            mUserId = ActivityManager.getCurrentUser();
+            createBluetoothUserService();
+            createBluetoothProfileDeviceManagers();
+            createBluetoothProfileInhibitManager();
 
-        // Determine if we need to begin the default policy
-        mBluetoothDeviceConnectionPolicy = null;
-        if (mUseDefaultPolicy) {
-            createBluetoothDeviceConnectionPolicy();
+            // Determine if we need to begin the default policy
+            mBluetoothDeviceConnectionPolicy = null;
+            if (mUseDefaultPolicy) {
+                createBluetoothDeviceConnectionPolicy();
+            }
+            logd("Switched to user " + mUserId);
         }
-        logd("Switched to user " + mUserId);
     }
 
     /**
      * Destroy the current user context, defined by the set of profile proxies, profile device
      * managers, inhibit manager and the policy.
      */
-    private synchronized void destroyUser() {
+    private void destroyUser() {
         logd("Destroying user " + mUserId);
-        destroyBluetoothDeviceConnectionPolicy();
-        destroyBluetoothProfileInhibitManager();
-        destroyBluetoothProfileDeviceManagers();
-        destroyBluetoothUserService();
-        mUserId = -1;
+        synchronized (mPerUserLock) {
+            destroyBluetoothDeviceConnectionPolicy();
+            destroyBluetoothProfileInhibitManager();
+            destroyBluetoothProfileDeviceManagers();
+            destroyBluetoothUserService();
+            mCarUserService = null;
+            mUserId = -1;
+        }
     }
 
     /**
@@ -192,17 +213,19 @@
      * Also sets up the connection proxy objects required to communicate with the Bluetooth
      * Profile Services.
      */
-    private synchronized void createBluetoothUserService() {
-        if (mCarUserService != null) {
-            try {
-                mCarBluetoothUserService = mCarUserService.getBluetoothUserService();
-                mCarBluetoothUserService.setupBluetoothConnectionProxies();
-            } catch (RemoteException e) {
-                Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
-                        + e.getMessage());
+    private void createBluetoothUserService() {
+        synchronized (mPerUserLock) {
+            if (mCarUserService != null) {
+                try {
+                    mCarBluetoothUserService = mCarUserService.getBluetoothUserService();
+                    mCarBluetoothUserService.setupBluetoothConnectionProxies();
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
+                            + e.getMessage());
+                } catch (java.lang.NullPointerException e) {
+                    Log.e(TAG, "Initialization Failed: " + e.getMessage());
+                }
             }
-        } else {
-            logd("PerUserCarService not connected. Cannot get bluetooth user proxy objects");
         }
     }
 
@@ -210,109 +233,130 @@
      * Close out the Per User Car Bluetooth profile proxy connections and destroys the Car Bluetooth
      * User Service object.
      */
-    private synchronized void destroyBluetoothUserService() {
-        if (mCarBluetoothUserService == null) return;
-        try {
-            mCarBluetoothUserService.closeBluetoothConnectionProxies();
-        } catch (RemoteException e) {
-            Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
-                    + e.getMessage());
+    private void destroyBluetoothUserService() {
+        synchronized (mPerUserLock) {
+            if (mCarBluetoothUserService == null) return;
+            try {
+                mCarBluetoothUserService.closeBluetoothConnectionProxies();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: "
+                        + e.getMessage());
+            }
+            mCarBluetoothUserService = null;
         }
-        mCarBluetoothUserService = null;
     }
 
     /**
      * Clears out Profile Device Managers and re-creates them for the current user.
      */
-    private synchronized void createBluetoothProfileDeviceManagers() {
-        mProfileDeviceManagers.clear();
-        if (mUserId == -1) {
-            logd("No foreground user, cannot create profile device managers");
-            return;
-        }
-        for (int profileId : sManagedProfiles) {
-            BluetoothProfileDeviceManager deviceManager = BluetoothProfileDeviceManager.create(
-                    mContext, mUserId, mCarBluetoothUserService, profileId);
-            if (deviceManager == null) {
-                logd("Failed to create profile device manager for "
-                        + Utils.getProfileName(profileId));
-                continue;
+    private void createBluetoothProfileDeviceManagers() {
+        synchronized (mPerUserLock) {
+            if (mUserId == -1) {
+                logd("No foreground user, cannot create profile device managers");
+                return;
             }
-            mProfileDeviceManagers.put(profileId, deviceManager);
-            logd("Created profile device manager for " + Utils.getProfileName(profileId));
-        }
+            for (int profileId : sManagedProfiles) {
+                BluetoothProfileDeviceManager deviceManager = mProfileDeviceManagers.get(profileId);
+                if (deviceManager != null) {
+                    deviceManager.stop();
+                    mProfileDeviceManagers.remove(profileId);
+                    logd("Existing device manager removed for profile "
+                            + Utils.getProfileName(profileId));
+                }
 
-        for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
-            int key = mProfileDeviceManagers.keyAt(i);
-            BluetoothProfileDeviceManager deviceManager =
-                    (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
-            deviceManager.start();
+                deviceManager = BluetoothProfileDeviceManager.create(mContext, mUserId,
+                        mCarBluetoothUserService, profileId);
+                if (deviceManager == null) {
+                    logd("Failed to create profile device manager for "
+                            + Utils.getProfileName(profileId));
+                    continue;
+                }
+                mProfileDeviceManagers.put(profileId, deviceManager);
+                logd("Created profile device manager for " + Utils.getProfileName(profileId));
+            }
+
+            for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
+                int key = mProfileDeviceManagers.keyAt(i);
+                BluetoothProfileDeviceManager deviceManager =
+                        (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
+                deviceManager.start();
+            }
         }
     }
 
     /**
      * Stops and clears the entire set of Profile Device Managers.
      */
-    private synchronized void destroyBluetoothProfileDeviceManagers() {
-        for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
-            int key = mProfileDeviceManagers.keyAt(i);
-            BluetoothProfileDeviceManager deviceManager =
-                    (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
-            deviceManager.stop();
+    private void destroyBluetoothProfileDeviceManagers() {
+        synchronized (mPerUserLock) {
+            for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
+                int key = mProfileDeviceManagers.keyAt(i);
+                BluetoothProfileDeviceManager deviceManager =
+                        (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
+                deviceManager.stop();
+            }
+            mProfileDeviceManagers.clear();
         }
-        mProfileDeviceManagers.clear();
     }
 
     /**
      * Creates an instance of a BluetoothProfileInhibitManager under the current user
      */
-    private synchronized void createBluetoothProfileInhibitManager() {
+    private void createBluetoothProfileInhibitManager() {
         logd("Creating inhibit manager");
-        if (mUserId == -1) {
-            logd("No foreground user, cannot create profile inhibit manager");
-            return;
+        synchronized (mPerUserLock) {
+            if (mUserId == -1) {
+                logd("No foreground user, cannot create profile inhibit manager");
+                return;
+            }
+            mInhibitManager = new BluetoothProfileInhibitManager(mContext, mUserId,
+                    mCarBluetoothUserService);
+            mInhibitManager.start();
         }
-        mInhibitManager = new BluetoothProfileInhibitManager(mContext, mUserId,
-                mCarBluetoothUserService);
-        mInhibitManager.start();
     }
 
     /**
      * Destroys the current instance of a BluetoothProfileInhibitManager, if one exists
      */
-    private synchronized void destroyBluetoothProfileInhibitManager() {
+    private void destroyBluetoothProfileInhibitManager() {
         logd("Destroying inhibit manager");
-        if (mInhibitManager == null) return;
-        mInhibitManager.stop();
-        mInhibitManager = null;
+        synchronized (mPerUserLock) {
+            if (mInhibitManager == null) return;
+            mInhibitManager.stop();
+            mInhibitManager = null;
+        }
     }
 
     /**
      * Creates an instance of a BluetoothDeviceConnectionPolicy under the current user
      */
-    private synchronized void createBluetoothDeviceConnectionPolicy() {
+    private void createBluetoothDeviceConnectionPolicy() {
         logd("Creating device connection policy");
-        if (mUserId == -1) {
-            logd("No foreground user, cannot create device connection policy");
-            return;
+        synchronized (mPerUserLock) {
+            if (mUserId == -1) {
+                logd("No foreground user, cannot create device connection policy");
+                return;
+            }
+            mBluetoothDeviceConnectionPolicy = BluetoothDeviceConnectionPolicy.create(mContext,
+                    mUserId, this);
+            if (mBluetoothDeviceConnectionPolicy == null) {
+                logd("Failed to create default Bluetooth device connection policy.");
+                return;
+            }
+            mBluetoothDeviceConnectionPolicy.init();
         }
-        mBluetoothDeviceConnectionPolicy = BluetoothDeviceConnectionPolicy.create(mContext, mUserId,
-                this);
-        if (mBluetoothDeviceConnectionPolicy == null) {
-            logd("Failed to create default Bluetooth device connection policy.");
-            return;
-        }
-        mBluetoothDeviceConnectionPolicy.init();
     }
 
     /**
      * Destroys the current instance of a BluetoothDeviceConnectionPolicy, if one exists
      */
-    private synchronized void destroyBluetoothDeviceConnectionPolicy() {
+    private void destroyBluetoothDeviceConnectionPolicy() {
         logd("Destroying device connection policy");
-        if (mBluetoothDeviceConnectionPolicy != null) {
-            mBluetoothDeviceConnectionPolicy.release();
-            mBluetoothDeviceConnectionPolicy = null;
+        synchronized (mPerUserLock) {
+            if (mBluetoothDeviceConnectionPolicy != null) {
+                mBluetoothDeviceConnectionPolicy.release();
+                mBluetoothDeviceConnectionPolicy = null;
+            }
         }
     }
 
@@ -322,7 +366,9 @@
      * @return true if the default policy is active, false otherwise
      */
     public boolean isUsingDefaultConnectionPolicy() {
-        return mBluetoothDeviceConnectionPolicy != null;
+        synchronized (mPerUserLock) {
+            return mBluetoothDeviceConnectionPolicy != null;
+        }
     }
 
    /**
@@ -332,7 +378,7 @@
     public void connectDevices() {
         enforceBluetoothAdminPermission();
         logd("Connect devices for each profile");
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
                 int key = mProfileDeviceManagers.keyAt(i);
                 BluetoothProfileDeviceManager deviceManager =
@@ -350,7 +396,7 @@
      */
     public List<BluetoothDevice> getProfileDevicePriorityList(int profile) {
         enforceBluetoothAdminPermission();
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             BluetoothProfileDeviceManager deviceManager =
                     (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(profile);
             if (deviceManager != null) {
@@ -369,7 +415,7 @@
      */
     public int getDeviceConnectionPriority(int profile, BluetoothDevice device) {
         enforceBluetoothAdminPermission();
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             BluetoothProfileDeviceManager deviceManager =
                     (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(profile);
             if (deviceManager != null) {
@@ -388,7 +434,7 @@
      */
     public void setDeviceConnectionPriority(int profile, BluetoothDevice device, int priority) {
         enforceBluetoothAdminPermission();
-        synchronized (this) {
+        synchronized (mPerUserLock) {
             BluetoothProfileDeviceManager deviceManager =
                     (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(profile);
             if (deviceManager != null) {
@@ -408,11 +454,13 @@
      *                owning the token dies, the request will automatically be released
      * @return True if the profile was successfully inhibited, false if an error occurred.
      */
-    synchronized boolean requestProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
+    boolean requestProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
         logd("Request profile inhibit: profile " + Utils.getProfileName(profile)
                 + ", device " + device.getAddress());
-        if (mInhibitManager == null) return false;
-        return mInhibitManager.requestProfileInhibit(device, profile, token);
+        synchronized (mPerUserLock) {
+            if (mInhibitManager == null) return false;
+            return mInhibitManager.requestProfileInhibit(device, profile, token);
+        }
     }
 
     /**
@@ -425,11 +473,13 @@
      *                {@link #requestBluetoothProfileInhibit}.
      * @return True if the request was released, false if an error occurred.
      */
-    synchronized boolean releaseProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
+    boolean releaseProfileInhibit(BluetoothDevice device, int profile, IBinder token) {
         logd("Release profile inhibit: profile " + Utils.getProfileName(profile)
                 + ", device " + device.getAddress());
-        if (mInhibitManager == null) return false;
-        return mInhibitManager.releaseProfileInhibit(device, profile, token);
+        synchronized (mPerUserLock) {
+            if (mInhibitManager == null) return false;
+            return mInhibitManager.releaseProfileInhibit(device, profile, token);
+        }
     }
 
     /**
@@ -452,29 +502,31 @@
      * Print out the verbose debug status of this object
      */
     @Override
-    public synchronized void dump(PrintWriter writer) {
+    public void dump(PrintWriter writer) {
         writer.println("*" + TAG + "*");
-        writer.println("\tUser ID: " + mUserId);
-        writer.println("\tUser Proxies: " + (mCarBluetoothUserService != null ? "Yes" : "No"));
+        synchronized (mPerUserLock) {
+            writer.println("\tUser ID: " + mUserId);
+            writer.println("\tUser Proxies: " + (mCarBluetoothUserService != null ? "Yes" : "No"));
 
-        // Profile Device Manager statuses
-        for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
-            int key = mProfileDeviceManagers.keyAt(i);
-            BluetoothProfileDeviceManager deviceManager =
-                    (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
-            deviceManager.dump(writer, "\t");
-        }
+            // Profile Device Manager statuses
+            for (int i = 0; i < mProfileDeviceManagers.size(); i++) {
+                int key = mProfileDeviceManagers.keyAt(i);
+                BluetoothProfileDeviceManager deviceManager =
+                        (BluetoothProfileDeviceManager) mProfileDeviceManagers.get(key);
+                deviceManager.dump(writer, "\t");
+            }
 
-        // Profile Inhibits
-        if (mInhibitManager != null) mInhibitManager.dump(writer, "\t");
-        else writer.println("\tBluetoothProfileInhibitManager: null");
+            // Profile Inhibits
+            if (mInhibitManager != null) mInhibitManager.dump(writer, "\t");
+            else writer.println("\tBluetoothProfileInhibitManager: null");
 
-        // Device Connection Policy
-        writer.println("\tUsing default policy? " + (mUseDefaultPolicy ? "Yes" : "No"));
-        if (mBluetoothDeviceConnectionPolicy == null) {
-            writer.println("\tBluetoothDeviceConnectionPolicy: null");
-        } else {
-            mBluetoothDeviceConnectionPolicy.dump(writer, "\t");
+            // Device Connection Policy
+            writer.println("\tUsing default policy? " + (mUseDefaultPolicy ? "Yes" : "No"));
+            if (mBluetoothDeviceConnectionPolicy == null) {
+                writer.println("\tBluetoothDeviceConnectionPolicy: null");
+            } else {
+                mBluetoothDeviceConnectionPolicy.dump(writer, "\t");
+            }
         }
     }
 
diff --git a/service/src/com/android/car/CarBluetoothUserService.java b/service/src/com/android/car/CarBluetoothUserService.java
index 60bc561..028e66f 100644
--- a/service/src/com/android/car/CarBluetoothUserService.java
+++ b/service/src/com/android/car/CarBluetoothUserService.java
@@ -51,18 +51,17 @@
     );
 
     // Profile Proxies Objects to pair with above list. Access to these proxy objects will all be
-    // guarded by this classes implicit monitor lock.
+    // guarded by the below mBluetoothProxyLock
     private BluetoothA2dpSink mBluetoothA2dpSink = null;
     private BluetoothHeadsetClient mBluetoothHeadsetClient = null;
     private BluetoothPbapClient mBluetoothPbapClient = null;
     private BluetoothMapClient mBluetoothMapClient = null;
     private BluetoothPan mBluetoothPan = null;
 
-    // Concurrency variables for waitForProxyConnections. Used so we can block with a timeout while
-    // setting up or closing down proxy connections.
-    private final ReentrantLock mBluetoothProxyStatusLock;
+    // Concurrency variables for waitForProxies. Used so we can best effort block with a timeout
+    // while waiting for services to be bound to the proxy objects.
+    private final ReentrantLock mBluetoothProxyLock;
     private final Condition mConditionAllProxiesConnected;
-    private final Condition mConditionAllProxiesDisconnected;
     private SparseBooleanArray mBluetoothProfileStatus;
     private int mConnectedProfiles;
     private static final int PROXY_OPERATION_TIMEOUT_MS = 8000;
@@ -80,99 +79,69 @@
         for (int profile : sProfilesToConnect) {
             mBluetoothProfileStatus.put(profile, false);
         }
-        mBluetoothProxyStatusLock = new ReentrantLock();
-        mConditionAllProxiesConnected = mBluetoothProxyStatusLock.newCondition();
-        mConditionAllProxiesDisconnected = mBluetoothProxyStatusLock.newCondition();
+        mBluetoothProxyLock = new ReentrantLock();
+        mConditionAllProxiesConnected = mBluetoothProxyLock.newCondition();
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        Preconditions.checkNotNull(mBluetoothAdapter, "Bluetooth adapter cannot be null");
     }
 
     /**
      * Setup connections to the profile proxy objects that talk to the Bluetooth profile services.
      *
-     * Connection requests are asynchronous in nature and return through the ProfileServiceListener
-     * below. Since callers expect that the proxies are initialized by the time we call this, we
-     * will block (with a timeout) until all proxies are connected.
+     * Proxy references are held by the Bluetooth Framework on our behalf. We will be notified each
+     * time the underlying service connects for each proxy we create. Notifications stop when we
+     * close the proxy. As such, each time this is called we clean up any existing proxies before
+     * creating new ones.
      */
     @Override
     public void setupBluetoothConnectionProxies() {
         logd("Initiate connections to profile proxies");
-        Preconditions.checkNotNull(mBluetoothAdapter, "Bluetooth adapter cannot be null");
-        mBluetoothProxyStatusLock.lock();
-        try {
 
-            // Connect all the profiles that are unconnected, keep count so we can wait below
-            for (int profile : sProfilesToConnect) {
-                if (mBluetoothProfileStatus.get(profile, false)) {
-                    logd(Utils.getProfileName(profile) + " is already connected");
-                    continue;
-                }
-                logd("Connecting " + Utils.getProfileName(profile));
-                mBluetoothAdapter.getProfileProxy(mService.getApplicationContext(),
-                        mProfileListener, profile);
-            }
+        // Clear existing proxy objects
+        closeBluetoothConnectionProxies();
 
-            // Wait for all the profiles to connect with a generous timeout just in case
-            while (mConnectedProfiles != sProfilesToConnect.size()) {
-                if (!mConditionAllProxiesConnected.await(
-                        PROXY_OPERATION_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
-                    Log.e(TAG, "Timeout while waiting for all proxies to connect. Connected only "
-                            + mConnectedProfiles + "/" + sProfilesToConnect.size());
-                    break;
-                }
-            }
-        } catch (InterruptedException e) {
-            Log.w(TAG, "setupBluetoothConnectionProxies: interrupted", e);
-        } finally {
-            mBluetoothProxyStatusLock.unlock();
+        // Create proxy for each supported profile. Objects arrive later in the profile listener.
+        // Operations on the proxies expect them to be connected. Functions below should call
+        // waitForProxies() to best effort wait for them to be up if Bluetooth is enabled.
+        for (int profile : sProfilesToConnect) {
+            logd("Creating proxy for " + Utils.getProfileName(profile));
+            mBluetoothAdapter.getProfileProxy(mService.getApplicationContext(),
+                    mProfileListener, profile);
         }
     }
 
     /**
      * Close connections to the profile proxy objects
-     *
-     * Proxy disconnection requests are asynchronous in nature and return through the
-     * ProfileServiceListener below. This method will block (with a timeout) until all proxies have
-     * disconnected.
      */
     @Override
-    public synchronized void closeBluetoothConnectionProxies() {
-        logd("Tear down profile proxy connections");
-        Preconditions.checkNotNull(mBluetoothAdapter, "Bluetooth adapter cannot be null");
-        mBluetoothProxyStatusLock.lock();
+    public void closeBluetoothConnectionProxies() {
+        logd("Clean up profile proxy objects");
+        mBluetoothProxyLock.lock();
         try {
-            if (mBluetoothA2dpSink != null) {
-                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.A2DP_SINK, mBluetoothA2dpSink);
-            }
-            if (mBluetoothHeadsetClient != null) {
-                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET_CLIENT,
-                        mBluetoothHeadsetClient);
-            }
-            if (mBluetoothPbapClient != null) {
-                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PBAP_CLIENT,
-                        mBluetoothPbapClient);
-            }
-            if (mBluetoothMapClient != null) {
-                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.MAP_CLIENT,
-                        mBluetoothMapClient);
-            }
-            if (mBluetoothPan != null) {
-                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN, mBluetoothPan);
-            }
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.A2DP_SINK, mBluetoothA2dpSink);
+            mBluetoothA2dpSink = null;
+            mBluetoothProfileStatus.put(BluetoothProfile.A2DP_SINK, false);
 
-            while (mConnectedProfiles != 0) {
-                if (!mConditionAllProxiesDisconnected.await(
-                        PROXY_OPERATION_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
-                    Log.e(TAG, "Timeout while waiting for all proxies to disconnect. There are "
-                            + mConnectedProfiles + "/" + sProfilesToConnect.size() + "still "
-                            + "connected");
-                    break;
-                }
-            }
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET_CLIENT,
+                    mBluetoothHeadsetClient);
+            mBluetoothHeadsetClient = null;
+            mBluetoothProfileStatus.put(BluetoothProfile.HEADSET_CLIENT, false);
 
-        } catch (InterruptedException e) {
-            Log.w(TAG, "closeBluetoothConnectionProxies: interrupted", e);
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PBAP_CLIENT, mBluetoothPbapClient);
+            mBluetoothPbapClient = null;
+            mBluetoothProfileStatus.put(BluetoothProfile.PBAP_CLIENT, false);
+
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.MAP_CLIENT, mBluetoothMapClient);
+            mBluetoothMapClient = null;
+            mBluetoothProfileStatus.put(BluetoothProfile.MAP_CLIENT, false);
+
+            mBluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN, mBluetoothPan);
+            mBluetoothPan = null;
+            mBluetoothProfileStatus.put(BluetoothProfile.PAN, false);
+
+            mConnectedProfiles = 0;
         } finally {
-            mBluetoothProxyStatusLock.unlock();
+            mBluetoothProxyLock.unlock();
         }
     }
 
@@ -182,11 +151,12 @@
     private BluetoothProfile.ServiceListener mProfileListener =
             new BluetoothProfile.ServiceListener() {
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            logd("OnServiceConnected profile: " + Utils.getProfileName(profile));
+            logd("onServiceConnected profile: " + Utils.getProfileName(profile));
 
             // Grab the profile proxy object and update the status book keeping in one step so the
             // book keeping and proxy objects never disagree
-            synchronized (this) {
+            mBluetoothProxyLock.lock();
+            try {
                 switch (profile) {
                     case BluetoothProfile.A2DP_SINK:
                         mBluetoothA2dpSink = (BluetoothA2dpSink) proxy;
@@ -208,62 +178,35 @@
                         break;
                 }
 
-                mBluetoothProxyStatusLock.lock();
-                try {
-                    if (!mBluetoothProfileStatus.get(profile, false)) {
-                        mBluetoothProfileStatus.put(profile, true);
-                        mConnectedProfiles++;
-                        if (mConnectedProfiles == sProfilesToConnect.size()) {
-                            logd("All profiles have connected");
-                            mConditionAllProxiesConnected.signal();
-                        }
+                if (!mBluetoothProfileStatus.get(profile, false)) {
+                    mBluetoothProfileStatus.put(profile, true);
+                    mConnectedProfiles++;
+                    if (mConnectedProfiles == sProfilesToConnect.size()) {
+                        logd("All profiles have connected");
+                        mConditionAllProxiesConnected.signal();
                     }
-                } finally {
-                    mBluetoothProxyStatusLock.unlock();
+                } else {
+                    Log.w(TAG, "Received duplicate service connection event for: "
+                            + Utils.getProfileName(profile));
                 }
+            } finally {
+                mBluetoothProxyLock.unlock();
             }
         }
 
         public void onServiceDisconnected(int profile) {
             logd("onServiceDisconnected profile: " + Utils.getProfileName(profile));
-
-            // Null the profile proxy object and update the status book keeping in one step so the
-            // book keeping and proxy objects never disagree
-            synchronized (this) {
-                switch (profile) {
-                    case BluetoothProfile.A2DP_SINK:
-                        mBluetoothA2dpSink = null;
-                        break;
-                    case BluetoothProfile.HEADSET_CLIENT:
-                        mBluetoothHeadsetClient = null;
-                        break;
-                    case BluetoothProfile.PBAP_CLIENT:
-                        mBluetoothPbapClient = null;
-                        break;
-                    case BluetoothProfile.MAP_CLIENT:
-                        mBluetoothMapClient = null;
-                        break;
-                    case BluetoothProfile.PAN:
-                        mBluetoothPan = null;
-                        break;
-                    default:
-                        logd("Unhandled profile disconnected: " + Utils.getProfileName(profile));
-                        break;
+            mBluetoothProxyLock.lock();
+            try {
+                if (mBluetoothProfileStatus.get(profile, false)) {
+                    mBluetoothProfileStatus.put(profile, false);
+                    mConnectedProfiles--;
+                } else {
+                    Log.w(TAG, "Received duplicate service disconnection event for: "
+                            + Utils.getProfileName(profile));
                 }
-
-                mBluetoothProxyStatusLock.lock();
-                try {
-                    if (mBluetoothProfileStatus.get(profile, false)) {
-                        mBluetoothProfileStatus.put(profile, false);
-                        mConnectedProfiles--;
-                        if (mConnectedProfiles == 0) {
-                            logd("All profiles have disconnected");
-                            mConditionAllProxiesDisconnected.signal();
-                        }
-                    }
-                } finally {
-                    mBluetoothProxyStatusLock.unlock();
-                }
+            } finally {
+                mBluetoothProxyLock.unlock();
             }
         }
     };
@@ -271,25 +214,56 @@
     /**
      * Check if a proxy is available for the given profile to talk to the Profile's bluetooth
      * service.
+     *
      * @param profile - Bluetooth profile to check for
      * @return - true if proxy available, false if not.
      */
     @Override
     public boolean isBluetoothConnectionProxyAvailable(int profile) {
+        if (!mBluetoothAdapter.isEnabled()) return false;
         boolean proxyConnected = false;
-        mBluetoothProxyStatusLock.lock();
+        mBluetoothProxyLock.lock();
         try {
             proxyConnected = mBluetoothProfileStatus.get(profile, false);
         } finally {
-            mBluetoothProxyStatusLock.unlock();
-        }
-        if (!proxyConnected) {
-            setupBluetoothConnectionProxies();
-            return isBluetoothConnectionProxyAvailable(profile);
+            mBluetoothProxyLock.unlock();
         }
         return proxyConnected;
     }
 
+    /**
+     * Wait for the proxy objects to be up for all profiles, with a timeout.
+     *
+     * @param timeout Amount of time in milliseconds to wait for giving up on the wait operation
+     * @return True if the condition was satisfied within the timeout, False otherwise
+     */
+    private boolean waitForProxies(int timeout /* ms */) {
+        logd("waitForProxies()");
+        // If bluetooth isn't on then the operation waiting on proxies was never meant to actually
+        // work regardless if Bluetooth comes on within the timeout period or not. Return false.
+        if (!mBluetoothAdapter.isEnabled()) return false;
+        try {
+            while (mConnectedProfiles != sProfilesToConnect.size()) {
+                if (!mConditionAllProxiesConnected.await(
+                        timeout, TimeUnit.MILLISECONDS)) {
+                    Log.e(TAG, "Timeout while waiting for proxies, Connected: " + mConnectedProfiles
+                            + "/" + sProfilesToConnect.size());
+                    return false;
+                }
+            }
+        } catch (InterruptedException e) {
+            Log.w(TAG, "waitForProxies: interrupted", e);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Connect a given remote device on a specific Bluetooth profile
+     *
+     * @param profile BluetoothProfile.* based profile ID
+     * @param device The device you wish to connect
+     */
     @Override
     public boolean bluetoothConnectToProfile(int profile, BluetoothDevice device) {
         if (device == null) {
@@ -298,8 +272,10 @@
         }
         logd("Trying to connect to " + device.getName() + " (" + device.getAddress() + ") Profile: "
                 + Utils.getProfileName(profile));
-        synchronized (this) {
-            if (!isBluetoothConnectionProxyAvailable(profile)) {
+        mBluetoothProxyLock.lock();
+        try {
+            if (!isBluetoothConnectionProxyAvailable(profile)
+                    && !waitForProxies(PROXY_OPERATION_TIMEOUT_MS)) {
                 Log.e(TAG, "Cannot connect to Profile. Proxy Unavailable");
                 return false;
             }
@@ -318,10 +294,18 @@
                     Log.w(TAG, "Unknown Profile: " + Utils.getProfileName(profile));
                     break;
             }
+        } finally {
+            mBluetoothProxyLock.unlock();
         }
         return false;
     }
 
+    /**
+     * Disonnect a given remote device from a specific Bluetooth profile
+     *
+     * @param profile BluetoothProfile.* based profile ID
+     * @param device The device you wish to disconnect
+     */
     @Override
     public boolean bluetoothDisconnectFromProfile(int profile, BluetoothDevice device) {
         if (device == null) {
@@ -330,8 +314,10 @@
         }
         logd("Trying to disconnect from " + device.getName() + " (" + device.getAddress()
                 + ") Profile: " + Utils.getProfileName(profile));
-        synchronized (this) {
-            if (!isBluetoothConnectionProxyAvailable(profile)) {
+        mBluetoothProxyLock.lock();
+        try {
+            if (!isBluetoothConnectionProxyAvailable(profile)
+                    && !waitForProxies(PROXY_OPERATION_TIMEOUT_MS)) {
                 Log.e(TAG, "Cannot disconnect from profile. Proxy Unavailable");
                 return false;
             }
@@ -350,12 +336,15 @@
                     Log.w(TAG, "Unknown Profile: " + Utils.getProfileName(profile));
                     break;
             }
+        } finally {
+            mBluetoothProxyLock.unlock();
         }
         return false;
     }
 
     /**
      * Get the priority of the given Bluetooth profile for the given remote device
+     *
      * @param profile - Bluetooth profile
      * @param device - remote Bluetooth device
      */
@@ -367,8 +356,10 @@
             return BluetoothProfile.PRIORITY_UNDEFINED;
         }
         int priority;
-        synchronized (this) {
-            if (!isBluetoothConnectionProxyAvailable(profile)) {
+        mBluetoothProxyLock.lock();
+        try {
+            if (!isBluetoothConnectionProxyAvailable(profile)
+                    && !waitForProxies(PROXY_OPERATION_TIMEOUT_MS)) {
                 Log.e(TAG, "Cannot get " + Utils.getProfileName(profile)
                         + " profile priority. Proxy Unavailable");
                 return BluetoothProfile.PRIORITY_UNDEFINED;
@@ -391,6 +382,8 @@
                     priority = BluetoothProfile.PRIORITY_UNDEFINED;
                     break;
             }
+        } finally {
+            mBluetoothProxyLock.unlock();
         }
         logd(Utils.getProfileName(profile) + " priority for " + device.getName() + " ("
                 + device.getAddress() + ") = " + priority);
@@ -399,6 +392,7 @@
 
     /**
      * Set the priority of the given Bluetooth profile for the given remote device
+     *
      * @param profile - Bluetooth profile
      * @param device - remote Bluetooth device
      * @param priority - priority to set
@@ -412,8 +406,10 @@
         }
         logd("Setting " + Utils.getProfileName(profile) + " priority for " + device.getName() + " ("
                 + device.getAddress() + ") to " + priority);
-        synchronized (this) {
-            if (!isBluetoothConnectionProxyAvailable(profile)) {
+        mBluetoothProxyLock.lock();
+        try {
+            if (!isBluetoothConnectionProxyAvailable(profile)
+                    && !waitForProxies(PROXY_OPERATION_TIMEOUT_MS)) {
                 Log.e(TAG, "Cannot set " + Utils.getProfileName(profile)
                         + " profile priority. Proxy Unavailable");
                 return;
@@ -435,6 +431,8 @@
                     Log.w(TAG, "Unknown Profile: " + Utils.getProfileName(profile));
                     break;
             }
+        } finally {
+            mBluetoothProxyLock.unlock();
         }
     }
 
diff --git a/service/src/com/android/car/CarDrivingStateService.java b/service/src/com/android/car/CarDrivingStateService.java
index 584228d..66a2a7c 100644
--- a/service/src/com/android/car/CarDrivingStateService.java
+++ b/service/src/com/android/car/CarDrivingStateService.java
@@ -30,11 +30,15 @@
 import android.content.Context;
 import android.hardware.automotive.vehicle.V2_0.VehicleGear;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Log;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.List;
@@ -60,6 +64,8 @@
             VehicleProperty.PERF_VEHICLE_SPEED,
             VehicleProperty.GEAR_SELECTION,
             VehicleProperty.PARKING_BRAKE_ON};
+    private final HandlerThread mClientDispatchThread;
+    private final Handler mClientDispatchHandler;
     private CarDrivingStateEvent mCurrentDrivingState;
     // For dumpsys logging
     private final LinkedList<Utils.TransitionLog> mTransitionLogs = new LinkedList<>();
@@ -75,6 +81,9 @@
         mContext = context;
         mPropertyService = propertyService;
         mCurrentDrivingState = createDrivingStateEvent(CarDrivingStateEvent.DRIVING_STATE_UNKNOWN);
+        mClientDispatchThread = new HandlerThread("ClientDispatchThread");
+        mClientDispatchThread.start();
+        mClientDispatchHandler = new Handler(mClientDispatchThread.getLooper());
     }
 
     @Override
@@ -316,7 +325,8 @@
      * Handle events coming from {@link CarPropertyService}.  Compute the driving state, map it to
      * the corresponding UX Restrictions and dispatch the events to the registered clients.
      */
-    private synchronized void handlePropertyEvent(CarPropertyEvent event) {
+    @VisibleForTesting
+    synchronized void handlePropertyEvent(CarPropertyEvent event) {
         if (event.getEventType() != CarPropertyEvent.PROPERTY_EVENT_PROPERTY_CHANGE) {
             return;
         }
@@ -387,9 +397,13 @@
             if (DBG) {
                 Log.d(TAG, "dispatching to " + mDrivingStateClients.size() + " clients");
             }
-            for (DrivingStateClient client : mDrivingStateClients) {
-                client.dispatchEventToClients(mCurrentDrivingState);
-            }
+            // Dispatch to clients on a separate thread to prevent a deadlock
+            final CarDrivingStateEvent currentDrivingStateEvent = mCurrentDrivingState;
+            mClientDispatchHandler.post(() -> {
+                for (DrivingStateClient client : mDrivingStateClients) {
+                    client.dispatchEventToClients(currentDrivingStateEvent);
+                }
+            });
         }
     }
 
diff --git a/service/src/com/android/car/CarInputService.java b/service/src/com/android/car/CarInputService.java
index f86d4e6..c5ae16d 100644
--- a/service/src/com/android/car/CarInputService.java
+++ b/service/src/com/android/car/CarInputService.java
@@ -33,6 +33,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.res.Resources;
 import android.hardware.input.InputManager;
 import android.net.Uri;
 import android.os.Binder;
@@ -529,9 +530,14 @@
         return false;
     }
 
+    private boolean isBluetoothVoiceRecognitionEnabled() {
+        Resources res = mContext.getResources();
+        return res.getBoolean(R.bool.enableLongPressBluetoothVoiceRecognition);
+    }
+
     private boolean launchBluetoothVoiceRecognition() {
         synchronized (mBluetoothProfileServiceListener) {
-            if (mBluetoothHeadsetClient == null) {
+            if (mBluetoothHeadsetClient == null || !isBluetoothVoiceRecognitionEnabled()) {
                 return false;
             }
             // getConnectedDevices() does not make any guarantees about the order of the returned
diff --git a/service/src/com/android/car/CarLocalServices.java b/service/src/com/android/car/CarLocalServices.java
index 6c756b8..ea1b6f1 100644
--- a/service/src/com/android/car/CarLocalServices.java
+++ b/service/src/com/android/car/CarLocalServices.java
@@ -17,6 +17,7 @@
 package com.android.car;
 
 import android.annotation.Nullable;
+import android.car.Car;
 import android.car.hardware.power.CarPowerManager;
 import android.content.Context;
 import android.util.ArrayMap;
@@ -90,10 +91,12 @@
      */
     @Nullable
     public static CarPowerManager createCarPowerManager(Context context) {
+        // This does not require connection as binder will be passed to CarPowerManager directly.
+        Car car = new Car(context, /* service= */null, /* handler= */ null);
         CarPowerManagementService service = getService(CarPowerManagementService.class);
         if (service == null) {
             return null;
         }
-        return new CarPowerManager(service, context, null);
+        return new CarPowerManager(car, service);
     }
 }
diff --git a/service/src/com/android/car/CarLocationService.java b/service/src/com/android/car/CarLocationService.java
index 3827c22..d4daac2 100644
--- a/service/src/com/android/car/CarLocationService.java
+++ b/service/src/com/android/car/CarLocationService.java
@@ -216,7 +216,17 @@
                 });
                 break;
             case CarPowerStateListener.SUSPEND_EXIT:
-                deleteCacheFile();
+                if (mCarDrivingStateService != null) {
+                    CarDrivingStateEvent event = mCarDrivingStateService.getCurrentDrivingState();
+                    if (event != null
+                            && event.eventValue == CarDrivingStateEvent.DRIVING_STATE_MOVING) {
+                        deleteCacheFile();
+                    } else {
+                        logd("Registering to receive driving state.");
+                        mCarDrivingStateService.registerDrivingStateChangeListener(
+                                mICarDrivingStateChangeEventListener);
+                    }
+                }
                 if (future != null) {
                     future.complete(null);
                 }
@@ -287,7 +297,7 @@
         if (location == null) {
             logd("Not storing null location");
         } else {
-            logd("Storing location: " + location);
+            logd("Storing location");
             AtomicFile atomicFile = new AtomicFile(getLocationCacheFile());
             FileOutputStream fos = null;
             try {
@@ -427,7 +437,7 @@
                 }
             }
         }
-        logd("Injected location " + location + " with result " + success + " on attempt "
+        logd("Injected location with result " + success + " on attempt "
                 + attemptCount);
         if (success) {
             return;
diff --git a/service/src/com/android/car/CarLog.java b/service/src/com/android/car/CarLog.java
index ede5565..a77a549 100644
--- a/service/src/com/android/car/CarLog.java
+++ b/service/src/com/android/car/CarLog.java
@@ -26,9 +26,9 @@
     public static final String TAG_CAMERA = "CAR.CAMERA";
     public static final String TAG_CAN_BUS = "CAR.CAN_BUS";
     public static final String TAG_CLUSTER = "CAR.CLUSTER";
+    public static final String TAG_DIAGNOSTIC = "CAR.DIAGNOSTIC";
     public static final String TAG_HAL = "CAR.HAL";
     public static final String TAG_HVAC = "CAR.HVAC";
-    public static final String TAG_VENDOR_EXT = "CAR.VENDOR_EXT";
     public static final String TAG_INFO = "CAR.INFO";
     public static final String TAG_INPUT = "CAR.INPUT";
     public static final String TAG_MEDIA = "CAR.MEDIA";
@@ -40,10 +40,11 @@
     public static final String TAG_PROPERTY = "CAR.PROPERTY";
     public static final String TAG_SENSOR = "CAR.SENSOR";
     public static final String TAG_SERVICE = "CAR.SERVICE";
+    public static final String TAG_STORAGE = "CAR.STORAGE";
     public static final String TAG_SYS = "CAR.SYS";
     public static final String TAG_TEST = "CAR.TEST";
-    public static final String TAG_DIAGNOSTIC = "CAR.DIAGNOSTIC";
-    public static final String TAG_STORAGE = "CAR.STORAGE";
+    public static final String TAG_USER = "CAR.USER";
+    public static final String TAG_VENDOR_EXT = "CAR.VENDOR_EXT";
 
     public static String concatTag(String tagPrefix, Class clazz) {
         String tag = tagPrefix + "." + clazz.getSimpleName();
diff --git a/service/src/com/android/car/CarMediaService.java b/service/src/com/android/car/CarMediaService.java
index bda7fbc..9f57179 100644
--- a/service/src/com/android/car/CarMediaService.java
+++ b/service/src/com/android/car/CarMediaService.java
@@ -16,11 +16,13 @@
 package com.android.car;
 
 import android.app.ActivityManager;
+import android.car.Car;
 import android.car.media.CarMediaManager;
 import android.car.media.CarMediaManager.MediaSourceChangedListener;
 import android.car.media.ICarMedia;
 import android.car.media.ICarMediaSourceListener;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -34,10 +36,14 @@
 import android.media.session.MediaSessionManager;
 import android.media.session.MediaSessionManager.OnActiveSessionsChangedListener;
 import android.media.session.PlaybackState;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.Looper;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.service.media.MediaBrowserService;
 import android.text.TextUtils;
 import android.util.Log;
@@ -45,8 +51,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.car.user.CarUserService;
-
 import java.io.PrintWriter;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -68,38 +72,60 @@
  */
 public class CarMediaService extends ICarMedia.Stub implements CarServiceBase {
 
-    private static final String SOURCE_KEY = "media_source";
+    private static final String SOURCE_KEY = "media_source_component";
     private static final String PLAYBACK_STATE_KEY = "playback_state";
     private static final String SHARED_PREF = "com.android.car.media.car_media_service";
-    private static final String PACKAGE_NAME_SEPARATOR = ",";
+    private static final String COMPONENT_NAME_SEPARATOR = ",";
+    private static final String MEDIA_CONNECTION_ACTION = "com.android.car.media.MEDIA_CONNECTION";
+    private static final String EXTRA_AUTOPLAY = "com.android.car.media.autoplay";
 
-    private Context mContext;
+    // XML configuration options for autoplay on media source change.
+    private static final int AUTOPLAY_CONFIG_NEVER = 0;
+    private static final int AUTOPLAY_CONFIG_ALWAYS = 1;
+    // This mode uses the current source's last stored playback state to resume playback
+    private static final int AUTOPLAY_CONFIG_RETAIN_PER_SOURCE = 2;
+    // This mode uses the previous source's playback state to resume playback
+    private static final int AUTOPLAY_CONFIG_RETAIN_PREVIOUS = 3;
+
+    private final Context mContext;
+    private final UserManager mUserManager;
     private final MediaSessionManager mMediaSessionManager;
-    private MediaSessionUpdater mMediaSessionUpdater;
-    private String mPrimaryMediaPackage;
+    private final MediaSessionUpdater mMediaSessionUpdater = new MediaSessionUpdater();
+    private ComponentName mPrimaryMediaComponent;
+    private ComponentName mPreviousMediaComponent;
     private SharedPreferences mSharedPrefs;
     // MediaController for the current active user's active media session. This controller can be
     // null if playback has not been started yet.
     private MediaController mActiveUserMediaController;
     private SessionChangedListener mSessionsListener;
-    private boolean mStartPlayback;
+    private int mPlayOnMediaSourceChangedConfig;
+    private int mPlayOnBootConfig;
+    private int mCurrentPlaybackState;
 
-    private RemoteCallbackList<ICarMediaSourceListener> mMediaSourceListeners =
+    private boolean mPendingInit;
+    private int mCurrentUser;
+
+    private final RemoteCallbackList<ICarMediaSourceListener> mMediaSourceListeners =
             new RemoteCallbackList();
 
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
+
     // Handler to receive PlaybackState callbacks from the active media controller.
-    private Handler mHandler;
-    private HandlerThread mHandlerThread;
+    private final Handler mHandler;
+    private final HandlerThread mHandlerThread;
 
     /** The package name of the last media source that was removed while being primary. */
     private String mRemovedMediaSourcePackage;
 
+    private final IntentFilter mPackageUpdateFilter;
+    private boolean mIsPackageUpdateReceiverRegistered;
+
     /**
-     * Listens to {@link Intent#ACTION_PACKAGE_REMOVED} and {@link Intent#ACTION_PACKAGE_REPLACED}
-     * so we can reset the media source to null when its application is uninstalled, and restore it
-     * when the application is reinstalled.
+     * Listens to {@link Intent#ACTION_PACKAGE_REMOVED}, {@link Intent#ACTION_PACKAGE_REPLACED} and
+     * {@link Intent#ACTION_PACKAGE_ADDED} so we can reset the media source to null when its
+     * application is uninstalled, and restore it when the application is reinstalled.
      */
-    private BroadcastReceiver mPackageRemovedReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver mPackageUpdateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getData() == null) {
@@ -107,60 +133,138 @@
             }
             String intentPackage = intent.getData().getSchemeSpecificPart();
             if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) {
-                if (mPrimaryMediaPackage != null && mPrimaryMediaPackage.equals(intentPackage)) {
+                if (mPrimaryMediaComponent != null
+                        && mPrimaryMediaComponent.getPackageName().equals(intentPackage)) {
                     mRemovedMediaSourcePackage = intentPackage;
                     setPrimaryMediaSource(null);
                 }
             } else if (Intent.ACTION_PACKAGE_REPLACED.equals(intent.getAction())
                     || Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
                 if (mRemovedMediaSourcePackage != null
-                        && mRemovedMediaSourcePackage.equals(intentPackage)
-                        && isMediaService(intentPackage)) {
-                    setPrimaryMediaSource(mRemovedMediaSourcePackage);
+                        && mRemovedMediaSourcePackage.equals(intentPackage)) {
+                    ComponentName mediaSource = getMediaSource(intentPackage, "");
+                    if (mediaSource != null) {
+                        setPrimaryMediaSource(mediaSource);
+                    }
                 }
             }
         }
     };
 
-    private BroadcastReceiver mUserSwitchReceiver = new BroadcastReceiver() {
+    private final BroadcastReceiver mUserSwitchReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateMediaSessionCallbackForCurrentUser();
+            mCurrentUser = ActivityManager.getCurrentUser();
+            if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                Log.d(CarLog.TAG_MEDIA, "Switched to user " + mCurrentUser);
+            }
+            maybeInitUser();
         }
     };
 
     public CarMediaService(Context context) {
         mContext = context;
+        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
         mMediaSessionManager = mContext.getSystemService(MediaSessionManager.class);
-        mMediaSessionUpdater = new MediaSessionUpdater();
 
         mHandlerThread = new HandlerThread(CarLog.TAG_MEDIA);
         mHandlerThread.start();
         mHandler = new Handler(mHandlerThread.getLooper());
 
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        filter.addDataScheme("package");
-        mContext.registerReceiver(mPackageRemovedReceiver, filter);
+        mPackageUpdateFilter = new IntentFilter();
+        mPackageUpdateFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        mPackageUpdateFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        mPackageUpdateFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        mPackageUpdateFilter.addDataScheme("package");
 
         IntentFilter userSwitchFilter = new IntentFilter();
         userSwitchFilter.addAction(Intent.ACTION_USER_SWITCHED);
         mContext.registerReceiver(mUserSwitchReceiver, userSwitchFilter);
 
-        updateMediaSessionCallbackForCurrentUser();
+        mPlayOnMediaSourceChangedConfig =
+                mContext.getResources().getInteger(R.integer.config_mediaSourceChangedAutoplay);
+        mPlayOnBootConfig = mContext.getResources().getInteger(R.integer.config_mediaBootAutoplay);
+        mCurrentUser = ActivityManager.getCurrentUser();
     }
 
     @Override
+    // This method is called from ICarImpl after CarMediaService is created.
     public void init() {
-        CarLocalServices.getService(CarUserService.class).runOnUser0Unlock(() -> {
+        maybeInitUser();
+    }
+
+    private void maybeInitUser() {
+        if (mCurrentUser == 0) {
+            return;
+        }
+        if (mUserManager.isUserUnlocked(mCurrentUser)) {
+            initUser();
+        } else {
+            mPendingInit = true;
+        }
+    }
+
+    private void initUser() {
+        // SharedPreferences are shared among different users thus only need initialized once. And
+        // they should be initialized after user 0 is unlocked because SharedPreferences in
+        // credential encrypted storage are not available until after user 0 is unlocked.
+        // initUser() is called when the current foreground user is unlocked, and by that time user
+        // 0 has been unlocked already, so initializing SharedPreferences in initUser() is fine.
+        if (mSharedPrefs == null) {
             mSharedPrefs = mContext.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
-            mPrimaryMediaPackage = getLastMediaPackage();
-            mStartPlayback = mSharedPrefs.getInt(PLAYBACK_STATE_KEY, PlaybackState.STATE_NONE)
-                    == PlaybackState.STATE_PLAYING;
-            notifyListeners();
-        });
+        }
+
+        if (mIsPackageUpdateReceiverRegistered) {
+            mContext.unregisterReceiver(mPackageUpdateReceiver);
+        }
+        UserHandle currentUser = new UserHandle(mCurrentUser);
+        mContext.registerReceiverAsUser(mPackageUpdateReceiver, currentUser,
+                mPackageUpdateFilter, null, null);
+        mIsPackageUpdateReceiverRegistered = true;
+
+        mPrimaryMediaComponent =
+                isCurrentUserEphemeral() ? getDefaultMediaSource() : getLastMediaSource();
+        mActiveUserMediaController = null;
+
+        updateMediaSessionCallbackForCurrentUser();
+        notifyListeners();
+
+        startMediaConnectorService(shouldStartPlayback(mPlayOnBootConfig), currentUser);
+    }
+
+    /**
+     * Starts a service on the current user that binds to the media browser of the current media
+     * source. We start a new service because this one runs on user 0, and MediaBrowser doesn't
+     * provide an API to connect on a specific user. Additionally, this service will attempt to
+     * resume playback using the MediaSession obtained via the media browser connection, which
+     * is more reliable than using active MediaSessions from MediaSessionManager.
+     */
+    private void startMediaConnectorService(boolean startPlayback, UserHandle currentUser) {
+        Intent serviceStart = new Intent(MEDIA_CONNECTION_ACTION);
+        serviceStart.setPackage(mContext.getResources().getString(R.string.serviceMediaConnection));
+        serviceStart.putExtra(EXTRA_AUTOPLAY, startPlayback);
+        mContext.startForegroundServiceAsUser(serviceStart, currentUser);
+    }
+
+    private boolean sharedPrefsInitialized() {
+        if (mSharedPrefs == null) {
+            // It shouldn't reach this but let's be cautious.
+            Log.e(CarLog.TAG_MEDIA, "SharedPreferences are not initialized!");
+            String className = getClass().getName();
+            for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
+                // Let's print the useful logs only.
+                String log = ste.toString();
+                if (log.contains(className)) {
+                    Log.e(CarLog.TAG_MEDIA, log);
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isCurrentUserEphemeral() {
+        return mUserManager.getUserInfo(mCurrentUser).isEphemeral();
     }
 
     @Override
@@ -171,32 +275,40 @@
     @Override
     public void dump(PrintWriter writer) {
         writer.println("*CarMediaService*");
-        writer.println("\tCurrent media package: " + mPrimaryMediaPackage);
+        writer.println("\tCurrent media component: " + (mPrimaryMediaComponent == null ? "-"
+                : mPrimaryMediaComponent.flattenToString()));
+        writer.println("\tPrevious media component: " + (mPreviousMediaComponent == null ? "-"
+                : mPreviousMediaComponent.flattenToString()));
         if (mActiveUserMediaController != null) {
             writer.println(
                     "\tCurrent media controller: " + mActiveUserMediaController.getPackageName());
+            writer.println(
+                    "\tCurrent browse service extra: " + getClassName(mActiveUserMediaController));
         }
         writer.println("\tNumber of active media sessions: "
                 + mMediaSessionManager.getActiveSessionsForUser(null,
-                        ActivityManager.getCurrentUser()).size());
+                ActivityManager.getCurrentUser()).size());
     }
 
     /**
-     * @see {@link CarMediaManager#setMediaSource(String)}
+     * @see {@link CarMediaManager#setMediaSource(ComponentName)}
      */
     @Override
-    public synchronized void setMediaSource(String packageName) {
+    public synchronized void setMediaSource(@NonNull ComponentName componentName) {
         ICarImpl.assertPermission(mContext, android.Manifest.permission.MEDIA_CONTENT_CONTROL);
-        setPrimaryMediaSource(packageName);
+        if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+            Log.d(CarLog.TAG_MEDIA, "Changing media source to: " + componentName.getPackageName());
+        }
+        setPrimaryMediaSource(componentName);
     }
 
     /**
      * @see {@link CarMediaManager#getMediaSource()}
      */
     @Override
-    public synchronized String getMediaSource() {
+    public synchronized ComponentName getMediaSource() {
         ICarImpl.assertPermission(mContext, android.Manifest.permission.MEDIA_CONTENT_CONTROL);
-        return mPrimaryMediaPackage;
+        return mPrimaryMediaComponent;
     }
 
     /**
@@ -217,6 +329,38 @@
         mMediaSourceListeners.unregister(callback);
     }
 
+    /**
+     * Sets user lock / unlocking status on main thread. This is coming from system server through
+     * ICar binder call.
+     *
+     * @param userHandle Handle of user
+     * @param unlocked   unlocked (=true) or locked (=false)
+     */
+    public void setUserLockStatus(int userHandle, boolean unlocked) {
+        mMainHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                    Log.d(CarLog.TAG_MEDIA,
+                            "User " + userHandle + " is " + (unlocked ? "unlocked" : "locked"));
+                }
+                // Nothing else to do when it is locked back.
+                if (!unlocked) {
+                    return;
+                }
+                // No need to handle user0, non current foreground user.
+                if (userHandle == UserHandle.USER_SYSTEM
+                        || userHandle != ActivityManager.getCurrentUser()) {
+                    return;
+                }
+                if (mPendingInit) {
+                    initUser();
+                    mPendingInit = false;
+                }
+            }
+        });
+    }
+
     private void updateMediaSessionCallbackForCurrentUser() {
         if (mSessionsListener != null) {
             mMediaSessionManager.removeOnActiveSessionsChangedListener(mSessionsListener);
@@ -233,21 +377,36 @@
      */
     private void play() {
         if (mActiveUserMediaController != null) {
+            if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                Log.d(CarLog.TAG_MEDIA, "playing " + mActiveUserMediaController.getPackageName());
+            }
             TransportControls controls = mActiveUserMediaController.getTransportControls();
             if (controls != null) {
                 controls.play();
+            } else {
+                Log.e(CarLog.TAG_MEDIA, "Can't start playback, transport controls unavailable "
+                        + mActiveUserMediaController.getPackageName());
             }
         }
     }
 
     /**
      * Attempts to stop the current source using MediaController.TransportControls.stop()
+     * This method also unregisters callbacks to the active media controller before calling stop(),
+     * to preserve the PlaybackState before stopping.
      */
-    private void stop() {
+    private void stopAndUnregisterCallback() {
         if (mActiveUserMediaController != null) {
+            mActiveUserMediaController.unregisterCallback(mMediaControllerCallback);
+            if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+                Log.d(CarLog.TAG_MEDIA, "stopping " + mActiveUserMediaController.getPackageName());
+            }
             TransportControls controls = mActiveUserMediaController.getTransportControls();
             if (controls != null) {
                 controls.stop();
+            } else {
+                Log.e(CarLog.TAG_MEDIA, "Can't stop playback, transport controls unavailable "
+                        + mActiveUserMediaController.getPackageName());
             }
         }
     }
@@ -292,7 +451,14 @@
         public void onPlaybackStateChanged(@Nullable PlaybackState state) {
             if (state.getState() == PlaybackState.STATE_PLAYING
                     && state.getState() != mPreviousPlaybackState) {
-                setPrimaryMediaSource(mMediaController.getPackageName());
+                ComponentName mediaSource = getMediaSource(mMediaController.getPackageName(),
+                        getClassName(mMediaController));
+                if (mediaSource != null && !mediaSource.equals(mPrimaryMediaComponent)
+                        && Log.isLoggable(CarLog.TAG_MEDIA, Log.INFO)) {
+                    Log.i(CarLog.TAG_MEDIA, "Changing media source due to playback state change: "
+                            + mediaSource.flattenToString());
+                }
+                setPrimaryMediaSource(mediaSource);
             }
             mPreviousPlaybackState = state.getState();
         }
@@ -333,9 +499,11 @@
             mCallbacks = updatedCallbacks;
             updatePrimaryMediaSourceWithCurrentlyPlaying(additions);
             // If there are no playing media sources, and we don't currently have the controller
-            // for the active source, check the new active sessions for a matching controller.
+            // for the active source, check the active sessions for a matching controller. If this
+            // is called after a user switch, its possible for a matching controller to already be
+            // active before the user is unlocked, so we check all of the current controllers
             if (mActiveUserMediaController == null) {
-                updateActiveMediaController(additions);
+                updateActiveMediaController(newControllers);
             }
         }
 
@@ -352,28 +520,35 @@
     /**
      * Updates the primary media source, then notifies content observers of the change
      */
-    private synchronized void setPrimaryMediaSource(@Nullable String packageName) {
-        if (mPrimaryMediaPackage != null && mPrimaryMediaPackage.equals((packageName))) {
+    private synchronized void setPrimaryMediaSource(@Nullable ComponentName componentName) {
+        if (mPrimaryMediaComponent != null && mPrimaryMediaComponent.equals((componentName))) {
             return;
         }
 
-        stop();
+        stopAndUnregisterCallback();
 
-        mStartPlayback = false;
-        mPrimaryMediaPackage = packageName;
+        mActiveUserMediaController = null;
+        mPreviousMediaComponent = mPrimaryMediaComponent;
+        mPrimaryMediaComponent = componentName;
+
+        if (mPrimaryMediaComponent != null && !TextUtils.isEmpty(
+                mPrimaryMediaComponent.flattenToString())) {
+            if (!isCurrentUserEphemeral()) {
+                saveLastMediaSource(mPrimaryMediaComponent);
+            }
+            mRemovedMediaSourcePackage = null;
+        }
+
+        notifyListeners();
+
+        startMediaConnectorService(shouldStartPlayback(mPlayOnMediaSourceChangedConfig),
+                new UserHandle(mCurrentUser));
+        // Reset current playback state for the new source, in the case that the app is in an error
+        // state (e.g. not signed in). This state will be updated from the app callback registered
+        // below, to make sure mCurrentPlaybackState reflects the current source only.
+        mCurrentPlaybackState = PlaybackState.STATE_NONE;
         updateActiveMediaController(mMediaSessionManager
                 .getActiveSessionsForUser(null, ActivityManager.getCurrentUser()));
-
-        if (mSharedPrefs != null) {
-            if (!TextUtils.isEmpty(mPrimaryMediaPackage)) {
-                saveLastMediaPackage(mPrimaryMediaPackage);
-                mRemovedMediaSourcePackage = null;
-            }
-        } else {
-            // Shouldn't reach this unless there is some other error in CarService
-            Log.e(CarLog.TAG_MEDIA, "Error trying to save last media source, prefs uninitialized");
-        }
-        notifyListeners();
     }
 
     private void notifyListeners() {
@@ -381,7 +556,7 @@
         while (i-- > 0) {
             try {
                 ICarMediaSourceListener callback = mMediaSourceListeners.getBroadcastItem(i);
-                callback.onMediaSourceChanged(mPrimaryMediaPackage);
+                callback.onMediaSourceChanged(mPrimaryMediaComponent);
             } catch (RemoteException e) {
                 Log.e(CarLog.TAG_MEDIA, "calling onMediaSourceChanged failed " + e);
             }
@@ -392,113 +567,183 @@
     private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() {
         @Override
         public void onPlaybackStateChanged(PlaybackState state) {
-            savePlaybackState(state);
-            // Try to start playback if the new state allows the play action
-            maybeRestartPlayback(state);
+            if (!isCurrentUserEphemeral()) {
+                savePlaybackState(state);
+            }
         }
     };
 
     /**
-     * Finds the currently playing media source, then updates the active source if different
+     * Finds the currently playing media source, then updates the active source if the component
+     * name is different.
      */
     private synchronized void updatePrimaryMediaSourceWithCurrentlyPlaying(
             List<MediaController> controllers) {
         for (MediaController controller : controllers) {
             if (controller.getPlaybackState() != null
                     && controller.getPlaybackState().getState() == PlaybackState.STATE_PLAYING) {
-                if (mPrimaryMediaPackage == null || !mPrimaryMediaPackage.equals(
-                        controller.getPackageName())) {
-                    setPrimaryMediaSource(controller.getPackageName());
+                String newPackageName = controller.getPackageName();
+                String newClassName = getClassName(controller);
+                if (!matchPrimaryMediaSource(newPackageName, newClassName)) {
+                    ComponentName mediaSource = getMediaSource(newPackageName, newClassName);
+                    if (Log.isLoggable(CarLog.TAG_MEDIA, Log.INFO)) {
+                        if (mediaSource != null) {
+                            Log.i(CarLog.TAG_MEDIA,
+                                    "MediaController changed, updating media source to: "
+                                            + mediaSource.flattenToString());
+                        } else {
+                            // Some apps, like Chrome, have a MediaSession but no
+                            // MediaBrowseService. Media Center doesn't consider such apps as
+                            // valid media sources.
+                            Log.i(CarLog.TAG_MEDIA,
+                                    "MediaController changed, but no media browse service found "
+                                            + "in package: " + newPackageName);
+                        }
+                    }
+                    setPrimaryMediaSource(mediaSource);
                 }
                 return;
             }
         }
     }
 
-    private boolean isMediaService(String packageName) {
-        return getBrowseServiceClassName(packageName) != null;
+    private boolean matchPrimaryMediaSource(@NonNull String newPackageName,
+            @NonNull String newClassName) {
+        if (mPrimaryMediaComponent != null && mPrimaryMediaComponent.getPackageName().equals(
+                newPackageName)) {
+            // If the class name of currently active source is not specified, only checks package
+            // name; otherwise checks both package name and class name.
+            if (TextUtils.isEmpty(newClassName)) {
+                return true;
+            } else {
+                return newClassName.equals(mPrimaryMediaComponent.getClassName());
+            }
+        }
+        return false;
     }
 
-    private String getBrowseServiceClassName(@NonNull String packageName) {
+    private boolean isMediaService(@NonNull ComponentName componentName) {
+        return getMediaService(componentName) != null;
+    }
+
+    /*
+     * Gets the media service that matches the componentName for the current foreground user.
+     */
+    private ComponentName getMediaService(@NonNull ComponentName componentName) {
+        String packageName = componentName.getPackageName();
+        String className = componentName.getClassName();
+
         PackageManager packageManager = mContext.getPackageManager();
         Intent mediaIntent = new Intent();
         mediaIntent.setPackage(packageName);
         mediaIntent.setAction(MediaBrowserService.SERVICE_INTERFACE);
+        List<ResolveInfo> mediaServices = packageManager.queryIntentServicesAsUser(mediaIntent,
+                PackageManager.GET_RESOLVED_FILTER, ActivityManager.getCurrentUser());
 
-        List<ResolveInfo> mediaServices = packageManager.queryIntentServices(mediaIntent,
-                PackageManager.GET_RESOLVED_FILTER);
+        for (ResolveInfo service : mediaServices) {
+            String serviceName = service.serviceInfo.name;
+            if (!TextUtils.isEmpty(serviceName)
+                    // If className is not specified, returns the first service in the package;
+                    // otherwise returns the matched service.
+                    // TODO(b/136274456): find a proper way to handle the case where there are
+                    //  multiple services and the className is not specified.
 
-        if (mediaServices == null || mediaServices.isEmpty()) {
-            return null;
-        }
-        return mediaServices.get(0).serviceInfo.name;
-    }
-
-    private void saveLastMediaPackage(@NonNull String packageName) {
-        String serialized = mSharedPrefs.getString(SOURCE_KEY, null);
-        if (serialized == null) {
-            mSharedPrefs.edit().putString(SOURCE_KEY, packageName).apply();
-        } else {
-            Deque<String> packageNames = getPackageNameList(serialized);
-            packageNames.remove(packageName);
-            packageNames.addFirst(packageName);
-            mSharedPrefs.edit().putString(SOURCE_KEY, serializePackageNameList(packageNames))
-                    .apply();
-        }
-    }
-
-    private String getLastMediaPackage() {
-        String serialized = mSharedPrefs.getString(SOURCE_KEY, null);
-        if (!TextUtils.isEmpty(serialized)) {
-            for (String packageName : getPackageNameList(serialized)) {
-                if (isMediaService(packageName)) {
-                    return packageName;
-                }
+                    && (TextUtils.isEmpty(className) || serviceName.equals(className))) {
+                return new ComponentName(packageName, serviceName);
             }
         }
 
-        String defaultSourcePackage = mContext.getString(R.string.default_media_application);
-        if (isMediaService(defaultSourcePackage)) {
-            return defaultSourcePackage;
+        if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
+            Log.d(CarLog.TAG_MEDIA, "No MediaBrowseService with ComponentName: "
+                    + componentName.flattenToString());
         }
         return null;
     }
 
-    private String serializePackageNameList(Deque<String> packageNames) {
-        return packageNames.stream().collect(Collectors.joining(PACKAGE_NAME_SEPARATOR));
+    /*
+     * Gets the component name of the media service.
+     */
+    @Nullable
+    private ComponentName getMediaSource(@NonNull String packageName, @NonNull String className) {
+        return getMediaService(new ComponentName(packageName, className));
     }
 
-    private Deque<String> getPackageNameList(String serialized) {
-        String[] packageNames = serialized.split(PACKAGE_NAME_SEPARATOR);
-        return new ArrayDeque(Arrays.asList(packageNames));
+    private void saveLastMediaSource(@NonNull ComponentName component) {
+        if (!sharedPrefsInitialized()) {
+            return;
+        }
+        String componentName = component.flattenToString();
+        String key = SOURCE_KEY + mCurrentUser;
+        String serialized = mSharedPrefs.getString(key, null);
+        if (serialized == null) {
+            mSharedPrefs.edit().putString(key, componentName).apply();
+        } else {
+            Deque<String> componentNames = getComponentNameList(serialized);
+            componentNames.remove(componentName);
+            componentNames.addFirst(componentName);
+            mSharedPrefs.edit().putString(key, serializeComponentNameList(componentNames))
+                    .apply();
+        }
+    }
+
+    private ComponentName getLastMediaSource() {
+        if (sharedPrefsInitialized()) {
+            String key = SOURCE_KEY + mCurrentUser;
+            String serialized = mSharedPrefs.getString(key, null);
+            if (!TextUtils.isEmpty(serialized)) {
+                for (String name : getComponentNameList(serialized)) {
+                    ComponentName componentName = ComponentName.unflattenFromString(name);
+                    if (isMediaService(componentName)) {
+                        return componentName;
+                    }
+                }
+            }
+        }
+        return getDefaultMediaSource();
+    }
+
+    private ComponentName getDefaultMediaSource() {
+        String defaultMediaSource = mContext.getString(R.string.default_media_source);
+        ComponentName defaultComponent = ComponentName.unflattenFromString(defaultMediaSource);
+        if (isMediaService(defaultComponent)) {
+            return defaultComponent;
+        }
+        return null;
+    }
+
+    private String serializeComponentNameList(Deque<String> componentNames) {
+        return componentNames.stream().collect(Collectors.joining(COMPONENT_NAME_SEPARATOR));
+    }
+
+    private Deque<String> getComponentNameList(String serialized) {
+        String[] componentNames = serialized.split(COMPONENT_NAME_SEPARATOR);
+        return new ArrayDeque(Arrays.asList(componentNames));
     }
 
     private void savePlaybackState(PlaybackState playbackState) {
+        if (!sharedPrefsInitialized()) {
+            return;
+        }
         int state = playbackState != null ? playbackState.getState() : PlaybackState.STATE_NONE;
-        if (state == PlaybackState.STATE_PLAYING) {
-            // No longer need to request play if audio was resumed already via some other means,
-            // e.g. Assistant starts playback, user uses hardware button, etc.
-            mStartPlayback = false;
-        }
-        if (mSharedPrefs != null) {
-            mSharedPrefs.edit().putInt(PLAYBACK_STATE_KEY, state).apply();
-        }
-    }
-
-    private void maybeRestartPlayback(PlaybackState state) {
-        if (mStartPlayback && state != null
-                && (state.getActions() & PlaybackState.ACTION_PLAY) != 0) {
-            play();
-            mStartPlayback = false;
-        }
+        mCurrentPlaybackState = state;
+        String key = getPlaybackStateKey();
+        mSharedPrefs.edit().putInt(key, state).apply();
     }
 
     /**
-     * Updates active media controller from the list that has the same package name as the primary
-     * media package. Clears callback and resets media controller to null if not found.
+     * Builds a string key for saving the playback state for a specific media source (and user)
+     */
+    private String getPlaybackStateKey() {
+        return PLAYBACK_STATE_KEY + mCurrentUser
+                + (mPrimaryMediaComponent == null ? "" : mPrimaryMediaComponent.flattenToString());
+    }
+
+    /**
+     * Updates active media controller from the list that has the same component name as the primary
+     * media component. Clears callback and resets media controller to null if not found.
      */
     private void updateActiveMediaController(List<MediaController> mediaControllers) {
-        if (mPrimaryMediaPackage == null) {
+        if (mPrimaryMediaComponent == null) {
             return;
         }
         if (mActiveUserMediaController != null) {
@@ -506,18 +751,52 @@
             mActiveUserMediaController = null;
         }
         for (MediaController controller : mediaControllers) {
-            if (mPrimaryMediaPackage.equals(controller.getPackageName())) {
+            if (matchPrimaryMediaSource(controller.getPackageName(), getClassName(controller))) {
                 mActiveUserMediaController = controller;
+                PlaybackState state = mActiveUserMediaController.getPlaybackState();
+                if (!isCurrentUserEphemeral()) {
+                    savePlaybackState(state);
+                }
                 // Specify Handler to receive callbacks on, to avoid defaulting to the calling
                 // thread; this method can be called from the MediaSessionManager callback.
                 // Using the version of this method without passing a handler causes a
                 // RuntimeException for failing to create a Handler.
-                PlaybackState state = mActiveUserMediaController.getPlaybackState();
-                savePlaybackState(state);
                 mActiveUserMediaController.registerCallback(mMediaControllerCallback, mHandler);
-                maybeRestartPlayback(state);
                 return;
             }
         }
     }
+
+    /**
+     * Returns whether we should autoplay the current media source
+     */
+    private boolean shouldStartPlayback(int config) {
+        switch (config) {
+            case AUTOPLAY_CONFIG_NEVER:
+                return false;
+            case AUTOPLAY_CONFIG_ALWAYS:
+                return true;
+            case AUTOPLAY_CONFIG_RETAIN_PER_SOURCE:
+                if (!sharedPrefsInitialized()) {
+                    return false;
+                }
+                return mSharedPrefs.getInt(getPlaybackStateKey(), PlaybackState.STATE_NONE)
+                        == PlaybackState.STATE_PLAYING;
+            case AUTOPLAY_CONFIG_RETAIN_PREVIOUS:
+                return mCurrentPlaybackState == PlaybackState.STATE_PLAYING;
+            default:
+                Log.e(CarLog.TAG_MEDIA, "Unsupported playback configuration: " + config);
+                return false;
+        }
+
+    }
+
+    @NonNull
+    private static String getClassName(@NonNull MediaController controller) {
+        Bundle sessionExtras = controller.getExtras();
+        String value =
+                sessionExtras == null ? "" : sessionExtras.getString(
+                        Car.CAR_EXTRA_BROWSE_SERVICE_FOR_SESSION);
+        return value != null ? value : "";
+    }
 }
diff --git a/service/src/com/android/car/CarPowerManagementService.java b/service/src/com/android/car/CarPowerManagementService.java
index c1341da..222013c 100644
--- a/service/src/com/android/car/CarPowerManagementService.java
+++ b/service/src/com/android/car/CarPowerManagementService.java
@@ -15,12 +15,19 @@
  */
 package com.android.car;
 
+import android.annotation.Nullable;
+import android.annotation.UserIdInt;
+import android.app.ActivityManager;
 import android.car.Car;
 import android.car.hardware.power.CarPowerManager.CarPowerStateListener;
 import android.car.hardware.power.ICarPower;
 import android.car.hardware.power.ICarPowerStateListener;
 import android.car.userlib.CarUserManagerHelper;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.VehicleApPowerStateReq;
 import android.os.Build;
 import android.os.Handler;
@@ -28,22 +35,27 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
+import android.os.PowerManager;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.util.Log;
 
+import com.android.car.am.ContinuousBlankActivity;
 import com.android.car.hal.PowerHalService;
 import com.android.car.hal.PowerHalService.PowerState;
 import com.android.car.systeminterface.SystemInterface;
+import com.android.car.user.CarUserNoticeService;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.PrintWriter;
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -54,6 +66,10 @@
  */
 public class CarPowerManagementService extends ICarPower.Stub implements
         CarServiceBase, PowerHalService.PowerEventListener {
+
+    private final Object mLock = new Object();
+    private final Object mSimulationWaitObject = new Object();
+
     private final Context mContext;
     private final PowerHalService mHal;
     private final SystemInterface mSystemInterface;
@@ -62,34 +78,46 @@
     // The listeners that must indicate asynchronous completion by calling finished().
     private final PowerManagerCallbackList mPowerManagerListenersWithCompletion =
                           new PowerManagerCallbackList();
+
+    @GuardedBy("mSimulationWaitObject")
+    private boolean mWakeFromSimulatedSleep;
+    @GuardedBy("mSimulationWaitObject")
+    private boolean mInSimulatedDeepSleepMode;
+
+    @GuardedBy("mLock")
     private final Set<IBinder> mListenersWeAreWaitingFor = new HashSet<>();
-    private final Object mSimulationSleepObject = new Object();
-
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private CpmsState mCurrentState;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private Timer mTimer;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private long mProcessingStartTime;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private long mLastSleepEntryTime;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private final LinkedList<CpmsState> mPendingPowerStates = new LinkedList<>();
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private HandlerThread mHandlerThread;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private PowerHandler mHandler;
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private boolean mTimerActive;
-    @GuardedBy("mSimulationSleepObject")
-    private boolean mInSimulatedDeepSleepMode = false;
-    @GuardedBy("mSimulationSleepObject")
-    private boolean mWakeFromSimulatedSleep = false;
-    private int mNextWakeupSec = 0;
-    private boolean mShutdownOnFinish = false;
+    @GuardedBy("mLock")
+    private int mNextWakeupSec;
+    @GuardedBy("mLock")
+    private boolean mShutdownOnFinish;
+    @GuardedBy("mLock")
+    private boolean mShutdownOnNextSuspend;
+    @GuardedBy("mLock")
     private boolean mIsBooting = true;
-
+    @GuardedBy("mLock")
+    private boolean mIsResuming;
+    @GuardedBy("mLock")
+    private boolean mRebootAfterGarageMode;
+    private final boolean mDisableUserSwitchDuringResume;
     private final CarUserManagerHelper mCarUserManagerHelper;
+    private final UserManager mUserManager;    // CarUserManagerHelper is deprecated...
+    private final String mNewGuestName;
 
     // TODO:  Make this OEM configurable.
     private static final int SHUTDOWN_POLLING_INTERVAL_MS = 2000;
@@ -116,14 +144,24 @@
         }
     }
 
-    public CarPowerManagementService(
-            Context context, PowerHalService powerHal, SystemInterface systemInterface,
-            CarUserManagerHelper carUserManagerHelper) {
+    public CarPowerManagementService(Context context, PowerHalService powerHal,
+            SystemInterface systemInterface, CarUserManagerHelper carUserManagerHelper) {
+        this(context, context.getResources(), powerHal, systemInterface, carUserManagerHelper,
+                UserManager.get(context), context.getString(R.string.default_guest_name));
+    }
+
+    @VisibleForTesting
+    CarPowerManagementService(Context context, Resources resources, PowerHalService powerHal,
+            SystemInterface systemInterface, CarUserManagerHelper carUserManagerHelper,
+            UserManager userManager, String newGuestName) {
         mContext = context;
         mHal = powerHal;
         mSystemInterface = systemInterface;
         mCarUserManagerHelper = carUserManagerHelper;
-        sShutdownPrepareTimeMs = mContext.getResources().getInteger(
+        mUserManager = userManager;
+        mDisableUserSwitchDuringResume = resources
+                .getBoolean(R.bool.config_disableUserSwitchDuringResume);
+        sShutdownPrepareTimeMs = resources.getInteger(
                 R.integer.maxGarageModeRunningDurationInSecs) * 1000;
         if (sShutdownPrepareTimeMs < MIN_MAX_GARAGE_MODE_DURATION_MS) {
             Log.w(CarLog.TAG_POWER,
@@ -132,20 +170,7 @@
                     +  MIN_MAX_GARAGE_MODE_DURATION_MS + "(ms), Ignore resource.");
             sShutdownPrepareTimeMs = MIN_MAX_GARAGE_MODE_DURATION_MS;
         }
-    }
-
-    /**
-     * Create a dummy instance for unit testing purpose only. Instance constructed in this way
-     * is not safe as members expected to be non-null are null.
-     */
-    @VisibleForTesting
-    protected CarPowerManagementService() {
-        mContext = null;
-        mHal = null;
-        mSystemInterface = null;
-        mHandlerThread = null;
-        mHandler = new PowerHandler(Looper.getMainLooper());
-        mCarUserManagerHelper = null;
+        mNewGuestName = newGuestName;
     }
 
     @VisibleForTesting
@@ -158,9 +183,16 @@
         }
     }
 
+    @VisibleForTesting
+    protected HandlerThread getHandlerThread() {
+        synchronized (mLock) {
+            return mHandlerThread;
+        }
+    }
+
     @Override
     public void init() {
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mHandlerThread = new HandlerThread(CarLog.TAG_POWER);
             mHandlerThread.start();
             mHandler = new PowerHandler(mHandlerThread.getLooper());
@@ -180,11 +212,12 @@
     @Override
     public void release() {
         HandlerThread handlerThread;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             releaseTimerLocked();
             mCurrentState = null;
             mHandler.cancelAll();
             handlerThread = mHandlerThread;
+            mListenersWeAreWaitingFor.clear();
         }
         handlerThread.quitSafely();
         try {
@@ -194,7 +227,6 @@
         }
         mSystemInterface.stopDisplayStateMonitoring();
         mPowerManagerListeners.kill();
-        mListenersWeAreWaitingFor.clear();
         mSystemInterface.releaseAllWakeLocks();
     }
 
@@ -205,14 +237,18 @@
         writer.print(",mProcessingStartTime:" + mProcessingStartTime);
         writer.print(",mLastSleepEntryTime:" + mLastSleepEntryTime);
         writer.print(",mNextWakeupSec:" + mNextWakeupSec);
+        writer.print(",mShutdownOnNextSuspend:" + mShutdownOnNextSuspend);
         writer.print(",mShutdownOnFinish:" + mShutdownOnFinish);
-        writer.println(",sShutdownPrepareTimeMs:" + sShutdownPrepareTimeMs);
+        writer.print(",sShutdownPrepareTimeMs:" + sShutdownPrepareTimeMs);
+        writer.print(",mDisableUserSwitchDuringResume:" + mDisableUserSwitchDuringResume);
+        writer.println(",mRebootAfterGarageMode:" + mRebootAfterGarageMode);
+        writer.print("mNewGuestName: "); writer.println(mNewGuestName);
     }
 
     @Override
     public void onApPowerStateChange(PowerState state) {
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mPendingPowerStates.addFirst(new CpmsState(state));
             handler = mHandler;
         }
@@ -220,8 +256,14 @@
     }
 
     @VisibleForTesting
-    protected void clearIsBooting() {
-        mIsBooting = false;
+    void setStateForTesting(boolean isBooting, boolean isResuming) {
+        synchronized (mLock) {
+            Log.d(CarLog.TAG_POWER, "setStateForTesting():"
+                    + " booting(" + mIsBooting + ">" + isBooting + ")"
+                    + " resuming(" + mIsResuming + ">" + isResuming + ")");
+            mIsBooting = isBooting;
+            mIsResuming = isResuming;
+        }
     }
 
     /**
@@ -230,7 +272,7 @@
     private void onApPowerStateChange(int apState, int carPowerStateListenerState) {
         CpmsState newState = new CpmsState(apState, carPowerStateListenerState);
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mPendingPowerStates.addFirst(newState);
             handler = mHandler;
         }
@@ -240,7 +282,7 @@
     private void doHandlePowerStateChange() {
         CpmsState state;
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             state = mPendingPowerStates.peekFirst();
             mPendingPowerStates.clear();
             if (state == null) {
@@ -295,6 +337,7 @@
                 mHal.sendWaitForVhal();
                 break;
             case CarPowerStateListener.SHUTDOWN_CANCELLED:
+                mShutdownOnNextSuspend = false; // This cancels the "NextSuspend"
                 mHal.sendShutdownCancel();
                 break;
             case CarPowerStateListener.SUSPEND_EXIT:
@@ -303,29 +346,170 @@
         }
     }
 
+    private void updateCarUserNoticeServiceIfNecessary() {
+        try {
+            int currentUserId = ActivityManager.getCurrentUser();
+            UserInfo currentUserInfo = mUserManager.getUserInfo(currentUserId);
+            CarUserNoticeService carUserNoticeService =
+                    CarLocalServices.getService(CarUserNoticeService.class);
+            if (currentUserInfo != null && currentUserInfo.isGuest()
+                    && carUserNoticeService != null) {
+                Log.i(CarLog.TAG_POWER,
+                        "Car user notice service will ignore all messages before user switch.");
+                Intent intent = new Intent();
+                intent.setComponent(new ComponentName(mContext.getPackageName(),
+                        ContinuousBlankActivity.class.getName()));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                mContext.startActivityAsUser(intent, UserHandle.CURRENT);
+                carUserNoticeService.ignoreUserNotice(currentUserId);
+            }
+        } catch (Exception e) {
+            Log.w(CarLog.TAG_POWER, "Cannot ignore user notice for current user", e);
+        }
+    }
+
     private void handleOn() {
-        // Do not switch user if it is booting as there can be a race with CarServiceHelperService
-        if (mIsBooting) {
-            mIsBooting = false;
-        } else {
-            int targetUserId = mCarUserManagerHelper.getInitialUser();
-            if (targetUserId != UserHandle.USER_SYSTEM
-                    && targetUserId != mCarUserManagerHelper.getCurrentForegroundUserId()) {
-                Log.i(CarLog.TAG_POWER, "Desired user changed, switching to user:" + targetUserId);
-                mCarUserManagerHelper.switchToUserId(targetUserId);
+        // If current user is a Guest User, we want to inform CarUserNoticeService not to show
+        // notice for current user, and show user notice only for the target user.
+        updateCarUserNoticeServiceIfNecessary();
+
+        // Some OEMs have their own user-switching logic, which may not be coordinated with this
+        // code. To avoid contention, we don't switch users when we coming alive. The OEM's code
+        // should do the switch.
+        boolean allowUserSwitch = true;
+        synchronized (mLock) {
+            if (mIsBooting) {
+                // The system is booting, so don't switch users
+                allowUserSwitch = false;
+                mIsBooting = false;
+                mIsResuming = false;
+                Log.i(CarLog.TAG_POWER, "User switch disallowed while booting");
+            } else {
+                // The system is resuming after a suspension. Optionally disable user switching.
+                allowUserSwitch = !mDisableUserSwitchDuringResume;
+                mIsBooting = false;
+                mIsResuming = false;
+                if (!allowUserSwitch) {
+                    Log.i(CarLog.TAG_POWER, "User switch disallowed while resuming");
+                }
             }
         }
+
         mSystemInterface.setDisplayState(true);
         sendPowerManagerEvent(CarPowerStateListener.ON);
         mHal.sendOn();
+
+        try {
+            switchUserOnResumeIfNecessary(allowUserSwitch);
+        } catch (Exception e) {
+            Log.e(CarLog.TAG_POWER, "Could not switch user on resume: " + e);
+        }
+    }
+
+    private void switchUserOnResumeIfNecessary(boolean allowSwitching) {
+        int targetUserId = mCarUserManagerHelper.getInitialUser();
+        if (targetUserId == UserHandle.USER_SYSTEM) {
+            // API explicitly say it doesn't return USER_SYSTEM
+            Log.wtf(CarLog.TAG_POWER, "getInitialUser() returned system user");
+            return;
+        }
+        int currentUserId = ActivityManager.getCurrentUser();
+        UserInfo targetUserInfo = mUserManager.getUserInfo(targetUserId);
+        boolean isTargetPersistent = !targetUserInfo.isEphemeral();
+        boolean isTargetGuest = targetUserInfo.isGuest();
+        Log.d(CarLog.TAG_POWER, "getTargetUserId(): current=" + currentUserId
+                + ", target=" + targetUserInfo.toFullString()
+                + ", isTargetPersistent=" + isTargetPersistent + ", isTargetGuest=" + isTargetGuest
+                + ", allowSwitching: " + allowSwitching);
+
+        if (isTargetPersistent && !isTargetGuest) {
+            if (!allowSwitching) {
+                Log.d(CarLog.TAG_POWER, "Not switching to " + targetUserId
+                        + " because it's not allowed");
+                return;
+            }
+            if (currentUserId == targetUserId) {
+                Log.v(CarLog.TAG_POWER, "no need to switch to (same user) " + currentUserId);
+                return;
+            }
+            // All good - switch to the requested user
+            switchToUser(currentUserId, targetUserId, /* reason= */ null);
+            return;
+        }
+
+        if (!isTargetGuest) {
+            // Shouldn't happen (unless OEM is explicitly creating ephemeral users, which
+            // doesn't make much sense), but it doesn't hurt to log...
+            Log.w(CarLog.TAG_POWER, "target user is ephemeral but not a guest: "
+                    + targetUserInfo.toFullString());
+            if (allowSwitching) {
+                switchToUser(currentUserId, targetUserId, /* reason= */ null);
+            }
+            return;
+        } else if (isTargetPersistent) {
+            // TODO(b/146380030): decide whether we should delete it or not
+            // Shouldn't happen neither, but it's not a big deal (guest will be replaced below
+            // anyway), but it's worth logging as well...
+            Log.w(CarLog.TAG_POWER, "target user is a non-ephemeral guest: "
+                    + targetUserInfo.toFullString());
+        }
+
+        // At this point, target user is a guest - we cannot resume into an ephemeral guest for
+        // privacy reasons, so we need to create a new guest and switch to it (even if the OEM
+        // doesn't allow switching)
+
+
+        boolean marked = mUserManager.markGuestForDeletion(targetUserId);
+        if (!marked) {
+            Log.w(CarLog.TAG_POWER, "Could not mark guest user " + targetUserId + " for deletion");
+            return;
+        }
+
+        UserInfo newGuest = mUserManager.createGuest(mContext, mNewGuestName);
+
+        if (newGuest != null) {
+            switchToUser(currentUserId, newGuest.id, "Created new guest");
+            Log.d(CarLog.TAG_POWER, "Removing previous guest " + targetUserId);
+            mUserManager.removeUser(targetUserId);
+        } else {
+            Log.wtf(CarLog.TAG_POWER, "Could not create new guest");
+            // TODO(b/146380030): decide whether we should switch to SYSTEM
+        }
+    }
+
+    private void switchToUser(@UserIdInt int fromUser, @UserIdInt int toUser,
+            @Nullable String reason) {
+        StringBuilder message = new StringBuilder();
+        if (reason == null) {
+            message.append("Desired user changed");
+        } else {
+            message.append(reason);
+        }
+        message.append(", switching from ").append(fromUser).append(" to ").append(toUser);
+        Log.i(CarLog.TAG_POWER, message.toString());
+        mCarUserManagerHelper.switchToUserId(toUser);
+    }
+
+    private int getFirstSwitchableUser() {
+        List<UserInfo> allUsers = mUserManager.getUsers();
+        for (UserInfo user : allUsers) {
+            if (user.id != UserHandle.USER_SYSTEM) {
+                return user.id;
+            }
+        }
+        Log.wtf(CarLog.TAG_POWER, "no switchable user: " + allUsers);
+        return UserHandle.USER_NULL;
     }
 
     private void handleShutdownPrepare(CpmsState newState) {
         mSystemInterface.setDisplayState(false);
         // Shutdown on finish if the system doesn't support deep sleep or doesn't allow it.
-        mShutdownOnFinish |= !mHal.isDeepSleepAllowed()
-                || !mSystemInterface.isSystemSupportingDeepSleep()
-                || !newState.mCanSleep;
+        synchronized (mLock) {
+            mShutdownOnFinish = mShutdownOnNextSuspend
+                    || !mHal.isDeepSleepAllowed()
+                    || !mSystemInterface.isSystemSupportingDeepSleep()
+                    || !newState.mCanSleep;
+        }
         if (newState.mCanPostpone) {
             Log.i(CarLog.TAG_POWER, "starting shutdown prepare");
             sendPowerManagerEvent(CarPowerStateListener.SHUTDOWN_PREPARE);
@@ -333,7 +517,7 @@
             doHandlePreprocessing();
         } else {
             Log.i(CarLog.TAG_POWER, "starting shutdown immediately");
-            synchronized (CarPowerManagementService.this) {
+            synchronized (mLock) {
                 releaseTimerLocked();
             }
             // Notify hal that we are shutting down and since it is immediate, don't schedule next
@@ -355,22 +539,41 @@
 
     private void handleWaitForFinish(CpmsState state) {
         sendPowerManagerEvent(state.mCarPowerStateListenerState);
+        int wakeupSec;
+        synchronized (mLock) {
+            wakeupSec = mNextWakeupSec;
+        }
         switch (state.mCarPowerStateListenerState) {
             case CarPowerStateListener.SUSPEND_ENTER:
-                mHal.sendSleepEntry(mNextWakeupSec);
+                mHal.sendSleepEntry(wakeupSec);
                 break;
             case CarPowerStateListener.SHUTDOWN_ENTER:
-                mHal.sendShutdownStart(mNextWakeupSec);
+                mHal.sendShutdownStart(wakeupSec);
                 break;
         }
     }
 
     private void handleFinish() {
-        boolean mustShutDown;
         boolean simulatedMode;
-        synchronized (mSimulationSleepObject) {
+        synchronized (mSimulationWaitObject) {
             simulatedMode = mInSimulatedDeepSleepMode;
+        }
+        boolean mustShutDown;
+        boolean forceReboot;
+        synchronized (mLock) {
             mustShutDown = mShutdownOnFinish && !simulatedMode;
+            forceReboot = mRebootAfterGarageMode;
+            mRebootAfterGarageMode = false;
+        }
+        if (forceReboot) {
+            PowerManager powerManager = mContext.getSystemService(PowerManager.class);
+            if (powerManager == null) {
+                Log.wtf(CarLog.TAG_POWER, "No PowerManager. Cannot reboot.");
+            } else {
+                Log.i(CarLog.TAG_POWER, "GarageMode has completed. Forcing reboot.");
+                powerManager.reboot("GarageModeReboot");
+                throw new AssertionError("Should not return from PowerManager.reboot()");
+            }
         }
         if (mustShutDown) {
             // shutdown HU
@@ -378,17 +581,16 @@
         } else {
             doHandleDeepSleep(simulatedMode);
         }
+        mShutdownOnNextSuspend = false;
     }
 
-    @GuardedBy("this")
+    @GuardedBy("mLock")
     private void releaseTimerLocked() {
-        synchronized (CarPowerManagementService.this) {
-            if (mTimer != null) {
-                mTimer.cancel();
-            }
-            mTimer = null;
-            mTimerActive = false;
+        if (mTimer != null) {
+            mTimer.cancel();
         }
+        mTimer = null;
+        mTimerActive = false;
     }
 
     private void doHandlePreprocessing() {
@@ -407,7 +609,7 @@
         }
         Log.i(CarLog.TAG_POWER, "processing before shutdown expected for: "
                 + sShutdownPrepareTimeMs + " ms, adding polling:" + pollingCount);
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mProcessingStartTime = SystemClock.elapsedRealtime();
             releaseTimerLocked();
             mTimer = new Timer();
@@ -433,7 +635,7 @@
         // see the list go empty and we will think that we are done.
         boolean haveSomeCompleters = false;
         PowerManagerCallbackList completingListeners = new PowerManagerCallbackList();
-        synchronized (mListenersWeAreWaitingFor) {
+        synchronized (mLock) {
             mListenersWeAreWaitingFor.clear();
             int idx = mPowerManagerListenersWithCompletion.beginBroadcast();
             while (idx-- > 0) {
@@ -464,7 +666,7 @@
                 listener.onStateChanged(newState);
             } catch (RemoteException e) {
                 // It's likely the connection snapped. Let binder death handle the situation.
-                Log.e(CarLog.TAG_POWER, "onStateChanged() call failed: " + e, e);
+                Log.e(CarLog.TAG_POWER, "onStateChanged() call failed", e);
             }
         }
         listenerList.finishBroadcast();
@@ -475,28 +677,33 @@
         // enterDeepSleep should force sleep entry even if wake lock is kept.
         mSystemInterface.switchToPartialWakeLock();
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             handler = mHandler;
         }
         handler.cancelProcessingComplete();
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             mLastSleepEntryTime = SystemClock.elapsedRealtime();
         }
         int nextListenerState;
         if (simulatedMode) {
-            simulateSleepByLooping();
+            simulateSleepByWaiting();
             nextListenerState = CarPowerStateListener.SHUTDOWN_CANCELLED;
         } else {
             boolean sleepSucceeded = mSystemInterface.enterDeepSleep();
             if (!sleepSucceeded) {
-                // VHAL should transition CPMS to shutdown.
+                // Suspend failed! VHAL should transition CPMS to shutdown.
                 Log.e(CarLog.TAG_POWER, "Sleep did not succeed. Now attempting to shut down.");
                 mSystemInterface.shutdown();
+                return;
             }
             nextListenerState = CarPowerStateListener.SUSPEND_EXIT;
         }
-        // On wake, reset nextWakeup time. If not set again, system will suspend/shutdown forever.
-        mNextWakeupSec = 0;
+        // On resume, reset nextWakeup time. If not set again, system will suspend/shutdown forever.
+        synchronized (mLock) {
+            mIsResuming = true;
+            mNextWakeupSec = 0;
+        }
+        Log.i(CarLog.TAG_POWER, "Resuming after suspending");
         mSystemInterface.refreshDisplayBrightness();
         onApPowerStateChange(CpmsState.WAIT_FOR_VHAL, nextListenerState);
     }
@@ -537,26 +744,24 @@
     }
 
     private void doHandleProcessingComplete() {
-        synchronized (CarPowerManagementService.this) {
+        int listenerState;
+        synchronized (mLock) {
             releaseTimerLocked();
             if (!mShutdownOnFinish && mLastSleepEntryTime > mProcessingStartTime) {
                 // entered sleep after processing start. So this could be duplicate request.
                 Log.w(CarLog.TAG_POWER, "Duplicate sleep entry request, ignore");
                 return;
             }
+            listenerState = mShutdownOnFinish
+                    ? CarPowerStateListener.SHUTDOWN_ENTER : CarPowerStateListener.SUSPEND_ENTER;
         }
-
-        if (mShutdownOnFinish) {
-            onApPowerStateChange(CpmsState.WAIT_FOR_FINISH, CarPowerStateListener.SHUTDOWN_ENTER);
-        } else {
-            onApPowerStateChange(CpmsState.WAIT_FOR_FINISH, CarPowerStateListener.SUSPEND_ENTER);
-        }
+        onApPowerStateChange(CpmsState.WAIT_FOR_FINISH, listenerState);
     }
 
     @Override
     public void onDisplayBrightnessChange(int brightness) {
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             handler = mHandler;
         }
         handler.handleDisplayBrightnessChange(brightness);
@@ -572,7 +777,7 @@
 
     public void handleMainDisplayChanged(boolean on) {
         PowerHandler handler;
-        synchronized (CarPowerManagementService.this) {
+        synchronized (mLock) {
             handler = mHandler;
         }
         handler.handleMainDisplayStateChange(on);
@@ -586,8 +791,13 @@
         mHal.sendDisplayBrightness(brightness);
     }
 
-    public synchronized Handler getHandler() {
-        return mHandler;
+    /**
+     * Get the PowerHandler that we use to change power states
+     */
+    public Handler getHandler() {
+        synchronized (mLock) {
+            return mHandler;
+        }
     }
 
     // Binder interface for general use.
@@ -628,7 +838,9 @@
     @Override
     public void requestShutdownOnNextSuspend() {
         ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_POWER);
-        mShutdownOnFinish = true;
+        synchronized (mLock) {
+            mShutdownOnNextSuspend = true;
+        }
     }
 
     @Override
@@ -639,27 +851,31 @@
     }
 
     @Override
-    public synchronized void scheduleNextWakeupTime(int seconds) {
+    public void scheduleNextWakeupTime(int seconds) {
         if (seconds < 0) {
-            Log.w(CarLog.TAG_POWER, "Next wake up can not be in negative time. Ignoring!");
+            Log.w(CarLog.TAG_POWER, "Next wake up time is negative. Ignoring!");
             return;
         }
-        if (!mHal.isTimedWakeupAllowed()) {
-            Log.w(CarLog.TAG_POWER, "Setting timed wakeups are disabled in HAL. Skipping");
-            mNextWakeupSec = 0;
-            return;
-        }
-        if (mNextWakeupSec == 0 || mNextWakeupSec > seconds) {
-            mNextWakeupSec = seconds;
-        } else {
-            Log.d(CarLog.TAG_POWER, "Tried to schedule next wake up, but already had shorter "
-                    + "scheduled time");
+        boolean timedWakeupAllowed = mHal.isTimedWakeupAllowed();
+        synchronized (mLock) {
+            if (!timedWakeupAllowed) {
+                Log.w(CarLog.TAG_POWER, "Setting timed wakeups are disabled in HAL. Skipping");
+                mNextWakeupSec = 0;
+                return;
+            }
+            if (mNextWakeupSec == 0 || mNextWakeupSec > seconds) {
+                // The new value is sooner than the old value. Take the new value.
+                mNextWakeupSec = seconds;
+            } else {
+                Log.d(CarLog.TAG_POWER, "Tried to schedule next wake up, but already had shorter "
+                        + "scheduled time");
+            }
         }
     }
 
     private void finishedImpl(IBinder binder) {
         boolean allAreComplete = false;
-        synchronized (mListenersWeAreWaitingFor) {
+        synchronized (mLock) {
             boolean oneWasRemoved = mListenersWeAreWaitingFor.remove(binder);
             allAreComplete = oneWasRemoved && mListenersWeAreWaitingFor.isEmpty();
         }
@@ -673,7 +889,7 @@
                 || mCurrentState.mState == CpmsState.SIMULATE_SLEEP) {
             PowerHandler powerHandler;
             // All apps are ready to shutdown/suspend.
-            synchronized (CarPowerManagementService.this) {
+            synchronized (mLock) {
                 if (!mShutdownOnFinish) {
                     if (mLastSleepEntryTime > mProcessingStartTime
                             && mLastSleepEntryTime < SystemClock.elapsedRealtime()) {
@@ -765,7 +981,7 @@
 
         @Override
         public void run() {
-            synchronized (CarPowerManagementService.this) {
+            synchronized (mLock) {
                 if (!mTimerActive) {
                     // Ignore timer expiration since we got cancelled
                     return;
@@ -927,25 +1143,30 @@
         }
         handler.handlePowerStateChange();
 
-        synchronized (mSimulationSleepObject) {
+        synchronized (mSimulationWaitObject) {
             mWakeFromSimulatedSleep = true;
-            mSimulationSleepObject.notify();
+            mSimulationWaitObject.notify();
         }
     }
 
     /**
-     * Manually enter simulated suspend (Deep Sleep) mode
-     * Invoked using "adb shell dumpsys activity service com.android.car suspend".
+     * Manually enter simulated suspend (Deep Sleep) mode, trigging Garage mode.
+     * If the parameter is 'true', reboot the system when Garage Mode completes.
+     *
+     * Invoked using "adb shell dumpsys activity service com.android.car suspend" or
+     * "adb shell dumpsys activity service com.android.car garage-mode reboot".
      * This is similar to 'onApPowerStateChange()' except that it needs to create a CpmsState
      * that is not directly derived from a VehicleApPowerStateReq.
      */
-    public void forceSimulatedSuspend() {
-        synchronized (mSimulationSleepObject) {
+    @VisibleForTesting
+    void forceSuspendAndMaybeReboot(boolean shouldReboot) {
+        synchronized (mSimulationWaitObject) {
             mInSimulatedDeepSleepMode = true;
             mWakeFromSimulatedSleep = false;
         }
         PowerHandler handler;
-        synchronized (this) {
+        synchronized (mLock) {
+            mRebootAfterGarageMode = shouldReboot;
             mPendingPowerStates.addFirst(new CpmsState(CpmsState.SIMULATE_SLEEP,
                                                        CarPowerStateListener.SHUTDOWN_PREPARE));
             handler = mHandler;
@@ -956,19 +1177,20 @@
     // In a real Deep Sleep, the hardware removes power from the CPU (but retains power
     // on the RAM). This puts the processor to sleep. Upon some external signal, power
     // is re-applied to the CPU, and processing resumes right where it left off.
-    // We simulate this behavior by simply going into a loop.
-    // We exit the loop when forceResume() is called.
-    private void simulateSleepByLooping() {
-        Log.i(CarLog.TAG_POWER, "Starting to simulate Deep Sleep by looping");
-        synchronized (mSimulationSleepObject) {
+    // We simulate this behavior by calling wait().
+    // We continue from wait() when forceSimulatedResume() is called.
+    private void simulateSleepByWaiting() {
+        Log.i(CarLog.TAG_POWER, "Starting to simulate Deep Sleep by waiting");
+        synchronized (mSimulationWaitObject) {
             while (!mWakeFromSimulatedSleep) {
                 try {
-                    mSimulationSleepObject.wait();
+                    mSimulationWaitObject.wait();
                 } catch (InterruptedException ignored) {
+                    Thread.currentThread().interrupt(); // Restore interrupted status
                 }
             }
             mInSimulatedDeepSleepMode = false;
         }
-        Log.i(CarLog.TAG_POWER, "Exit Deep Sleep simulation loop");
+        Log.i(CarLog.TAG_POWER, "Exit Deep Sleep simulation");
     }
 }
diff --git a/service/src/com/android/car/CarProjectionService.java b/service/src/com/android/car/CarProjectionService.java
index def3299..5d15d8f 100644
--- a/service/src/com/android/car/CarProjectionService.java
+++ b/service/src/com/android/car/CarProjectionService.java
@@ -157,6 +157,20 @@
             }
         };
 
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            int currState = intent.getIntExtra(EXTRA_WIFI_AP_STATE, WIFI_AP_STATE_DISABLED);
+            int prevState = intent.getIntExtra(EXTRA_PREVIOUS_WIFI_AP_STATE,
+                    WIFI_AP_STATE_DISABLED);
+            int errorCode = intent.getIntExtra(EXTRA_WIFI_AP_FAILURE_REASON, 0);
+            String ifaceName = intent.getStringExtra(EXTRA_WIFI_AP_INTERFACE_NAME);
+            int mode = intent.getIntExtra(EXTRA_WIFI_AP_MODE,
+                    WifiManager.IFACE_IP_MODE_UNSPECIFIED);
+            handleWifiApStateChange(currState, prevState, errorCode, ifaceName, mode);
+        }
+    };
+
     private boolean mBound;
     private Intent mRegisteredService;
 
@@ -644,6 +658,11 @@
             public void onStopped() {
                 Log.i(TAG, "Local-only hotspot stopped.");
                 synchronized (mLock) {
+                    if (mLocalOnlyHotspotReservation != null) {
+                        // We must explicitly released old reservation object, otherwise it may
+                        // unexpectedly stop LOHS later because it overrode finalize() method.
+                        mLocalOnlyHotspotReservation.close();
+                    }
                     mLocalOnlyHotspotReservation = null;
                 }
                 sendApStopped();
@@ -731,22 +750,7 @@
     @Override
     public void init() {
         mContext.registerReceiver(
-                new BroadcastReceiver() {
-                    @Override
-                    public void onReceive(Context context, Intent intent) {
-                        final int currState = intent.getIntExtra(EXTRA_WIFI_AP_STATE,
-                                WIFI_AP_STATE_DISABLED);
-                        final int prevState = intent.getIntExtra(EXTRA_PREVIOUS_WIFI_AP_STATE,
-                                WIFI_AP_STATE_DISABLED);
-                        final int errorCode = intent.getIntExtra(EXTRA_WIFI_AP_FAILURE_REASON, 0);
-                        final String ifaceName =
-                                intent.getStringExtra(EXTRA_WIFI_AP_INTERFACE_NAME);
-                        final int mode = intent.getIntExtra(EXTRA_WIFI_AP_MODE,
-                                WifiManager.IFACE_IP_MODE_UNSPECIFIED);
-                        handleWifiApStateChange(currState, prevState, errorCode, ifaceName, mode);
-                    }
-                },
-                new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION));
+                mBroadcastReceiver, new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION));
     }
 
     private void handleWifiApStateChange(int currState, int prevState, int errorCode,
@@ -773,6 +777,7 @@
         synchronized (mLock) {
             mKeyEventHandlers.clear();
         }
+        mContext.unregisterReceiver(mBroadcastReceiver);
     }
 
     @Override
diff --git a/service/src/com/android/car/CarPropertyService.java b/service/src/com/android/car/CarPropertyService.java
index 3b4e388..c9a14c9 100644
--- a/service/src/com/android/car/CarPropertyService.java
+++ b/service/src/com/android/car/CarPropertyService.java
@@ -18,6 +18,7 @@
 
 import static java.lang.Integer.toHexString;
 
+import android.car.Car;
 import android.car.hardware.CarPropertyConfig;
 import android.car.hardware.CarPropertyValue;
 import android.car.hardware.property.CarPropertyEvent;
@@ -348,6 +349,10 @@
             return;
         }
         ICarImpl.assertPermission(mContext, mHal.getWritePermission(propId));
+        // need an extra permission for writing display units properties.
+        if (mHal.isDisplayUnitsProperty(propId)) {
+            ICarImpl.assertPermission(mContext, Car.PERMISSION_VENDOR_EXTENSION);
+        }
         mHal.setProperty(prop);
     }
 
diff --git a/service/src/com/android/car/CarService.java b/service/src/com/android/car/CarService.java
index 509ecdd..044c791 100644
--- a/service/src/com/android/car/CarService.java
+++ b/service/src/com/android/car/CarService.java
@@ -25,6 +25,7 @@
 import android.os.Build;
 import android.os.IBinder;
 import android.os.IHwBinder.DeathRecipient;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
@@ -41,6 +42,8 @@
 
 public class CarService extends Service {
 
+    private static final boolean RESTART_CAR_SERVICE_WHEN_VHAL_CRASH = true;
+
     private static final long WAIT_FOR_VEHICLE_HAL_TIMEOUT_MS = 10_000;
 
     private static final boolean IS_USER_BUILD = "user".equals(Build.TYPE);
@@ -96,6 +99,7 @@
         linkToDeath(mVehicle, mVehicleDeathRecipient);
 
         ServiceManager.addService("car_service", mICarImpl);
+        ServiceManager.addService("car_stats", mICarImpl.getStatsService());
         SystemProperties.set("boot.car_service_created", "1");
         super.onCreate();
     }
@@ -178,7 +182,13 @@
 
         @Override
         public void serviceDied(long cookie) {
-            Log.w(CarLog.TAG_SERVICE, "Vehicle HAL died.");
+            if (RESTART_CAR_SERVICE_WHEN_VHAL_CRASH) {
+                Log.wtf(CarLog.TAG_SERVICE, "***Vehicle HAL died. Car service will restart***");
+                Process.killProcess(Process.myPid());
+                return;
+            }
+
+            Log.wtf(CarLog.TAG_SERVICE, "***Vehicle HAL died.***");
 
             try {
                 mVehicle.unlinkToDeath(this);
diff --git a/service/src/com/android/car/CarServiceBase.java b/service/src/com/android/car/CarServiceBase.java
index e014cf0..c4b578d 100644
--- a/service/src/com/android/car/CarServiceBase.java
+++ b/service/src/com/android/car/CarServiceBase.java
@@ -36,7 +36,4 @@
     default void vehicleHalReconnected() {}
 
     void dump(PrintWriter writer);
-
-    /** Called when we only want to dump metrics instead of everything else. */
-    default void dumpMetrics(PrintWriter writer) {};
 }
diff --git a/service/src/com/android/car/CarTestService.java b/service/src/com/android/car/CarTestService.java
index 8c3f64d..d72d87d 100644
--- a/service/src/com/android/car/CarTestService.java
+++ b/service/src/com/android/car/CarTestService.java
@@ -22,6 +22,8 @@
 import android.os.RemoteException;
 import android.util.Log;
 
+import com.android.internal.annotations.GuardedBy;
+
 import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,6 +41,9 @@
     private final Context mContext;
     private final ICarImpl mICarImpl;
 
+    private final Object mLock = new Object();
+
+    @GuardedBy("mLock")
     private final Map<IBinder, TokenDeathRecipient> mTokens = new HashMap<>();
 
     CarTestService(Context context, ICarImpl carImpl) {
@@ -69,7 +74,7 @@
         Log.d(TAG, "stopCarService, token: " + token);
         ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_TEST_SERVICE);
 
-        synchronized (this) {
+        synchronized (mLock) {
             if (mTokens.containsKey(token)) {
                 Log.w(TAG, "Calling stopCarService twice with the same token.");
                 return;
@@ -80,7 +85,7 @@
             token.linkToDeath(deathRecipient, 0);
 
             if (mTokens.size() == 1) {
-                mICarImpl.release();
+                CarServiceUtils.runOnMainSync(mICarImpl::release);
             }
         }
     }
@@ -92,15 +97,17 @@
         releaseToken(token);
     }
 
-    private synchronized void releaseToken(IBinder token) {
+    private void releaseToken(IBinder token) {
         Log.d(TAG, "releaseToken, token: " + token);
-        DeathRecipient deathRecipient = mTokens.remove(token);
-        if (deathRecipient != null) {
-            token.unlinkToDeath(deathRecipient, 0);
-        }
+        synchronized (mLock) {
+            DeathRecipient deathRecipient = mTokens.remove(token);
+            if (deathRecipient != null) {
+                token.unlinkToDeath(deathRecipient, 0);
+            }
 
-        if (mTokens.size() == 0) {
-            CarServiceUtils.runOnMain(mICarImpl::init);
+            if (mTokens.size() == 0) {
+                CarServiceUtils.runOnMainSync(mICarImpl::init);
+            }
         }
     }
 
@@ -116,4 +123,4 @@
             releaseToken(mToken);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/service/src/com/android/car/CarUxRestrictionsConfigurationXmlParser.java b/service/src/com/android/car/CarUxRestrictionsConfigurationXmlParser.java
index 0a37491..15e71d1 100644
--- a/service/src/com/android/car/CarUxRestrictionsConfigurationXmlParser.java
+++ b/service/src/com/android/car/CarUxRestrictionsConfigurationXmlParser.java
@@ -270,7 +270,7 @@
         }
 
         int restrictions = UX_RESTRICTIONS_UNKNOWN;
-        int restrictionMode = UX_RESTRICTION_MODE_BASELINE;
+        String restrictionMode = UX_RESTRICTION_MODE_BASELINE;
         boolean requiresOpt = true;
         while (RESTRICTIONS.equals(parser.getName())
                 && parser.getEventType() == XmlResourceParser.START_TAG) {
@@ -281,12 +281,14 @@
                     CarUxRestrictions.UX_RESTRICTIONS_FULLY_RESTRICTED);
             requiresOpt = a.getBoolean(
                     R.styleable.UxRestrictions_Restrictions_requiresDistractionOptimization, true);
-            restrictionMode = a.getInt(
-                    R.styleable.UxRestrictions_Restrictions_mode, UX_RESTRICTION_MODE_BASELINE);
+            restrictionMode = a.getString(R.styleable.UxRestrictions_Restrictions_mode);
 
             a.recycle();
             parser.next();
         }
+        if (restrictionMode == null) {
+            restrictionMode = UX_RESTRICTION_MODE_BASELINE;
+        }
         return new DrivingStateRestrictions()
                 .setDistractionOptimizationRequired(requiresOpt)
                 .setRestrictions(restrictions)
diff --git a/service/src/com/android/car/CarUxRestrictionsManagerService.java b/service/src/com/android/car/CarUxRestrictionsManagerService.java
index 8b5e9e1..0ea757f 100644
--- a/service/src/com/android/car/CarUxRestrictionsManagerService.java
+++ b/service/src/com/android/car/CarUxRestrictionsManagerService.java
@@ -24,6 +24,7 @@
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
+import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.car.Car;
@@ -51,6 +52,7 @@
 import android.util.ArraySet;
 import android.util.AtomicFile;
 import android.util.JsonReader;
+import android.util.JsonToken;
 import android.util.JsonWriter;
 import android.util.Log;
 import android.util.Slog;
@@ -60,6 +62,7 @@
 import com.android.car.systeminterface.SystemInterface;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.Preconditions;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -69,6 +72,8 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -77,6 +82,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -85,7 +91,7 @@
  * <p>
  * <h1>UX Restrictions Configuration</h1>
  * When this service starts, it will first try reading the configuration set through
- * {@link #saveUxRestrictionsConfigurationForNextBoot(CarUxRestrictionsConfiguration)}.
+ * {@link #saveUxRestrictionsConfigurationForNextBoot(List)}.
  * If one is not available, it will try reading the configuration saved in
  * {@code R.xml.car_ux_restrictions_map}. If XML is somehow unavailable, it will
  * fall back to a hard-coded configuration.
@@ -103,6 +109,17 @@
     private static final float SPEED_NOT_AVAILABLE = -1.0F;
     private static final byte DEFAULT_PORT = 0;
 
+    private static final int UNKNOWN_JSON_SCHEMA_VERSION = -1;
+    private static final int JSON_SCHEMA_VERSION_V1 = 1;
+    private static final int JSON_SCHEMA_VERSION_V2 = 2;
+
+    @IntDef({UNKNOWN_JSON_SCHEMA_VERSION, JSON_SCHEMA_VERSION_V1, JSON_SCHEMA_VERSION_V2})
+    @Retention(RetentionPolicy.SOURCE)
+    private @interface JsonSchemaVersion {}
+
+    private static final String JSON_NAME_SCHEMA_VERSION = "schema_version";
+    private static final String JSON_NAME_RESTRICTIONS = "restrictions";
+
     @VisibleForTesting
     static final String CONFIG_FILENAME_PRODUCTION = "ux_restrictions_prod_config.json";
     @VisibleForTesting
@@ -126,8 +143,7 @@
     private Map<Byte, CarUxRestrictionsConfiguration> mCarUxRestrictionsConfigurations;
     private Map<Byte, CarUxRestrictions> mCurrentUxRestrictions;
 
-    @CarUxRestrictionsManager.UxRestrictionMode
-    private int mRestrictionMode = UX_RESTRICTION_MODE_BASELINE;
+    private String mRestrictionMode = UX_RESTRICTION_MODE_BASELINE;
 
     // Flag to disable broadcasting UXR changes - for development purposes
     @GuardedBy("this")
@@ -157,22 +173,23 @@
             mCurrentUxRestrictions.put(port, createUnrestrictedRestrictions());
         }
 
-        // subscribe to driving State
+        // Load the prod config, or if there is a staged one, promote that first only if the
+        // current driving state, as provided by the driving state service, is parked.
+        mCarUxRestrictionsConfigurations = convertToMap(loadConfig());
+
+        // subscribe to driving state changes
         mDrivingStateService.registerDrivingStateChangeListener(
                 mICarDrivingStateChangeEventListener);
         // subscribe to property service for speed
         mCarPropertyService.registerListener(VehicleProperty.PERF_VEHICLE_SPEED,
                 PROPERTY_UPDATE_RATE, mICarPropertyEventListener);
 
-        // At this point the driving state is known, which determines whether it's safe
-        // to promote staged new config.
-        mCarUxRestrictionsConfigurations = convertToMap(loadConfig());
-
         initializeUxRestrictions();
     }
 
     @Override
     public List<CarUxRestrictionsConfiguration> getConfigs() {
+        ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION);
         return new ArrayList<>(mCarUxRestrictionsConfigurations.values());
     }
 
@@ -181,13 +198,13 @@
      *
      * <p>Reads config from the following sources in order:
      * <ol>
-     * <li>saved config set by
-     * {@link #saveUxRestrictionsConfigurationForNextBoot(CarUxRestrictionsConfiguration)};
+     * <li>saved config set by {@link #saveUxRestrictionsConfigurationForNextBoot(List)};
      * <li>XML resource config from {@code R.xml.car_ux_restrictions_map};
      * <li>hardcoded default config.
      * </ol>
      *
-     * This method attempts to promote staged config file. Doing which depends on driving state.
+     * This method attempts to promote staged config file, which requires getting the current
+     * driving state.
      */
     @VisibleForTesting
     synchronized List<CarUxRestrictionsConfiguration> loadConfig() {
@@ -237,6 +254,10 @@
         return null;
     }
 
+    /**
+     * Promotes the staged config to prod, by replacing the prod file. Only do this if the car is
+     * parked to avoid changing the restrictions during a drive.
+     */
     private void promoteStagedConfig() {
         Path stagedConfig = getFile(CONFIG_FILENAME_STAGED).toPath();
 
@@ -409,6 +430,8 @@
     @Override
     @Nullable
     public List<CarUxRestrictionsConfiguration> getStagedConfigs() {
+        ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION);
+
         File stagedConfig = getFile(CONFIG_FILENAME_STAGED);
         if (stagedConfig.exists()) {
             logd("Attempting to read staged config");
@@ -425,22 +448,24 @@
      *
      * <p>Defaults to {@link CarUxRestrictionsManager#UX_RESTRICTION_MODE_BASELINE}.
      *
-     * @param mode See values in {@link CarUxRestrictionsManager.UxRestrictionMode}.
+     * @param mode the restriction mode
      * @return {@code true} if mode was successfully changed; {@code false} otherwise.
      * @see CarUxRestrictionsConfiguration.DrivingStateRestrictions
      * @see CarUxRestrictionsConfiguration.Builder
      */
     @Override
-    public synchronized boolean setRestrictionMode(
-            @CarUxRestrictionsManager.UxRestrictionMode int mode) {
-        if (mRestrictionMode == mode) {
+    public synchronized boolean setRestrictionMode(@NonNull String mode) {
+        ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION);
+        Objects.requireNonNull(mode, "mode must not be null");
+
+        if (mRestrictionMode.equals(mode)) {
             return true;
         }
 
         addTransitionLog(TAG, mRestrictionMode, mode, System.currentTimeMillis(),
                 "Restriction mode");
         mRestrictionMode = mode;
-        logd("Set restriction mode to: " + CarUxRestrictionsManager.modeToString(mode));
+        logd("Set restriction mode to: " + mode);
 
         handleDispatchUxRestrictions(
                 mDrivingStateService.getCurrentDrivingState().eventValue, getCurrentSpeed());
@@ -448,8 +473,10 @@
     }
 
     @Override
-    @CarUxRestrictionsManager.UxRestrictionMode
-    public synchronized int getRestrictionMode() {
+    @NonNull
+    public synchronized String getRestrictionMode() {
+        ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION);
+
         return mRestrictionMode;
     }
 
@@ -470,11 +497,15 @@
         }
         try (JsonWriter jsonWriter = new JsonWriter(
                 new OutputStreamWriter(fos, StandardCharsets.UTF_8))) {
+            jsonWriter.beginObject();
+            jsonWriter.name(JSON_NAME_SCHEMA_VERSION).value(JSON_SCHEMA_VERSION_V2);
+            jsonWriter.name(JSON_NAME_RESTRICTIONS);
             jsonWriter.beginArray();
             for (CarUxRestrictionsConfiguration config : configs) {
                 config.writeJson(jsonWriter);
             }
             jsonWriter.endArray();
+            jsonWriter.endObject();
         } catch (IOException e) {
             Log.e(TAG, "Could not persist config", e);
             stagedFile.failWrite(fos);
@@ -491,15 +522,26 @@
             return null;
         }
 
+        // Take one pass at the file to check the version and then a second pass to read the
+        // contents. We could assess the version and read in one pass, but we're preferring
+        // clarity over complexity here.
+        int schemaVersion = readFileSchemaVersion(file);
+
         AtomicFile configFile = new AtomicFile(file);
         try (JsonReader reader = new JsonReader(
                 new InputStreamReader(configFile.openRead(), StandardCharsets.UTF_8))) {
             List<CarUxRestrictionsConfiguration> configs = new ArrayList<>();
-            reader.beginArray();
-            while (reader.hasNext()) {
-                configs.add(CarUxRestrictionsConfiguration.readJson(reader));
+            switch (schemaVersion) {
+                case JSON_SCHEMA_VERSION_V1:
+                    readV1Json(reader, configs);
+                    break;
+                case JSON_SCHEMA_VERSION_V2:
+                    readV2Json(reader, configs);
+                    break;
+                default:
+                    Log.e(TAG, "Unable to parse schema for version " + schemaVersion);
             }
-            reader.endArray();
+
             return configs;
         } catch (IOException e) {
             Log.e(TAG, "Could not read persisted config file " + file.getName(), e);
@@ -507,6 +549,68 @@
         return null;
     }
 
+    private void readV1Json(JsonReader reader,
+            List<CarUxRestrictionsConfiguration> configs) throws IOException {
+        readRestrictionsArray(reader, configs, JSON_SCHEMA_VERSION_V1);
+    }
+
+    private void readV2Json(JsonReader reader,
+            List<CarUxRestrictionsConfiguration> configs) throws IOException {
+        reader.beginObject();
+        while (reader.hasNext()) {
+            String name = reader.nextName();
+            switch (name) {
+                case JSON_NAME_RESTRICTIONS:
+                    readRestrictionsArray(reader, configs, JSON_SCHEMA_VERSION_V2);
+                    break;
+                default:
+                    reader.skipValue();
+            }
+        }
+        reader.endObject();
+    }
+
+    private int readFileSchemaVersion(File file) {
+        AtomicFile configFile = new AtomicFile(file);
+        try (JsonReader reader = new JsonReader(
+                new InputStreamReader(configFile.openRead(), StandardCharsets.UTF_8))) {
+            List<CarUxRestrictionsConfiguration> configs = new ArrayList<>();
+            if (reader.peek() == JsonToken.BEGIN_ARRAY) {
+                // only schema V1 beings with an array - no need to keep reading
+                reader.close();
+                return JSON_SCHEMA_VERSION_V1;
+            } else {
+                reader.beginObject();
+                while (reader.hasNext()) {
+                    String name = reader.nextName();
+                    switch (name) {
+                        case JSON_NAME_SCHEMA_VERSION:
+                            int schemaVersion = reader.nextInt();
+                            // got the version, no need to continue reading
+                            reader.close();
+                            return schemaVersion;
+                        default:
+                            reader.skipValue();
+                    }
+                }
+                reader.endObject();
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "Could not read persisted config file " + file.getName(), e);
+        }
+        return UNKNOWN_JSON_SCHEMA_VERSION;
+    }
+
+    private void readRestrictionsArray(JsonReader reader,
+            List<CarUxRestrictionsConfiguration> configs, @JsonSchemaVersion int schemaVersion)
+            throws IOException {
+        reader.beginArray();
+        while (reader.hasNext()) {
+            configs.add(CarUxRestrictionsConfiguration.readJson(reader, schemaVersion));
+        }
+        reader.endArray();
+    }
+
     /**
      * Enable/disable UX restrictions change broadcast blocking.
      * Setting this to true will stop broadcasts of UX restriction change to listeners.
@@ -699,6 +803,11 @@
      */
     private synchronized void handleDispatchUxRestrictions(@CarDrivingState int currentDrivingState,
             float speed) {
+        Preconditions.checkNotNull(mCarUxRestrictionsConfigurations,
+                "mCarUxRestrictionsConfigurations must be initialized");
+        Preconditions.checkNotNull(mCurrentUxRestrictions,
+                "mCurrentUxRestrictions must be initialized");
+
         if (isDebugBuild() && !mUxRChangeBroadcastEnabled) {
             Log.d(TAG, "Not dispatching UX Restriction due to setting");
             return;
@@ -922,7 +1031,8 @@
                 .build();
     }
 
-    private void addTransitionLog(String name, int from, int to, long timestamp, String extra) {
+    private void addTransitionLog(String name, String from, String to, long timestamp,
+            String extra) {
         if (mTransitionLogs.size() >= MAX_TRANSITION_LOG_SIZE) {
             mTransitionLogs.remove();
         }
diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index d5809c4..483dd7f 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -18,12 +18,15 @@
 
 import android.annotation.MainThread;
 import android.app.ActivityManager;
+import android.app.ActivityOptions;
 import android.app.UiModeManager;
 import android.car.Car;
 import android.car.ICar;
 import android.car.cluster.renderer.IInstrumentClusterNavigation;
 import android.car.userlib.CarUserManagerHelper;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.IVehicle;
@@ -32,19 +35,25 @@
 import android.os.Build;
 import android.os.IBinder;
 import android.os.Process;
+import android.os.SystemClock;
 import android.os.Trace;
 import android.util.Log;
 import android.util.Slog;
 import android.util.TimingsTraceLog;
+import android.view.KeyEvent;
 
+import com.android.car.am.FixedActivityService;
 import com.android.car.audio.CarAudioService;
 import com.android.car.cluster.InstrumentClusterService;
 import com.android.car.garagemode.GarageModeService;
+import com.android.car.hal.InputHalService;
 import com.android.car.hal.VehicleHal;
 import com.android.car.internal.FeatureConfiguration;
 import com.android.car.pm.CarPackageManagerService;
+import com.android.car.stats.CarStatsService;
 import com.android.car.systeminterface.SystemInterface;
 import com.android.car.trust.CarTrustedDeviceService;
+import com.android.car.user.CarUserNoticeService;
 import com.android.car.user.CarUserService;
 import com.android.car.vms.VmsBrokerService;
 import com.android.car.vms.VmsClientManager;
@@ -62,6 +71,7 @@
     public static final String INTERNAL_INPUT_SERVICE = "internal_input";
     public static final String INTERNAL_SYSTEM_ACTIVITY_MONITORING_SERVICE =
             "system_activity_monitoring";
+    public static final String INTERNAL_VMS_MANAGER = "vms_manager";
 
     private final Context mContext;
     private final VehicleHal mHal;
@@ -79,6 +89,7 @@
     private final CarPropertyService mCarPropertyService;
     private final CarNightService mCarNightService;
     private final AppFocusService mAppFocusService;
+    private final FixedActivityService mFixedActivityService;
     private final GarageModeService mGarageModeService;
     private final InstrumentClusterService mInstrumentClusterService;
     private final CarLocationService mCarLocationService;
@@ -92,11 +103,13 @@
     private final CarMediaService mCarMediaService;
     private final CarUserManagerHelper mUserManagerHelper;
     private final CarUserService mCarUserService;
+    private final CarUserNoticeService mCarUserNoticeService;
     private final VmsClientManager mVmsClientManager;
     private final VmsBrokerService mVmsBrokerService;
     private final VmsSubscriberService mVmsSubscriberService;
     private final VmsPublisherService mVmsPublisherService;
     private final CarBugreportManagerService mCarBugreportManagerService;
+    private final CarStatsService mCarStatsService;
 
     private final CarServiceBase[] mAllServices;
 
@@ -118,7 +131,7 @@
             CanBusErrorNotifier errorNotifier, String vehicleInterfaceName) {
         mContext = serviceContext;
         mSystemInterface = systemInterface;
-        mHal = new VehicleHal(vehicle);
+        mHal = new VehicleHal(serviceContext, vehicle);
         mVehicleInterfaceName = vehicleInterfaceName;
         mUserManagerHelper = new CarUserManagerHelper(serviceContext);
         final Resources res = mContext.getResources();
@@ -129,6 +142,7 @@
         mSystemActivityMonitoringService = new SystemActivityMonitoringService(serviceContext);
         mCarPowerManagementService = new CarPowerManagementService(mContext, mHal.getPowerHal(),
                 systemInterface, mUserManagerHelper);
+        mCarUserNoticeService = new CarUserNoticeService(serviceContext);
         mCarPropertyService = new CarPropertyService(serviceContext, mHal.getPropertyHal());
         mCarDrivingStateService = new CarDrivingStateService(serviceContext, mCarPropertyService);
         mCarUXRestrictionsService = new CarUxRestrictionsManagerService(serviceContext,
@@ -146,17 +160,21 @@
         mAppFocusService = new AppFocusService(serviceContext, mSystemActivityMonitoringService);
         mCarAudioService = new CarAudioService(serviceContext);
         mCarNightService = new CarNightService(serviceContext, mCarPropertyService);
+        mFixedActivityService = new FixedActivityService(serviceContext);
         mInstrumentClusterService = new InstrumentClusterService(serviceContext,
                 mAppFocusService, mCarInputService);
         mSystemStateControllerService = new SystemStateControllerService(
                 serviceContext, mCarAudioService, this);
-        mVmsBrokerService = new VmsBrokerService(mContext.getPackageManager());
+        mCarStatsService = new CarStatsService(serviceContext);
+        mVmsBrokerService = new VmsBrokerService();
         mVmsClientManager = new VmsClientManager(
-                serviceContext, mCarUserService, mUserManagerHelper, mHal.getVmsHal());
+                // CarStatsService needs to be passed to the constructor due to HAL init order
+                serviceContext, mCarStatsService, mCarUserService, mVmsBrokerService,
+                mHal.getVmsHal());
         mVmsSubscriberService = new VmsSubscriberService(
-                serviceContext, mVmsBrokerService, mHal.getVmsHal());
+                serviceContext, mVmsBrokerService, mVmsClientManager, mHal.getVmsHal());
         mVmsPublisherService = new VmsPublisherService(
-                serviceContext, mVmsBrokerService, mVmsClientManager);
+                serviceContext, mCarStatsService, mVmsBrokerService, mVmsClientManager);
         mCarDiagnosticService = new CarDiagnosticService(serviceContext, mHal.getDiagnosticHal());
         mCarStorageMonitoringService = new CarStorageMonitoringService(serviceContext,
                 systemInterface);
@@ -170,9 +188,11 @@
         CarLocalServices.addService(CarPowerManagementService.class, mCarPowerManagementService);
         CarLocalServices.addService(CarUserService.class, mCarUserService);
         CarLocalServices.addService(CarTrustedDeviceService.class, mCarTrustedDeviceService);
+        CarLocalServices.addService(CarUserNoticeService.class, mCarUserNoticeService);
         CarLocalServices.addService(SystemInterface.class, mSystemInterface);
         CarLocalServices.addService(CarDrivingStateService.class, mCarDrivingStateService);
         CarLocalServices.addService(PerUserCarServiceHelper.class, mPerUserCarServiceHelper);
+        CarLocalServices.addService(FixedActivityService.class, mFixedActivityService);
 
         // Be careful with order. Service depending on other service should be inited later.
         List<CarServiceBase> allServices = new ArrayList<>();
@@ -185,9 +205,11 @@
         allServices.add(mCarPackageManagerService);
         allServices.add(mCarInputService);
         allServices.add(mGarageModeService);
+        allServices.add(mCarUserNoticeService);
         allServices.add(mAppFocusService);
         allServices.add(mCarAudioService);
         allServices.add(mCarNightService);
+        allServices.add(mFixedActivityService);
         allServices.add(mInstrumentClusterService);
         allServices.add(mSystemStateControllerService);
         allServices.add(mPerUserCarServiceHelper);
@@ -226,7 +248,6 @@
             mAllServices[i].release();
         }
         mHal.release();
-        CarLocalServices.removeAllServices();
     }
 
     void vehicleHalReconnected(IVehicle vehicle) {
@@ -249,6 +270,7 @@
     public void setUserLockStatus(int userHandle, int unlocked) {
         assertCallingFromSystemProcess();
         mCarUserService.setUserLockStatus(userHandle, unlocked == 1);
+        mCarMediaService.setUserLockStatus(userHandle, unlocked == 1);
     }
 
     @Override
@@ -359,6 +381,8 @@
                 return mCarInputService;
             case INTERNAL_SYSTEM_ACTIVITY_MONITORING_SERVICE:
                 return mSystemActivityMonitoringService;
+            case INTERNAL_VMS_MANAGER:
+                return mVmsClientManager;
             default:
                 Log.w(CarLog.TAG_SERVICE, "getCarInternalService for unknown service:" +
                         serviceName);
@@ -366,6 +390,10 @@
         }
     }
 
+    CarStatsService getStatsService() {
+        return mCarStatsService;
+    }
+
     public static void assertVehicleHalMockPermission(Context context) {
         assertPermission(context, Car.PERMISSION_MOCK_VEHICLE_HAL);
     }
@@ -457,7 +485,7 @@
             writer.println("*FutureConfig, DEFAULT:" + FeatureConfiguration.DEFAULT);
             writer.println("*Dump all services*");
 
-            dumpAllServices(writer, false);
+            dumpAllServices(writer);
 
             writer.println("*Dump Vehicle HAL*");
             writer.println("Vehicle HAL Interface: " + mVehicleInterfaceName);
@@ -469,8 +497,11 @@
                 e.printStackTrace(writer);
             }
         } else if ("--metrics".equals(args[0])) {
-            writer.println("*Dump car service metrics*");
-            dumpAllServices(writer, true);
+            // Strip the --metrics flag when passing dumpsys arguments to CarStatsService
+            // allowing for nested flag selection
+            mCarStatsService.dump(fd, writer, Arrays.copyOfRange(args, 1, args.length));
+        } else if ("--vms-hal".equals(args[0])) {
+            mHal.getVmsHal().dumpMetrics(fd);
         } else if (Build.IS_USERDEBUG || Build.IS_ENG) {
             execShellCmd(args, writer);
         } else {
@@ -478,23 +509,18 @@
         }
     }
 
-    private void dumpAllServices(PrintWriter writer, boolean dumpMetricsOnly) {
+    private void dumpAllServices(PrintWriter writer) {
         for (CarServiceBase service : mAllServices) {
-            dumpService(service, writer, dumpMetricsOnly);
+            dumpService(service, writer);
         }
         if (mCarTestService != null) {
-            dumpService(mCarTestService, writer, dumpMetricsOnly);
+            dumpService(mCarTestService, writer);
         }
-
     }
 
-    private void dumpService(CarServiceBase service, PrintWriter writer, boolean dumpMetricsOnly) {
+    private void dumpService(CarServiceBase service, PrintWriter writer) {
         try {
-            if (dumpMetricsOnly) {
-                service.dumpMetrics(writer);
-            } else {
-                service.dump(writer);
-            }
+            service.dump(writer);
         } catch (Exception e) {
             writer.println("Failed dumping: " + service.getClass().getName());
             e.printStackTrace(writer);
@@ -532,6 +558,9 @@
         private static final String COMMAND_SUSPEND = "suspend";
         private static final String COMMAND_ENABLE_TRUSTED_DEVICE = "enable-trusted-device";
         private static final String COMMAND_REMOVE_TRUSTED_DEVICES = "remove-trusted-devices";
+        private static final String COMMAND_START_FIXED_ACTIVITY_MODE = "start-fixed-activity-mode";
+        private static final String COMMAND_STOP_FIXED_ACTIVITY_MODE = "stop-fixed-activity-mode";
+        private static final String COMMAND_INJECT_KEY = "inject-key";
 
         private static final String PARAM_DAY_MODE = "day";
         private static final String PARAM_NIGHT_MODE = "night";
@@ -540,6 +569,7 @@
         private static final String PARAM_ON_MODE = "on";
         private static final String PARAM_OFF_MODE = "off";
         private static final String PARAM_QUERY_MODE = "query";
+        private static final String PARAM_REBOOT = "reboot";
 
 
         private void dumpHelp(PrintWriter pw) {
@@ -554,8 +584,9 @@
             pw.println("\t  Inject an error event from VHAL for testing.");
             pw.println("\tenable-uxr true|false");
             pw.println("\t  Enable/Disable UX restrictions and App blocking.");
-            pw.println("\tgarage-mode [on|off|query]");
-            pw.println("\t  Force into garage mode or check status.");
+            pw.println("\tgarage-mode [on|off|query|reboot]");
+            pw.println("\t  Force into or out of garage mode, or check status.");
+            pw.println("\t  With 'reboot', enter garage mode, then reboot when it completes.");
             pw.println("\tget-do-activities pkgname");
             pw.println("\t  Get Distraction Optimized activities in given package.");
             pw.println("\tget-carpropertyconfig [propertyId]");
@@ -576,6 +607,17 @@
                     + " wireless projection");
             pw.println("\t--metrics");
             pw.println("\t  When used with dumpsys, only metrics will be in the dumpsys output.");
+            pw.println("\tstart-fixed-activity displayId packageName activityName");
+            pw.println("\t  Start an Activity the specified display as fixed mode");
+            pw.println("\tstop-fixed-mode displayId");
+            pw.println("\t  Stop fixed Activity mode for the given display. "
+                    + "The Activity will not be restarted upon crash.");
+            pw.println("\tinject-key [-d display] [-t down_delay_ms] key_code");
+            pw.println("\t  inject key down / up event to car service");
+            pw.println("\t  display: 0 for main, 1 for cluster. If not specified, it will be 0.");
+            pw.println("\t  down_delay_ms: delay from down to up key event. If not specified,");
+            pw.println("\t                 it will be 0");
+            pw.println("\t  key_code: int key code defined in android KeyEvent");
         }
 
         public void exec(String[] args, PrintWriter writer) {
@@ -683,7 +725,7 @@
                     writer.println("Resume: Simulating resuming from Deep Sleep");
                     break;
                 case COMMAND_SUSPEND:
-                    mCarPowerManagementService.forceSimulatedSuspend();
+                    mCarPowerManagementService.forceSuspendAndMaybeReboot(false);
                     writer.println("Resume: Simulating powering down to Deep Sleep");
                     break;
                 case COMMAND_ENABLE_TRUSTED_DEVICE:
@@ -702,12 +744,125 @@
                             .removeAllTrustedDevices(
                                     mUserManagerHelper.getCurrentForegroundUserId());
                     break;
+                case COMMAND_START_FIXED_ACTIVITY_MODE:
+                    handleStartFixedActivity(args, writer);
+                    break;
+                case COMMAND_STOP_FIXED_ACTIVITY_MODE:
+                    handleStopFixedMode(args, writer);
+                    break;
+
+                case COMMAND_INJECT_KEY:
+                    if (args.length < 2) {
+                        writer.println("Incorrect number of arguments");
+                        dumpHelp(writer);
+                        break;
+                    }
+                    handleInjectKey(args, writer);
+                    break;
                 default:
                     writer.println("Unknown command: \"" + arg + "\"");
                     dumpHelp(writer);
             }
         }
 
+        private void handleStartFixedActivity(String[] args, PrintWriter writer) {
+            if (args.length != 4) {
+                writer.println("Incorrect number of arguments");
+                dumpHelp(writer);
+                return;
+            }
+            int displayId;
+            try {
+                displayId = Integer.parseInt(args[1]);
+            } catch (NumberFormatException e) {
+                writer.println("Wrong display id:" + args[1]);
+                return;
+            }
+            String packageName = args[2];
+            String activityName = args[3];
+            Intent intent = new Intent();
+            intent.setComponent(new ComponentName(packageName, activityName));
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            ActivityOptions options = ActivityOptions.makeBasic();
+            options.setLaunchDisplayId(displayId);
+            if (!mFixedActivityService.startFixedActivityModeForDisplayAndUser(intent, options,
+                    displayId, ActivityManager.getCurrentUser())) {
+                writer.println("Failed to start");
+                return;
+            }
+            writer.println("Succeeded");
+        }
+
+        private void handleStopFixedMode(String[] args, PrintWriter writer) {
+            if (args.length != 2) {
+                writer.println("Incorrect number of arguments");
+                dumpHelp(writer);
+                return;
+            }
+            int displayId;
+            try {
+                displayId = Integer.parseInt(args[1]);
+            } catch (NumberFormatException e) {
+                writer.println("Wrong display id:" + args[1]);
+                return;
+            }
+            mFixedActivityService.stopFixedActivityMode(displayId);
+        }
+
+        private void handleInjectKey(String[] args, PrintWriter writer) {
+            int i = 1; // 0 is command itself
+            int display = InputHalService.DISPLAY_MAIN;
+            int delayMs = 0;
+            int keyCode = KeyEvent.KEYCODE_UNKNOWN;
+            try {
+                while (i < args.length) {
+                    switch (args[i]) {
+                        case "-d":
+                            i++;
+                            display = Integer.parseInt(args[i]);
+                            break;
+                        case "-t":
+                            i++;
+                            delayMs = Integer.parseInt(args[i]);
+                            break;
+                        default:
+                            if (keyCode != KeyEvent.KEYCODE_UNKNOWN) {
+                                throw new IllegalArgumentException("key_code already set:"
+                                        + keyCode);
+                            }
+                            keyCode = Integer.parseInt(args[i]);
+                    }
+                    i++;
+                }
+            } catch (Exception e) {
+                writer.println("Invalid args:" + e);
+                dumpHelp(writer);
+                return;
+            }
+            if (keyCode == KeyEvent.KEYCODE_UNKNOWN) {
+                writer.println("Missing key code or invalid keycode");
+                dumpHelp(writer);
+                return;
+            }
+            if (display != InputHalService.DISPLAY_MAIN
+                    && display != InputHalService.DISPLAY_INSTRUMENT_CLUSTER) {
+                writer.println("Invalid display:" + display);
+                dumpHelp(writer);
+                return;
+            }
+            if (delayMs < 0) {
+                writer.println("Invalid delay:" + delayMs);
+                dumpHelp(writer);
+                return;
+            }
+            KeyEvent keyDown = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
+            mCarInputService.onKeyEvent(keyDown, display);
+            SystemClock.sleep(delayMs);
+            KeyEvent keyUp = new KeyEvent(KeyEvent.ACTION_UP, keyCode);
+            mCarInputService.onKeyEvent(keyUp, display);
+            writer.println("Succeeded");
+        }
+
         private void forceDayNightMode(String arg, PrintWriter writer) {
             int mode;
             switch (arg) {
@@ -754,9 +909,13 @@
                 case PARAM_QUERY_MODE:
                     mGarageModeService.dump(writer);
                     break;
+                case PARAM_REBOOT:
+                    mCarPowerManagementService.forceSuspendAndMaybeReboot(true);
+                    writer.println("Entering Garage Mode. Will reboot when it completes.");
+                    break;
                 default:
                     writer.println("Unknown value. Valid argument: " + PARAM_ON_MODE + "|"
-                            + PARAM_OFF_MODE + "|" + PARAM_QUERY_MODE);
+                            + PARAM_OFF_MODE + "|" + PARAM_QUERY_MODE + "|" + PARAM_REBOOT);
             }
         }
 
diff --git a/service/src/com/android/car/OnShutdownReboot.java b/service/src/com/android/car/OnShutdownReboot.java
index b68ff5b..5a14371 100644
--- a/service/src/com/android/car/OnShutdownReboot.java
+++ b/service/src/com/android/car/OnShutdownReboot.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
 
@@ -52,10 +53,10 @@
 
     OnShutdownReboot(Context context) {
         mContext = context;
-        IntentFilter shutdownFilter = new IntentFilter(Intent.ACTION_SHUTDOWN);
-        IntentFilter rebootFilter = new IntentFilter(Intent.ACTION_REBOOT);
-        mContext.registerReceiver(mReceiver, shutdownFilter);
-        mContext.registerReceiver(mReceiver, rebootFilter);
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_SHUTDOWN);
+        filter.addAction(Intent.ACTION_REBOOT);
+        mContext.registerReceiver(mReceiver, filter);
     }
 
     OnShutdownReboot addAction(BiConsumer<Context, Intent> action) {
diff --git a/service/src/com/android/car/Utils.java b/service/src/com/android/car/Utils.java
index 2b468b7..41ab67b 100644
--- a/service/src/com/android/car/Utils.java
+++ b/service/src/com/android/car/Utils.java
@@ -142,18 +142,18 @@
      */
     public static class TransitionLog {
         private String mServiceName; // name of the service or tag
-        private int mFromState; // old state
-        private int mToState; // new state
+        private Object mFromState; // old state
+        private Object mToState; // new state
         private long mTimestampMs; // System.currentTimeMillis()
         private String mExtra; // Additional information as a String
 
-        public TransitionLog(String name, int fromState, int toState, long timestamp,
+        public TransitionLog(String name, Object fromState, Object toState, long timestamp,
                 String extra) {
             this(name, fromState, toState, timestamp);
             mExtra = extra;
         }
 
-        public TransitionLog(String name, int fromState, int toState, long timeStamp) {
+        public TransitionLog(String name, Object fromState, Object toState, long timeStamp) {
             mServiceName = name;
             mFromState = fromState;
             mToState = toState;
diff --git a/service/src/com/android/car/VmsLayersAvailability.java b/service/src/com/android/car/VmsLayersAvailability.java
index 200b347..a9bbc7a 100644
--- a/service/src/com/android/car/VmsLayersAvailability.java
+++ b/service/src/com/android/car/VmsLayersAvailability.java
@@ -22,14 +22,13 @@
 import android.car.vms.VmsLayerDependency;
 import android.car.vms.VmsLayersOffering;
 import android.util.Log;
+
 import com.android.internal.annotations.GuardedBy;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -45,8 +44,7 @@
  */
 
 public class VmsLayersAvailability {
-
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final String TAG = "VmsLayersAvailability";
 
     private final Object mLock = new Object();
@@ -111,9 +109,6 @@
             mPotentialLayersAndPublishers.clear();
             mAvailableAssociatedLayers = Collections.EMPTY_SET;
             mUnavailableAssociatedLayers = Collections.EMPTY_SET;
-            if (mSeq + 1 < mSeq) {
-                throw new IllegalStateException("Sequence is about to loop");
-            }
             mSeq += 1;
         }
     }
diff --git a/service/src/com/android/car/VmsPublisherService.java b/service/src/com/android/car/VmsPublisherService.java
index 8e3beeb..def10dd 100644
--- a/service/src/com/android/car/VmsPublisherService.java
+++ b/service/src/com/android/car/VmsPublisherService.java
@@ -29,16 +29,16 @@
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.car.stats.CarStatsService;
 import com.android.car.vms.VmsBrokerService;
 import com.android.car.vms.VmsClientManager;
-import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
+import java.util.function.IntSupplier;
 
 
 /**
@@ -46,80 +46,40 @@
  * Binds to publishers and configures them to use this service.
  * Notifies publishers of subscription changes.
  */
-public class VmsPublisherService implements CarServiceBase, VmsClientManager.ConnectionListener {
-    private static final boolean DBG = true;
+public class VmsPublisherService implements CarServiceBase {
+    private static final boolean DBG = false;
     private static final String TAG = "VmsPublisherService";
 
-    @VisibleForTesting
-    static final String PACKET_COUNT_FORMAT = "Packet count for layer %s: %d\n";
-
-    @VisibleForTesting
-    static final String PACKET_SIZE_FORMAT = "Total packet size for layer %s: %d (bytes)\n";
-
-    @VisibleForTesting
-    static final String PACKET_FAILURE_COUNT_FORMAT =
-            "Total packet failure count for layer %s from %s to %s: %d\n";
-
-    @VisibleForTesting
-    static final String PACKET_FAILURE_SIZE_FORMAT =
-            "Total packet failure size for layer %s from %s to %s: %d (bytes)\n";
-
     private final Context mContext;
-    private final VmsClientManager mClientManager;
+    private final CarStatsService mStatsService;
     private final VmsBrokerService mBrokerService;
+    private final VmsClientManager mClientManager;
+    private final IntSupplier mGetCallingUid;
     private final Map<String, PublisherProxy> mPublisherProxies = Collections.synchronizedMap(
             new ArrayMap<>());
 
-    @GuardedBy("mPacketCounts")
-    private final Map<VmsLayer, PacketCountAndSize> mPacketCounts = new ArrayMap<>();
-    @GuardedBy("mPacketFailureCounts")
-    private final Map<PacketFailureKey, PacketCountAndSize> mPacketFailureCounts = new ArrayMap<>();
-
-    // PacketCountAndSize keeps track of the cumulative size and number of packets of a specific
-    // VmsLayer that we have seen.
-    private class PacketCountAndSize {
-        long mCount;
-        long mSize;
-    }
-
-    // PacketFailureKey is a triple of the VmsLayer, the publisher and subscriber for which a packet
-    // failed to be sent.
-    private class PacketFailureKey {
-        VmsLayer mVmsLayer;
-        String mPublisher;
-        String mSubscriber;
-
-        PacketFailureKey(VmsLayer vmsLayer, String publisher, String subscriber) {
-            mVmsLayer = vmsLayer;
-            mPublisher = publisher;
-            mSubscriber = subscriber;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof PacketFailureKey)) {
-                return false;
-            }
-
-            PacketFailureKey otherKey = (PacketFailureKey) o;
-            return Objects.equals(mVmsLayer, otherKey.mVmsLayer) && Objects.equals(mPublisher,
-                    otherKey.mPublisher) && Objects.equals(mSubscriber, otherKey.mSubscriber);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(mVmsLayer, mPublisher, mSubscriber);
-        }
-    }
-
-    public VmsPublisherService(
+    VmsPublisherService(
             Context context,
+            CarStatsService statsService,
             VmsBrokerService brokerService,
             VmsClientManager clientManager) {
+        this(context, statsService, brokerService, clientManager, Binder::getCallingUid);
+    }
+
+    @VisibleForTesting
+    VmsPublisherService(
+            Context context,
+            CarStatsService statsService,
+            VmsBrokerService brokerService,
+            VmsClientManager clientManager,
+            IntSupplier getCallingUid) {
         mContext = context;
-        mClientManager = clientManager;
+        mStatsService = statsService;
         mBrokerService = brokerService;
-        mClientManager.registerConnectionListener(this);
+        mClientManager = clientManager;
+        mGetCallingUid = getCallingUid;
+
+        mClientManager.setPublisherService(this);
     }
 
     @Override
@@ -133,42 +93,19 @@
 
     @Override
     public void dump(PrintWriter writer) {
-        dumpMetrics(writer);
-    }
-
-    @Override
-    public void dumpMetrics(PrintWriter writer) {
         writer.println("*" + getClass().getSimpleName() + "*");
         writer.println("mPublisherProxies: " + mPublisherProxies.size());
-        synchronized (mPacketCounts) {
-            for (Map.Entry<VmsLayer, PacketCountAndSize> entry : mPacketCounts.entrySet()) {
-                VmsLayer layer = entry.getKey();
-                PacketCountAndSize countAndSize = entry.getValue();
-                writer.format(PACKET_COUNT_FORMAT, layer, countAndSize.mCount);
-                writer.format(PACKET_SIZE_FORMAT, layer, countAndSize.mSize);
-            }
-        }
-        synchronized (mPacketFailureCounts) {
-            for (Map.Entry<PacketFailureKey, PacketCountAndSize> entry :
-                    mPacketFailureCounts.entrySet()) {
-                PacketFailureKey key = entry.getKey();
-                PacketCountAndSize countAndSize = entry.getValue();
-                VmsLayer layer = key.mVmsLayer;
-                String publisher = key.mPublisher;
-                String subscriber = key.mSubscriber;
-                writer.format(PACKET_FAILURE_COUNT_FORMAT, layer, publisher, subscriber,
-                        countAndSize.mCount);
-                writer.format(PACKET_FAILURE_SIZE_FORMAT, layer, publisher, subscriber,
-                        countAndSize.mSize);
-            }
-        }
     }
 
-    @Override
-    public void onClientConnected(String publisherName, IBinder binder) {
+    /**
+     * Called when a client connection is established or re-established.
+     *
+     * @param publisherName    String that uniquely identifies the service and user.
+     * @param publisherClient The client's communication channel.
+     */
+    public void onClientConnected(String publisherName, IVmsPublisherClient publisherClient) {
         if (DBG) Log.d(TAG, "onClientConnected: " + publisherName);
         IBinder publisherToken = new Binder();
-        IVmsPublisherClient publisherClient = IVmsPublisherClient.Stub.asInterface(binder);
 
         PublisherProxy publisherProxy = new PublisherProxy(publisherName, publisherToken,
                 publisherClient);
@@ -186,7 +123,11 @@
         }
     }
 
-    @Override
+    /**
+     * Called when a client connection is terminated.
+     *
+     * @param publisherName String that uniquely identifies the service and user.
+     */
     public void onClientDisconnected(String publisherName) {
         if (DBG) Log.d(TAG, "onClientDisconnected: " + publisherName);
         PublisherProxy proxy = mPublisherProxies.remove(publisherName);
@@ -228,26 +169,6 @@
             mBrokerService.setPublisherLayersOffering(token, offering);
         }
 
-        private void incrementPacketCount(VmsLayer layer, long size) {
-            synchronized (mPacketCounts) {
-                PacketCountAndSize countAndSize = mPacketCounts.computeIfAbsent(layer,
-                        i -> new PacketCountAndSize());
-                countAndSize.mCount++;
-                countAndSize.mSize += size;
-            }
-        }
-
-        private void incrementPacketFailure(VmsLayer layer, String publisher, String subscriber,
-                long size) {
-            synchronized (mPacketFailureCounts) {
-                PacketFailureKey key = new PacketFailureKey(layer, publisher, subscriber);
-                PacketCountAndSize countAndSize = mPacketFailureCounts.computeIfAbsent(key,
-                        i -> new PacketCountAndSize());
-                countAndSize.mCount++;
-                countAndSize.mSize += size;
-            }
-        }
-
         @Override
         public void publish(IBinder token, VmsLayer layer, int publisherId, byte[] payload) {
             assertPermission(token);
@@ -260,7 +181,8 @@
             }
 
             int payloadLength = payload != null ? payload.length : 0;
-            incrementPacketCount(layer, payloadLength);
+            mStatsService.getVmsClientLogger(mGetCallingUid.getAsInt())
+                    .logPacketSent(layer, payloadLength);
 
             // Send the message to subscribers
             Set<IVmsSubscriberClient> listeners =
@@ -269,17 +191,21 @@
             if (DBG) Log.d(TAG, String.format("Number of subscribers: %d", listeners.size()));
 
             if (listeners.size() == 0) {
-                // An empty string for the last argument is a special value signalizing zero
-                // subscribers for the VMS_PACKET_FAILURE_REPORTED atom.
-                incrementPacketFailure(layer, mName, "", payloadLength);
+                // A negative UID signals that the packet had zero subscribers
+                mStatsService.getVmsClientLogger(-1)
+                        .logPacketDropped(layer, payloadLength);
             }
 
             for (IVmsSubscriberClient listener : listeners) {
+                int subscriberUid = mClientManager.getSubscriberUid(listener);
                 try {
                     listener.onVmsMessageReceived(layer, payload);
+                    mStatsService.getVmsClientLogger(subscriberUid)
+                            .logPacketReceived(layer, payloadLength);
                 } catch (RemoteException ex) {
-                    String subscriberName = mBrokerService.getPackageName(listener);
-                    incrementPacketFailure(layer, mName, subscriberName, payloadLength);
+                    mStatsService.getVmsClientLogger(subscriberUid)
+                            .logPacketDropped(layer, payloadLength);
+                    String subscriberName = mClientManager.getPackageName(listener);
                     Log.e(TAG, String.format("Unable to publish to listener: %s", subscriberName));
                 }
             }
diff --git a/service/src/com/android/car/VmsPublishersInfo.java b/service/src/com/android/car/VmsPublishersInfo.java
index 4a75953..94bc794 100644
--- a/service/src/com/android/car/VmsPublishersInfo.java
+++ b/service/src/com/android/car/VmsPublishersInfo.java
@@ -16,24 +16,21 @@
 
 package com.android.car;
 
-import android.util.Log;
+import android.util.ArrayMap;
 
 import com.android.internal.annotations.GuardedBy;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 public class VmsPublishersInfo {
-    private static final String TAG = "VmsPublishersInfo";
-    private static final boolean DBG = true;
     private static final byte[] EMPTY_RESPONSE = new byte[0];
 
     private final Object mLock = new Object();
     @GuardedBy("mLock")
-    private final Map<InfoWrapper, Integer> mPublishersIds = new HashMap<>();
+    private final ArrayMap<InfoWrapper, Integer> mPublishersIds = new ArrayMap<>();
     @GuardedBy("mLock")
-    private final Map<Integer, byte[]> mPublishersInfo = new HashMap<>();
+    private final ArrayList<InfoWrapper> mPublishersInfo = new ArrayList<>();
 
     private static class InfoWrapper {
         private final byte[] mInfo;
@@ -43,7 +40,7 @@
         }
 
         public byte[] getInfo() {
-            return mInfo;
+            return mInfo.clone();
         }
 
         @Override
@@ -62,38 +59,38 @@
     }
 
     /**
-     * Returns the ID associated with the publisher info. When called for the first time for a
-     * publisher info will store the info and assign an ID
+     * Retrieves the publisher ID for the given publisher information. If the publisher information
+     * has not previously been seen, it will be assigned a new publisher ID.
+     *
+     * @param publisherInfo Publisher information to query or register.
+     * @return Publisher ID for the given publisher information.
      */
     public int getIdForInfo(byte[] publisherInfo) {
         Integer publisherId;
         InfoWrapper wrappedPublisherInfo = new InfoWrapper(publisherInfo);
         synchronized (mLock) {
-            maybeAddPublisherInfoLocked(wrappedPublisherInfo);
+            // Check if publisher is already registered
             publisherId = mPublishersIds.get(wrappedPublisherInfo);
-        }
-        if (DBG) {
-            Log.i(TAG, "Publisher ID is: " + publisherId);
+            if (publisherId == null) {
+                // Add the new publisher and assign it the next ID
+                mPublishersInfo.add(wrappedPublisherInfo);
+                publisherId = mPublishersInfo.size();
+                mPublishersIds.put(wrappedPublisherInfo, publisherId);
+            }
         }
         return publisherId;
     }
 
+    /**
+     * Returns the publisher info associated with the given publisher ID.
+     * @param publisherId Publisher ID to query.
+     * @return Publisher info associated with the ID, or an empty array if publisher ID is unknown.
+     */
     public byte[] getPublisherInfo(int publisherId) {
         synchronized (mLock) {
-            return mPublishersInfo.containsKey(publisherId)
-                    ? mPublishersInfo.get(publisherId).clone()
-                    : EMPTY_RESPONSE;
-        }
-    }
-
-    @GuardedBy("mLock")
-    private void maybeAddPublisherInfoLocked(InfoWrapper wrappedPublisherInfo) {
-        if (!mPublishersIds.containsKey(wrappedPublisherInfo)) {
-            // Assign ID to the info
-            Integer publisherId = mPublishersIds.size();
-
-            mPublishersIds.put(wrappedPublisherInfo, publisherId);
-            mPublishersInfo.put(publisherId, wrappedPublisherInfo.getInfo());
+            return publisherId < 1 || publisherId > mPublishersInfo.size()
+                    ? EMPTY_RESPONSE
+                    : mPublishersInfo.get(publisherId - 1).getInfo();
         }
     }
 }
diff --git a/service/src/com/android/car/VmsSubscriberService.java b/service/src/com/android/car/VmsSubscriberService.java
index aaadf4f..16cebf3 100644
--- a/service/src/com/android/car/VmsSubscriberService.java
+++ b/service/src/com/android/car/VmsSubscriberService.java
@@ -16,246 +16,81 @@
 
 package com.android.car;
 
-import android.car.Car;
 import android.car.vms.IVmsSubscriberClient;
 import android.car.vms.IVmsSubscriberService;
 import android.car.vms.VmsAvailableLayers;
 import android.car.vms.VmsLayer;
 import android.content.Context;
-import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 
 import com.android.car.hal.VmsHalService;
 import com.android.car.vms.VmsBrokerService;
-import com.android.internal.annotations.GuardedBy;
+import com.android.car.vms.VmsClientManager;
 
 import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
- * + Receives HAL updates by implementing VmsHalService.VmsHalListener.
- * + Offers subscriber/publisher services by implementing IVmsService.Stub.
+ * Offers subscriber services by implementing IVmsSubscriberService.Stub.
  */
 public class VmsSubscriberService extends IVmsSubscriberService.Stub implements CarServiceBase,
         VmsBrokerService.SubscriberListener {
-    private static final boolean DBG = true;
-    private static final String PERMISSION = Car.PERMISSION_VMS_SUBSCRIBER;
     private static final String TAG = "VmsSubscriberService";
 
     private final Context mContext;
     private final VmsBrokerService mBrokerService;
-
-    @GuardedBy("mSubscriberServiceLock")
-    private final VmsSubscribersManager mSubscribersManager = new VmsSubscribersManager();
-    private final Object mSubscriberServiceLock = new Object();
+    private final VmsClientManager mClientManager;
 
     /**
-     * Keeps track of subscribers of this service.
+     * Constructor for client manager.
+     *
+     * @param context           Context to use for registering receivers and binding services.
+     * @param brokerService     Service managing the VMS publisher/subscriber state.
+     * @param clientManager     Service for monitoring VMS subscriber clients.
+     * @param hal               Service providing the HAL client interface
      */
-    class VmsSubscribersManager {
-        /**
-         * Allows to modify mSubscriberMap and mListenerDeathRecipientMap as a single unit.
-         */
-        private final Object mListenerManagerLock = new Object();
-        @GuardedBy("mListenerManagerLock")
-        private final Map<IBinder, ListenerDeathRecipient> mListenerDeathRecipientMap =
-                new HashMap<>();
-        @GuardedBy("mListenerManagerLock")
-        private final Map<IBinder, IVmsSubscriberClient> mSubscriberMap = new HashMap<>();
-
-        class ListenerDeathRecipient implements IBinder.DeathRecipient {
-            private IBinder mSubscriberBinder;
-
-            ListenerDeathRecipient(IBinder subscriberBinder) {
-                mSubscriberBinder = subscriberBinder;
-            }
-
-            /**
-             * Listener died. Remove it from this service.
-             */
-            @Override
-            public void binderDied() {
-                if (DBG) {
-                    Log.d(TAG, "binderDied " + mSubscriberBinder);
-                }
-
-                // Get the Listener from the Binder
-                IVmsSubscriberClient subscriber = mSubscriberMap.get(mSubscriberBinder);
-
-                // Remove the subscriber subscriptions.
-                if (subscriber != null) {
-                    Log.d(TAG, "Removing subscriptions for dead subscriber: " + subscriber);
-                    mBrokerService.removeDeadSubscriber(subscriber);
-                } else {
-                    Log.d(TAG, "Handling dead binder with no matching subscriber");
-
-                }
-
-                // Remove binder
-                VmsSubscribersManager.this.removeListener(mSubscriberBinder);
-            }
-
-            void release() {
-                mSubscriberBinder.unlinkToDeath(this, 0);
-            }
-        }
-
-        public void release() {
-            for (ListenerDeathRecipient recipient : mListenerDeathRecipientMap.values()) {
-                recipient.release();
-            }
-            mListenerDeathRecipientMap.clear();
-            mSubscriberMap.clear();
-        }
-
-        /**
-         * Adds the subscriber and a death recipient associated to it.
-         *
-         * @param subscriber to be added.
-         * @throws IllegalArgumentException if the subscriber is null.
-         * @throws IllegalStateException    if it was not possible to link a death recipient to the
-         *                                  subscriber.
-         */
-        public void add(IVmsSubscriberClient subscriber) {
-            ICarImpl.assertVmsSubscriberPermission(mContext);
-            if (subscriber == null) {
-                Log.e(TAG, "Trying to add a null subscriber.");
-                throw new IllegalArgumentException("subscriber cannot be null.");
-            }
-            IBinder subscriberBinder = subscriber.asBinder();
-            synchronized (mListenerManagerLock) {
-                if (mSubscriberMap.containsKey(subscriberBinder)) {
-                    if (DBG) {
-                        Log.d(TAG, "Subscriber already registered: " + subscriber);
-                    }
-                    return;
-                }
-                if (DBG) {
-                    Log.d(TAG, "Registering subscriber: " + subscriber);
-                }
-                ListenerDeathRecipient deathRecipient =
-                        new ListenerDeathRecipient(subscriberBinder);
-                try {
-                    subscriberBinder.linkToDeath(deathRecipient, 0);
-                } catch (RemoteException e) {
-                    throw new IllegalStateException("Client already dead", e);
-                }
-                mListenerDeathRecipientMap.put(subscriberBinder, deathRecipient);
-                mSubscriberMap.put(subscriberBinder, subscriber);
-            }
-        }
-
-        /**
-         * Removes the subscriber and associated death recipient.
-         *
-         * @param subscriber to be removed.
-         * @throws IllegalArgumentException if subscriber is null.
-         */
-        public void remove(IVmsSubscriberClient subscriber) {
-            if (DBG) {
-                Log.d(TAG, "unregisterListener");
-            }
-            ICarImpl.assertPermission(mContext, PERMISSION);
-            if (subscriber == null) {
-                Log.e(TAG, "unregister: subscriber is null.");
-                throw new IllegalArgumentException("Listener is null");
-            }
-            IBinder subscriberBinder = subscriber.asBinder();
-            removeListener(subscriberBinder);
-        }
-
-        // Removes the subscriberBinder from the current state.
-        // The function assumes that binder will exist both in subscriber and death recipients list.
-        private void removeListener(IBinder subscriberBinder) {
-            synchronized (mListenerManagerLock) {
-                boolean found = mSubscriberMap.remove(subscriberBinder) != null;
-                if (found) {
-                    mListenerDeathRecipientMap.get(subscriberBinder).release();
-                    mListenerDeathRecipientMap.remove(subscriberBinder);
-                } else {
-                    Log.e(TAG, "removeListener: subscriber was not previously registered.");
-                }
-            }
-        }
-
-        /**
-         * Returns list of subscribers currently registered.
-         *
-         * @return list of subscribers.
-         */
-        public List<IVmsSubscriberClient> getListeners() {
-            synchronized (mListenerManagerLock) {
-                return new ArrayList<>(mSubscriberMap.values());
-            }
-        }
-    }
-
-    public VmsSubscriberService(Context context, VmsBrokerService brokerService,
-            VmsHalService hal) {
+    VmsSubscriberService(Context context, VmsBrokerService brokerService,
+            VmsClientManager clientManager, VmsHalService hal) {
         mContext = context;
         mBrokerService = brokerService;
-        hal.setVmsSubscriberService(this, mBrokerService::removeDeadSubscriber);
-    }
-
-    // Implements CarServiceBase interface.
-    @Override
-    public void init() {
+        mClientManager = clientManager;
         mBrokerService.addSubscriberListener(this);
+        hal.setVmsSubscriberService(this);
     }
 
     @Override
-    public void release() {
-        mBrokerService.removeSubscriberListener(this);
-        mSubscribersManager.release();
-    }
+    public void init() {}
+
+    @Override
+    public void release() {}
 
     @Override
     public void dump(PrintWriter writer) {
     }
 
-    // Implements IVmsService interface.
     @Override
     public void addVmsSubscriberToNotifications(IVmsSubscriberClient subscriber) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            // Add the subscriber so it can subscribe.
-            mSubscribersManager.add(subscriber);
-        }
+        mClientManager.addSubscriber(subscriber);
     }
 
     @Override
     public void removeVmsSubscriberToNotifications(IVmsSubscriberClient subscriber) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            mSubscribersManager.remove(subscriber);
-        }
+        mClientManager.removeSubscriber(subscriber);
     }
 
     @Override
     public void addVmsSubscriber(IVmsSubscriberClient subscriber, VmsLayer layer) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            // Add the subscriber so it can subscribe.
-            mSubscribersManager.add(subscriber);
-
-            // Add the subscription for the layer.
-            mBrokerService.addSubscription(subscriber, layer);
-        }
+        mClientManager.addSubscriber(subscriber);
+        mBrokerService.addSubscription(subscriber, layer);
     }
 
     @Override
     public void removeVmsSubscriber(IVmsSubscriberClient subscriber, VmsLayer layer) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            // Remove the subscription.
-            mBrokerService.removeSubscription(subscriber, layer);
-        }
+        mBrokerService.removeSubscription(subscriber, layer);
     }
 
     @Override
@@ -263,13 +98,8 @@
             VmsLayer layer,
             int publisherId) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            // Add the subscriber so it can subscribe.
-            mSubscribersManager.add(subscriber);
-
-            // Add the subscription for the layer.
-            mBrokerService.addSubscription(subscriber, layer, publisherId);
-        }
+        mClientManager.addSubscriber(subscriber);
+        mBrokerService.addSubscription(subscriber, layer, publisherId);
     }
 
     @Override
@@ -277,76 +107,42 @@
             VmsLayer layer,
             int publisherId) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            // Remove the subscription.
-            mBrokerService.removeSubscription(subscriber, layer, publisherId);
-        }
+        mBrokerService.removeSubscription(subscriber, layer, publisherId);
     }
 
     @Override
     public void addVmsSubscriberPassive(IVmsSubscriberClient subscriber) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            mSubscribersManager.add(subscriber);
-            mBrokerService.addSubscription(subscriber);
-        }
+        mClientManager.addSubscriber(subscriber);
+        mBrokerService.addSubscription(subscriber);
     }
 
     @Override
     public void removeVmsSubscriberPassive(IVmsSubscriberClient subscriber) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            // Remove the subscription.
-            mBrokerService.removeSubscription(subscriber);
-        }
+        mBrokerService.removeSubscription(subscriber);
     }
 
     @Override
     public byte[] getPublisherInfo(int publisherId) {
         ICarImpl.assertVmsSubscriberPermission(mContext);
-        synchronized (mSubscriberServiceLock) {
-            return mBrokerService.getPublisherInfo(publisherId);
-        }
+        return mBrokerService.getPublisherInfo(publisherId);
     }
 
     @Override
     public VmsAvailableLayers getAvailableLayers() {
+        ICarImpl.assertVmsSubscriberPermission(mContext);
         return mBrokerService.getAvailableLayers();
-
-    }
-
-    @Override
-    public void onMessageReceived(VmsLayer layer, int publisherId, byte[] payload) {
-        if (DBG) Log.d(TAG, "Publishing a message for layer: " + layer);
-
-        Set<IVmsSubscriberClient> subscribers =
-                mBrokerService.getSubscribersForLayerFromPublisher(layer, publisherId);
-
-        for (IVmsSubscriberClient subscriber : subscribers) {
-            try {
-                subscriber.onVmsMessageReceived(layer, payload);
-            } catch (RemoteException e) {
-                // If we could not send a record, its likely the connection snapped. Let the binder
-                // death handle the situation.
-                Log.e(TAG, "onVmsMessageReceived calling failed: ", e);
-            }
-        }
     }
 
     @Override
     public void onLayersAvailabilityChange(VmsAvailableLayers availableLayers) {
-        if (DBG) Log.d(TAG, "Publishing layers availability change: " + availableLayers);
-
-        Set<IVmsSubscriberClient> subscribers;
-        subscribers = new HashSet<>(mSubscribersManager.getListeners());
-
-        for (IVmsSubscriberClient subscriber : subscribers) {
+        for (IVmsSubscriberClient subscriber : mClientManager.getAllSubscribers()) {
             try {
                 subscriber.onLayersAvailabilityChanged(availableLayers);
             } catch (RemoteException e) {
-                // If we could not send a record, its likely the connection snapped. Let the binder
-                // death handle the situation.
-                Log.e(TAG, "onLayersAvailabilityChanged calling failed: ", e);
+                Log.e(TAG, "onLayersAvailabilityChanged failed: "
+                        + mClientManager.getPackageName(subscriber), e);
             }
         }
     }
diff --git a/service/src/com/android/car/am/ContinuousBlankActivity.java b/service/src/com/android/car/am/ContinuousBlankActivity.java
new file mode 100644
index 0000000..10ee382
--- /dev/null
+++ b/service/src/com/android/car/am/ContinuousBlankActivity.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.am;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.car.R;
+
+/**
+ * Activity to block top activity after suspend to RAM in case of guest user.
+ *
+ * <p> Guest user resuming will cause user switch to another guest user.
+ * For better user experience, no screen from previous user should be displayed.
+ */
+
+public class ContinuousBlankActivity extends Activity {
+    private static final String TAG = "CAR.BLANK";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_continuous_blank);
+        Log.i(TAG, "ContinuousBlankActivity created:");
+    }
+}
diff --git a/service/src/com/android/car/am/FixedActivityService.java b/service/src/com/android/car/am/FixedActivityService.java
new file mode 100644
index 0000000..abb1eca
--- /dev/null
+++ b/service/src/com/android/car/am/FixedActivityService.java
@@ -0,0 +1,650 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.am;
+
+import static android.app.ActivityTaskManager.INVALID_TASK_ID;
+import static android.os.Process.INVALID_UID;
+
+import static com.android.car.CarLog.TAG_AM;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.UserIdInt;
+import android.app.ActivityManager;
+import android.app.ActivityManager.StackInfo;
+import android.app.ActivityOptions;
+import android.app.IActivityManager;
+import android.app.IProcessObserver;
+import android.app.Presentation;
+import android.app.TaskStackListener;
+import android.car.hardware.power.CarPowerManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.hardware.display.DisplayManager;
+import android.net.Uri;
+import android.os.HandlerThread;
+import android.os.RemoteException;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.Display;
+
+import com.android.car.CarLocalServices;
+import com.android.car.CarServiceBase;
+import com.android.car.CarServiceUtils;
+import com.android.car.R;
+import com.android.car.user.CarUserService;
+import com.android.internal.annotations.GuardedBy;
+
+import java.io.PrintWriter;
+import java.util.List;
+
+/**
+ * Monitors top activity for a display and guarantee activity in fixed mode is re-launched if it has
+ * crashed or gone to background for whatever reason.
+ *
+ * <p>This component also monitors the upddate of the target package and re-launch it once
+ * update is complete.</p>
+ */
+public final class FixedActivityService implements CarServiceBase {
+
+    private static final boolean DBG = false;
+
+    private static final long RECHECK_INTERVAL_MS = 500;
+    private static final int MAX_NUMBER_OF_CONSECUTIVE_CRASH_RETRY = 5;
+    // If process keep running without crashing, will reset consecutive crash counts.
+    private static final long CRASH_FORGET_INTERVAL_MS = 2 * 60 * 1000; // 2 mins
+
+    private static class RunningActivityInfo {
+        @NonNull
+        public final Intent intent;
+
+        @NonNull
+        public final ActivityOptions activityOptions;
+
+        @UserIdInt
+        public final int userId;
+
+        @GuardedBy("mLock")
+        public boolean isVisible;
+        @GuardedBy("mLock")
+        public long lastLaunchTimeMs = 0;
+        @GuardedBy("mLock")
+        public int consecutiveRetries = 0;
+        @GuardedBy("mLock")
+        public int taskId = INVALID_TASK_ID;
+        @GuardedBy("mLock")
+        public int previousTaskId = INVALID_TASK_ID;
+        @GuardedBy("mLock")
+        public boolean inBackground;
+        @GuardedBy("mLock")
+        public boolean failureLogged;
+
+        RunningActivityInfo(@NonNull Intent intent, @NonNull ActivityOptions activityOptions,
+                @UserIdInt int userId) {
+            this.intent = intent;
+            this.activityOptions = activityOptions;
+            this.userId = userId;
+        }
+
+        private void resetCrashCounterLocked() {
+            consecutiveRetries = 0;
+            failureLogged = false;
+        }
+
+        @Override
+        public String toString() {
+            return "RunningActivityInfo{intent:" + intent + ",activityOptions:" + activityOptions
+                    + ",userId:" + userId + ",isVisible:" + isVisible
+                    + ",lastLaunchTimeMs:" + lastLaunchTimeMs
+                    + ",consecutiveRetries:" + consecutiveRetries + ",taskId:" + taskId + "}";
+        }
+    }
+
+    private final Context mContext;
+
+    private final IActivityManager mAm;
+
+    private final DisplayManager mDm;
+
+    private final UserManager mUm;
+
+    private final CarUserService.UserCallback mUserCallback = new CarUserService.UserCallback() {
+        @Override
+        public void onUserLockChanged(@UserIdInt int userId, boolean unlocked) {
+            // Nothing to do
+        }
+
+        @Override
+        public void onSwitchUser(@UserIdInt int userId) {
+            synchronized (mLock) {
+                mRunningActivities.clear();
+            }
+        }
+    };
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_PACKAGE_CHANGED.equals(action)
+                    || Intent.ACTION_PACKAGE_REPLACED.equals(
+                    action)) {
+                Uri packageData = intent.getData();
+                if (packageData == null) {
+                    Log.w(TAG_AM, "null packageData");
+                    return;
+                }
+                String packageName = packageData.getSchemeSpecificPart();
+                if (packageName == null) {
+                    Log.w(TAG_AM, "null packageName");
+                    return;
+                }
+                int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
+                int userId = UserHandle.getUserId(uid);
+                boolean tryLaunch = false;
+                synchronized (mLock) {
+                    for (int i = 0; i < mRunningActivities.size(); i++) {
+                        RunningActivityInfo info = mRunningActivities.valueAt(i);
+                        ComponentName component = info.intent.getComponent();
+                        // should do this for all activities as the same package can cover multiple
+                        // displays.
+                        if (packageName.equals(component.getPackageName())
+                                && info.userId == userId) {
+                            Log.i(TAG_AM, "Package updated:" + packageName
+                                    + ",user:" + userId);
+                            info.resetCrashCounterLocked();
+                            tryLaunch = true;
+                        }
+                    }
+                }
+                if (tryLaunch) {
+                    launchIfNecessary();
+                }
+            }
+        }
+    };
+
+    // It says listener but is actually callback.
+    private final TaskStackListener mTaskStackListener = new TaskStackListener() {
+        @Override
+        public void onTaskStackChanged() {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskCreated(int taskId, ComponentName componentName) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskRemoved(int taskId) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskMovedToFront(int taskId) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onTaskRemovalStarted(int taskId) {
+            launchIfNecessary();
+        }
+    };
+
+    private final IProcessObserver mProcessObserver = new IProcessObserver.Stub() {
+        @Override
+        public void onForegroundActivitiesChanged(int pid, int uid, boolean foregroundActivities) {
+            launchIfNecessary();
+        }
+
+        @Override
+        public void onForegroundServicesChanged(int pid, int uid, int fgServiceTypes) {
+          // ignore
+        }
+
+        @Override
+        public void onProcessDied(int pid, int uid) {
+            launchIfNecessary();
+        }
+    };
+
+    private final HandlerThread mHandlerThread = new HandlerThread(
+            FixedActivityService.class.getSimpleName());
+
+    private final Runnable mActivityCheckRunnable = () -> {
+        launchIfNecessary();
+    };
+
+    private final Object mLock = new Object();
+
+    // key: displayId
+    @GuardedBy("mLock")
+    private final SparseArray<RunningActivityInfo> mRunningActivities =
+            new SparseArray<>(/* capacity= */ 1); // default to one cluster only case
+
+    @GuardedBy("mLock")
+    private final SparseArray<Presentation> mBlockingPresentations = new SparseArray<>(1);
+
+    @GuardedBy("mLock")
+    private boolean mEventMonitoringActive;
+
+    @GuardedBy("mLock")
+    private CarPowerManager mCarPowerManager;
+
+    private final CarPowerManager.CarPowerStateListener mCarPowerStateListener = (state) -> {
+        if (state != CarPowerManager.CarPowerStateListener.ON) {
+            return;
+        }
+        synchronized (mLock) {
+            for (int i = 0; i < mRunningActivities.size(); i++) {
+                RunningActivityInfo info = mRunningActivities.valueAt(i);
+                info.resetCrashCounterLocked();
+            }
+        }
+        launchIfNecessary();
+    };
+
+    public FixedActivityService(Context context) {
+        mContext = context;
+        mAm = ActivityManager.getService();
+        mUm = context.getSystemService(UserManager.class);
+        mDm = context.getSystemService(DisplayManager.class);
+        mHandlerThread.start();
+    }
+
+    @Override
+    public void init() {
+        // nothing to do
+    }
+
+    @Override
+    public void release() {
+        stopMonitoringEvents();
+    }
+
+    @Override
+    public void dump(PrintWriter writer) {
+        writer.println("*FixedActivityService*");
+        synchronized (mLock) {
+            writer.println("mRunningActivities:" + mRunningActivities
+                    + " ,mEventMonitoringActive:" + mEventMonitoringActive);
+        }
+    }
+
+    private void postRecheck(long delayMs) {
+        mHandlerThread.getThreadHandler().postDelayed(mActivityCheckRunnable, delayMs);
+    }
+
+    private void startMonitoringEvents() {
+        CarPowerManager carPowerManager;
+        synchronized (mLock) {
+            if (mEventMonitoringActive) {
+                return;
+            }
+            mEventMonitoringActive = true;
+            carPowerManager = CarLocalServices.createCarPowerManager(mContext);
+            mCarPowerManager = carPowerManager;
+        }
+        CarUserService userService = CarLocalServices.getService(CarUserService.class);
+        userService.addUserCallback(mUserCallback);
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addDataScheme("package");
+        mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter,
+                /* broadcastPermission= */ null, /* scheduler= */ null);
+        try {
+            mAm.registerTaskStackListener(mTaskStackListener);
+            mAm.registerProcessObserver(mProcessObserver);
+        } catch (RemoteException e) {
+            Log.e(TAG_AM, "remote exception from AM", e);
+        }
+        try {
+            carPowerManager.setListener(mCarPowerStateListener);
+        } catch (Exception e) {
+            // should not happen
+            Log.e(TAG_AM, "Got exception from CarPowerManager", e);
+        }
+    }
+
+    private void stopMonitoringEvents() {
+        CarPowerManager carPowerManager;
+        synchronized (mLock) {
+            if (!mEventMonitoringActive) {
+                return;
+            }
+            mEventMonitoringActive = false;
+            carPowerManager = mCarPowerManager;
+            mCarPowerManager = null;
+        }
+        if (carPowerManager != null) {
+            carPowerManager.clearListener();
+        }
+        mHandlerThread.getThreadHandler().removeCallbacks(mActivityCheckRunnable);
+        CarUserService userService = CarLocalServices.getService(CarUserService.class);
+        userService.removeUserCallback(mUserCallback);
+        try {
+            mAm.unregisterTaskStackListener(mTaskStackListener);
+            mAm.unregisterProcessObserver(mProcessObserver);
+        } catch (RemoteException e) {
+            Log.e(TAG_AM, "remote exception from AM", e);
+        }
+        mContext.unregisterReceiver(mBroadcastReceiver);
+    }
+
+    @Nullable
+    private List<StackInfo> getStackInfos() {
+        try {
+            return mAm.getAllStackInfos();
+        } catch (RemoteException e) {
+            Log.e(TAG_AM, "remote exception from AM", e);
+        }
+        return null;
+    }
+
+    /**
+     * Launches all stored fixed mode activities if necessary.
+     * @param displayId Display id to check if it is visible. If check is not necessary, should pass
+     *        {@link Display#INVALID_DISPLAY}.
+     * @return true if fixed Activity for given {@code displayId} is visible / successfully
+     *         launched. It will return false for {@link Display#INVALID_DISPLAY} {@code displayId}.
+     */
+    private boolean launchIfNecessary(int displayId) {
+        List<StackInfo> infos = getStackInfos();
+        if (infos == null) {
+            Log.e(TAG_AM, "cannot get StackInfo from AM");
+            return false;
+        }
+        long now = SystemClock.elapsedRealtime();
+        synchronized (mLock) {
+            if (mRunningActivities.size() == 0) {
+                // it must have been stopped.
+                if (DBG) {
+                    Log.i(TAG_AM, "empty activity list", new RuntimeException());
+                }
+                return false;
+            }
+            for (int i = mRunningActivities.size() - 1; i >= 0; i--) {
+                RunningActivityInfo activityInfo = mRunningActivities.valueAt(i);
+                activityInfo.isVisible = false;
+                if (isUserAllowedToLaunchActivity(activityInfo.userId)) {
+                    continue;
+                }
+                final int displayIdForActivity = mRunningActivities.keyAt(i);
+                if (activityInfo.taskId != INVALID_TASK_ID) {
+                    Log.i(TAG_AM, "Finishing fixed activity on user switching:"
+                            + activityInfo);
+                    try {
+                        mAm.removeTask(activityInfo.taskId);
+                    } catch (RemoteException e) {
+                        Log.e(TAG_AM, "remote exception from AM", e);
+                    }
+                    CarServiceUtils.runOnMain(() -> {
+                        Display display = mDm.getDisplay(displayIdForActivity);
+                        if (display == null) {
+                            Log.e(TAG_AM, "Display not available, cannot launnch window:"
+                                    + displayIdForActivity);
+                            return;
+                        }
+                        Presentation p = new Presentation(mContext, display,
+                                android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+                        p.setContentView(R.layout.activity_continuous_blank);
+                        p.show();
+                        synchronized (mLock) {
+                            mBlockingPresentations.append(displayIdForActivity, p);
+                        }
+                    });
+                }
+                mRunningActivities.removeAt(i);
+            }
+            for (StackInfo stackInfo : infos) {
+                RunningActivityInfo activityInfo = mRunningActivities.get(stackInfo.displayId);
+                if (activityInfo == null) {
+                    continue;
+                }
+                int topUserId = stackInfo.taskUserIds[stackInfo.taskUserIds.length - 1];
+                if (activityInfo.intent.getComponent().equals(stackInfo.topActivity)
+                        && activityInfo.userId == topUserId && stackInfo.visible) {
+                    // top one is matching.
+                    activityInfo.isVisible = true;
+                    activityInfo.taskId = stackInfo.taskIds[stackInfo.taskIds.length - 1];
+                    continue;
+                }
+                activityInfo.previousTaskId = stackInfo.taskIds[stackInfo.taskIds.length - 1];
+                Log.i(TAG_AM, "Unmatched top activity will be removed:"
+                        + stackInfo.topActivity + " top task id:" + activityInfo.previousTaskId
+                        + " user:" + topUserId + " display:" + stackInfo.displayId);
+                activityInfo.inBackground = false;
+                for (int i = 0; i < stackInfo.taskIds.length - 1; i++) {
+                    if (activityInfo.taskId == stackInfo.taskIds[i]) {
+                        activityInfo.inBackground = true;
+                    }
+                }
+                if (!activityInfo.inBackground) {
+                    activityInfo.taskId = INVALID_TASK_ID;
+                }
+            }
+
+            for (int i = 0; i < mRunningActivities.size(); i++) {
+                RunningActivityInfo activityInfo = mRunningActivities.valueAt(i);
+                long timeSinceLastLaunchMs = now - activityInfo.lastLaunchTimeMs;
+                if (activityInfo.isVisible) {
+                    if (timeSinceLastLaunchMs >= CRASH_FORGET_INTERVAL_MS) {
+                        activityInfo.consecutiveRetries = 0;
+                    }
+                    continue;
+                }
+                if (!isComponentAvailable(activityInfo.intent.getComponent(),
+                        activityInfo.userId)) {
+                    continue;
+                }
+                // For 1st call (consecutiveRetries == 0), do not wait as there can be no posting
+                // for recheck.
+                if (activityInfo.consecutiveRetries > 0 && (timeSinceLastLaunchMs
+                        < RECHECK_INTERVAL_MS)) {
+                    // wait until next check interval comes.
+                    continue;
+                }
+                if (activityInfo.consecutiveRetries >= MAX_NUMBER_OF_CONSECUTIVE_CRASH_RETRY) {
+                    // re-tried too many times, give up for now.
+                    if (!activityInfo.failureLogged) {
+                        activityInfo.failureLogged = true;
+                        Log.w(TAG_AM, "Too many relaunch failure of fixed activity:"
+                                + activityInfo);
+                    }
+                    continue;
+                }
+
+                Log.i(TAG_AM, "Launching Activity for fixed mode. Intent:" + activityInfo.intent
+                        + ",userId:" + UserHandle.of(activityInfo.userId) + ",displayId:"
+                        + mRunningActivities.keyAt(i));
+                // Increase retry count if task is not in background. In case like other app is
+                // launched and the target activity is still in background, do not consider it
+                // as retry.
+                if (!activityInfo.inBackground) {
+                    activityInfo.consecutiveRetries++;
+                }
+                try {
+                    postRecheck(RECHECK_INTERVAL_MS);
+                    postRecheck(CRASH_FORGET_INTERVAL_MS);
+                    mContext.startActivityAsUser(activityInfo.intent,
+                            activityInfo.activityOptions.toBundle(),
+                            UserHandle.of(activityInfo.userId));
+                    activityInfo.isVisible = true;
+                    activityInfo.lastLaunchTimeMs = SystemClock.elapsedRealtime();
+                } catch (Exception e) { // Catch all for any app related issues.
+                    Log.w(TAG_AM, "Cannot start activity:" + activityInfo.intent, e);
+                }
+            }
+            RunningActivityInfo activityInfo = mRunningActivities.get(displayId);
+            if (activityInfo == null) {
+                return false;
+            }
+            return activityInfo.isVisible;
+        }
+    }
+
+    private void launchIfNecessary() {
+        launchIfNecessary(Display.INVALID_DISPLAY);
+    }
+
+    private void logComponentNotFound(ComponentName component, @UserIdInt  int userId,
+            Exception e) {
+        Log.e(TAG_AM, "Specified Component not found:" + component
+                + " for userid:" + userId, e);
+    }
+
+    private boolean isComponentAvailable(ComponentName component, @UserIdInt int userId) {
+        PackageInfo packageInfo;
+        try {
+            packageInfo = mContext.getPackageManager().getPackageInfoAsUser(
+                    component.getPackageName(), PackageManager.GET_ACTIVITIES, userId);
+        } catch (PackageManager.NameNotFoundException e) {
+            logComponentNotFound(component, userId, e);
+            return false;
+        }
+        if (packageInfo == null || packageInfo.activities == null) {
+            // may not be necessary but additional safety check
+            logComponentNotFound(component, userId, new RuntimeException());
+            return false;
+        }
+        String fullName = component.getClassName();
+        String shortName = component.getShortClassName();
+        for (ActivityInfo info : packageInfo.activities) {
+            if (info.name.equals(fullName) || info.name.equals(shortName)) {
+                return true;
+            }
+        }
+        logComponentNotFound(component, userId, new RuntimeException());
+        return false;
+    }
+
+    private boolean isUserAllowedToLaunchActivity(@UserIdInt int userId) {
+        int currentUser = ActivityManager.getCurrentUser();
+        if (userId == currentUser) {
+            return true;
+        }
+        int[] profileIds = mUm.getEnabledProfileIds(currentUser);
+        for (int id : profileIds) {
+            if (id == userId) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isDisplayAllowedForFixedMode(int displayId) {
+        if (displayId == Display.DEFAULT_DISPLAY || displayId == Display.INVALID_DISPLAY) {
+            Log.w(TAG_AM, "Target display cannot be used for fixed mode, displayId:" + displayId,
+                    new RuntimeException());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks {@link InstrumentClusterRenderingService#startFixedActivityModeForDisplayAndUser(
+     * Intent, ActivityOptions, int)}
+     */
+    public boolean startFixedActivityModeForDisplayAndUser(@NonNull Intent intent,
+            @NonNull ActivityOptions options, int displayId, @UserIdInt int userId) {
+        if (!isDisplayAllowedForFixedMode(displayId)) {
+            return false;
+        }
+        if (options == null) {
+            Log.e(TAG_AM, "startFixedActivityModeForDisplayAndUser, null options");
+            return false;
+        }
+        if (!isUserAllowedToLaunchActivity(userId)) {
+            Log.e(TAG_AM, "startFixedActivityModeForDisplayAndUser, requested user:" + userId
+                    + " cannot launch activity, Intent:" + intent);
+            return false;
+        }
+        ComponentName component = intent.getComponent();
+        if (component == null) {
+            Log.e(TAG_AM,
+                    "startFixedActivityModeForDisplayAndUser: No component specified for "
+                            + "requested Intent"
+                            + intent);
+            return false;
+        }
+        if (!isComponentAvailable(component, userId)) {
+            return false;
+        }
+        boolean startMonitoringEvents = false;
+        synchronized (mLock) {
+            Presentation p = mBlockingPresentations.removeReturnOld(displayId);
+            if (p != null) {
+                p.dismiss();
+            }
+            if (mRunningActivities.size() == 0) {
+                startMonitoringEvents = true;
+            }
+            RunningActivityInfo activityInfo = mRunningActivities.get(displayId);
+            boolean replaceEntry = true;
+            if (activityInfo != null && activityInfo.intent.equals(intent)
+                    && options.equals(activityInfo.activityOptions)
+                    && userId == activityInfo.userId) {
+                replaceEntry = false;
+                if (activityInfo.isVisible) { // already shown.
+                    return true;
+                }
+            }
+            if (replaceEntry) {
+                activityInfo = new RunningActivityInfo(intent, options, userId);
+                mRunningActivities.put(displayId, activityInfo);
+            }
+        }
+        boolean launched = launchIfNecessary(displayId);
+        if (!launched) {
+            synchronized (mLock) {
+                mRunningActivities.remove(displayId);
+            }
+        }
+        // If first trial fails, let client know and do not retry as it can be wrong setting.
+        if (startMonitoringEvents && launched) {
+            startMonitoringEvents();
+        }
+        return launched;
+    }
+
+    /** Check {@link InstrumentClusterRenderingService#stopFixedActivityMode(int)} */
+    public void stopFixedActivityMode(int displayId) {
+        if (!isDisplayAllowedForFixedMode(displayId)) {
+            return;
+        }
+        boolean stopMonitoringEvents = false;
+        synchronized (mLock) {
+            mRunningActivities.remove(displayId);
+            if (mRunningActivities.size() == 0) {
+                stopMonitoringEvents = true;
+            }
+        }
+        if (stopMonitoringEvents) {
+            stopMonitoringEvents();
+        }
+    }
+}
diff --git a/service/src/com/android/car/audio/CarAudioFocus.java b/service/src/com/android/car/audio/CarAudioFocus.java
index 165caad..286a045 100644
--- a/service/src/com/android/car/audio/CarAudioFocus.java
+++ b/service/src/com/android/car/audio/CarAudioFocus.java
@@ -113,6 +113,10 @@
                             mAfi.getPackageName())
                     == PackageManager.PERMISSION_GRANTED);
         }
+
+        String getUsageName() {
+            return mAfi.getAttributes().usageToString();
+        }
     }
 
 
@@ -171,8 +175,9 @@
     // The default audio framework's behavior is to remove the previous entry in the stack (no-op
     // if the requester is already holding focus).
     int evaluateFocusRequest(AudioFocusInfo afi) {
-        Log.i(TAG, "Evaluating " + focusEventToString(afi.getGainRequest()) + " request for client "
-                + afi.getClientId());
+        Log.i(TAG, "Evaluating " + focusEventToString(afi.getGainRequest())
+                + " request for client " + afi.getClientId()
+                + " with usage " + afi.getAttributes().usageToString());
 
         // Is this a request for premanant focus?
         // AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE -- Means Notifications should be denied
@@ -588,14 +593,17 @@
     public synchronized void dump(String indent, PrintWriter writer) {
         writer.printf("%s*CarAudioFocus*\n", indent);
 
-        writer.printf("%s\tCurrent Focus Holders:\n", indent);
+        String innerIndent = indent + "\t";
+        writer.printf("%sCurrent Focus Holders:\n", innerIndent);
         for (String clientId : mFocusHolders.keySet()) {
-            writer.printf("%s\t\t%s\n", indent, clientId);
+            writer.printf("%s\t%s - %s\n", innerIndent, clientId,
+                    mFocusHolders.get(clientId).getUsageName());
         }
 
-        writer.printf("%s\tTransient Focus Losers:\n", indent);
+        writer.printf("%sTransient Focus Losers:\n", innerIndent);
         for (String clientId : mFocusLosers.keySet()) {
-            writer.printf("%s\t\t%s\n", indent, clientId);
+            writer.printf("%s\t%s - %s\n", innerIndent, clientId,
+                    mFocusLosers.get(clientId).getUsageName());
         }
     }
 
diff --git a/service/src/com/android/car/cluster/InstrumentClusterService.java b/service/src/com/android/car/cluster/InstrumentClusterService.java
index fd16da5..cc0a6b7 100644
--- a/service/src/com/android/car/cluster/InstrumentClusterService.java
+++ b/service/src/com/android/car/cluster/InstrumentClusterService.java
@@ -15,17 +15,23 @@
  */
 package com.android.car.cluster;
 
+import static android.car.cluster.renderer.InstrumentClusterRenderingService.EXTRA_BUNDLE_KEY_FOR_INSTRUMENT_CLUSTER_HELPER;
+
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
+import android.app.ActivityOptions;
 import android.car.CarAppFocusManager;
 import android.car.cluster.IInstrumentClusterManagerCallback;
 import android.car.cluster.IInstrumentClusterManagerService;
 import android.car.cluster.renderer.IInstrumentCluster;
+import android.car.cluster.renderer.IInstrumentClusterHelper;
 import android.car.cluster.renderer.IInstrumentClusterNavigation;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Binder;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -43,6 +49,7 @@
 import com.android.car.CarLog;
 import com.android.car.CarServiceBase;
 import com.android.car.R;
+import com.android.car.am.FixedActivityService;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 
@@ -69,16 +76,18 @@
      */
     @Deprecated
     private final ClusterManagerService mClusterManagerService = new ClusterManagerService();
-    private final Object mSync = new Object();
-    @GuardedBy("mSync")
+    private final Object mLock = new Object();
+    @GuardedBy("mLock")
     private ContextOwner mNavContextOwner = NO_OWNER;
-    @GuardedBy("mSync")
+    @GuardedBy("mLock")
     private IInstrumentCluster mRendererService;
     // If renderer service crashed / stopped and this class fails to rebind with it immediately,
     // we should wait some time before next attempt. This may happen during APK update for example.
+    @GuardedBy("mLock")
     private DeferredRebinder mDeferredRebinder;
     // Whether {@link android.car.cluster.renderer.InstrumentClusterRendererService} is bound
     // (although not necessarily connected)
+    @GuardedBy("mLock")
     private boolean mRendererBound = false;
 
     /**
@@ -92,7 +101,7 @@
             }
             IInstrumentCluster service = IInstrumentCluster.Stub.asInterface(binder);
             ContextOwner navContextOwner;
-            synchronized (mSync) {
+            synchronized (mLock) {
                 mRendererService = service;
                 navContextOwner = mNavContextOwner;
             }
@@ -107,19 +116,41 @@
                 Log.d(TAG, "onServiceDisconnected, name: " + name);
             }
             mContext.unbindService(this);
-            mRendererBound = false;
-
-            synchronized (mSync) {
+            DeferredRebinder rebinder;
+            synchronized (mLock) {
+                mRendererBound = false;
                 mRendererService = null;
+                if (mDeferredRebinder == null) {
+                    mDeferredRebinder = new DeferredRebinder();
+                }
+                rebinder = mDeferredRebinder;
             }
-
-            if (mDeferredRebinder == null) {
-                mDeferredRebinder = new DeferredRebinder();
-            }
-            mDeferredRebinder.rebind();
+            rebinder.rebind();
         }
     };
 
+    private final IInstrumentClusterHelper mInstrumentClusterHelper =
+            new IInstrumentClusterHelper.Stub() {
+                @Override
+                public boolean startFixedActivityModeForDisplayAndUser(Intent intent,
+                        Bundle activityOptionsBundle, int userId) {
+                    Binder.clearCallingIdentity();
+                    ActivityOptions options = new ActivityOptions(activityOptionsBundle);
+                    FixedActivityService service = CarLocalServices.getService(
+                            FixedActivityService.class);
+                    return service.startFixedActivityModeForDisplayAndUser(intent, options,
+                            options.getLaunchDisplayId(), userId);
+                }
+
+                @Override
+                public void stopFixedActivityMode(int displayId) {
+                    Binder.clearCallingIdentity();
+                    FixedActivityService service = CarLocalServices.getService(
+                            FixedActivityService.class);
+                    service.stopFixedActivityMode(displayId);
+                }
+            };
+
     public InstrumentClusterService(Context context, AppFocusService appFocusService,
             CarInputService carInputService) {
         mContext = context;
@@ -181,7 +212,7 @@
         IInstrumentCluster service;
         ContextOwner requester = new ContextOwner(uid, pid);
         ContextOwner newOwner = acquire ? requester : NO_OWNER;
-        synchronized (mSync) {
+        synchronized (mLock) {
             if ((acquire && Objects.equals(mNavContextOwner, requester))
                     || (!acquire && !Objects.equals(mNavContextOwner, requester))) {
                 // Nothing to do here. Either the same owner is acquiring twice, or someone is
@@ -221,6 +252,11 @@
 
         Intent intent = new Intent();
         intent.setComponent(ComponentName.unflattenFromString(rendererService));
+        // Litle bit inefficiency here as Intent.getIBinderExtra() is a hidden API.
+        Bundle bundle = new Bundle();
+        bundle.putBinder(EXTRA_BUNDLE_KEY_FOR_INSTRUMENT_CLUSTER_HELPER,
+                mInstrumentClusterHelper.asBinder());
+        intent.putExtra(EXTRA_BUNDLE_KEY_FOR_INSTRUMENT_CLUSTER_HELPER, bundle);
         return mContext.bindServiceAsUser(intent, mRendererServiceConnection,
                 Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT, UserHandle.SYSTEM);
     }
@@ -262,7 +298,7 @@
 
     private IInstrumentCluster getInstrumentClusterRendererService() {
         IInstrumentCluster service;
-        synchronized (mSync) {
+        synchronized (mLock) {
             service = mRendererService;
         }
         return service;
diff --git a/service/src/com/android/car/garagemode/Controller.java b/service/src/com/android/car/garagemode/Controller.java
index d7235dd..9380409 100644
--- a/service/src/com/android/car/garagemode/Controller.java
+++ b/service/src/com/android/car/garagemode/Controller.java
@@ -106,10 +106,10 @@
     }
 
     /**
-     * @return The names of the jobs that Garage Mode is waiting for
+     * @return Garage Mode's status, including what jobs it is waiting for
      */
-    List<String> pendingGarageModeJobs() {
-        return mGarageMode.pendingJobs();
+    List<String> dump() {
+        return mGarageMode.dump();
     }
 
     /**
diff --git a/service/src/com/android/car/garagemode/GarageMode.java b/service/src/com/android/car/garagemode/GarageMode.java
index 1165de5..bdb7a82 100644
--- a/service/src/com/android/car/garagemode/GarageMode.java
+++ b/service/src/com/android/car/garagemode/GarageMode.java
@@ -27,6 +27,7 @@
 import com.android.car.CarLocalServices;
 import com.android.car.CarStatsLog;
 import com.android.car.user.CarUserService;
+import com.android.internal.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,27 +56,46 @@
     public static final String ACTION_GARAGE_MODE_OFF =
             "com.android.server.jobscheduler.GARAGE_MODE_OFF";
 
+    @VisibleForTesting
     static final long JOB_SNAPSHOT_INITIAL_UPDATE_MS = 10_000; // 10 seconds
-    static final long JOB_SNAPSHOT_UPDATE_FREQUENCY_MS = 1_000; // 1 second
-    static final long USER_STOP_CHECK_INTERVAL = 10_000; // 10 secs
+
+    private static final long JOB_SNAPSHOT_UPDATE_FREQUENCY_MS = 1_000; // 1 second
+    private static final long USER_STOP_CHECK_INTERVAL = 10_000; // 10 secs
+    private static final int ADDITIONAL_CHECKS_TO_DO = 1;
 
     private final Controller mController;
 
     private boolean mGarageModeActive;
+    private int mAdditionalChecksToDo = ADDITIONAL_CHECKS_TO_DO;
     private JobScheduler mJobScheduler;
-    private List<String> mPendingJobs = new ArrayList<>();
     private Handler mHandler;
     private Runnable mRunnable = new Runnable() {
         @Override
         public void run() {
-            int numberRunning = numberOfJobsRunning();
+            int numberRunning = numberOfIdleJobsRunning();
             if (numberRunning > 0) {
                 LOG.d("" + numberRunning + " jobs are still running. Need to wait more ...");
-                mHandler.postDelayed(mRunnable, JOB_SNAPSHOT_UPDATE_FREQUENCY_MS);
+                mAdditionalChecksToDo = ADDITIONAL_CHECKS_TO_DO;
             } else {
-                LOG.d("No jobs are currently running.");
-                finish();
+                // No idle-mode jobs are running.
+                // Are there any scheduled idle jobs that could run now?
+                int numberReadyToRun = numberOfJobsPending();
+                if (numberReadyToRun == 0) {
+                    LOG.d("No jobs are running. No jobs are pending. Exiting Garage Mode.");
+                    finish();
+                    return;
+                }
+                if (mAdditionalChecksToDo == 0) {
+                    LOG.d("No jobs are running. Waited too long for "
+                            + numberReadyToRun + " pending jobs. Exiting Garage Mode.");
+                    finish();
+                    return;
+                }
+                LOG.d("No jobs are running. Waiting " + mAdditionalChecksToDo
+                        + " more cycles for " + numberReadyToRun + " pending jobs.");
+                mAdditionalChecksToDo--;
             }
+            mHandler.postDelayed(mRunnable, JOB_SNAPSHOT_UPDATE_FREQUENCY_MS);
         }
     };
 
@@ -92,7 +112,7 @@
                     return;
                 }
             }
-            if (numberOfJobsRunning() == 0) { // all jobs done or stopped.
+            if (numberOfIdleJobsRunning() == 0) { // all jobs done or stopped.
                 // Keep user until job scheduling is stopped. Otherwise, it can crash jobs.
                 if (userToStop != UserHandle.USER_SYSTEM) {
                     CarLocalServices.getService(CarUserService.class).stopBackgroundUser(
@@ -130,8 +150,28 @@
         return mGarageModeActive;
     }
 
-    synchronized List<String> pendingJobs() {
-        return mPendingJobs;
+    List<String> dump() {
+        List<String> outString = new ArrayList<>();
+        if (!mGarageModeActive) {
+            return outString;
+        }
+        List<String> jobList = new ArrayList<>();
+        int numJobs = getListOfIdleJobsRunning(jobList);
+        if (numJobs > 0) {
+            outString.add("GarageMode is waiting for " + numJobs + " jobs:");
+            // Dump the names of the jobs that we are waiting for
+            for (int idx = 0; idx < jobList.size(); idx++) {
+                outString.add("   " + (idx + 1) + ": " + jobList.get(idx));
+            }
+        } else {
+            // Dump the names of the pending jobs that we are waiting for
+            numJobs = getListOfPendingJobs(jobList);
+            outString.add("GarageMode is waiting for " + jobList.size() + " pending idle jobs:");
+            for (int idx = 0; idx < jobList.size(); idx++) {
+                outString.add("   " + (idx + 1) + ": " + jobList.get(idx));
+            }
+        }
+        return outString;
     }
 
     void enterGarageMode(CompletableFuture<Void> future) {
@@ -220,6 +260,7 @@
     }
 
     private synchronized void startMonitoringThread() {
+        mAdditionalChecksToDo = ADDITIONAL_CHECKS_TO_DO;
         mHandler.postDelayed(mRunnable, JOB_SNAPSHOT_INITIAL_UPDATE_MS);
     }
 
@@ -227,22 +268,54 @@
         mHandler.removeCallbacks(mRunnable);
     }
 
-    private synchronized int numberOfJobsRunning() {
+    private int numberOfIdleJobsRunning() {
+        return getListOfIdleJobsRunning(null);
+    }
+
+    private int getListOfIdleJobsRunning(List<String> jobList) {
+        if (jobList != null) {
+            jobList.clear();
+        }
         List<JobInfo> startedJobs = mJobScheduler.getStartedJobs();
+        if (startedJobs == null) {
+            return 0;
+        }
         int count = 0;
-        List<String> currentPendingJobs = new ArrayList<>();
-        for (JobSnapshot snap : mJobScheduler.getAllJobSnapshots()) {
-            if (startedJobs.contains(snap.getJobInfo())
-                    && snap.getJobInfo().isRequireDeviceIdle()) {
-                currentPendingJobs.add(snap.getJobInfo().toString());
+        for (int idx = 0; idx < startedJobs.size(); idx++) {
+            JobInfo jobInfo = startedJobs.get(idx);
+            if (jobInfo.isRequireDeviceIdle()) {
                 count++;
+                if (jobList != null) {
+                    jobList.add(jobInfo.toString());
+                }
             }
         }
-        if (count > 0) {
-            // We have something pending, so update the list.
-            // (Otherwise, keep the old list.)
-            mPendingJobs = currentPendingJobs;
-        }
         return count;
     }
+
+    private int numberOfJobsPending() {
+        return getListOfPendingJobs(null);
+    }
+
+    private int getListOfPendingJobs(List<String> jobList) {
+        if (jobList != null) {
+            jobList.clear();
+        }
+        List<JobSnapshot> allScheduledJobs = mJobScheduler.getAllJobSnapshots();
+        if (allScheduledJobs == null) {
+            return 0;
+        }
+        int numberPending = 0;
+        for (int idx = 0; idx < allScheduledJobs.size(); idx++) {
+            JobSnapshot scheduledJob = allScheduledJobs.get(idx);
+            JobInfo jobInfo = scheduledJob.getJobInfo();
+            if (scheduledJob.isRunnable() && jobInfo.isRequireDeviceIdle()) {
+                numberPending++;
+                if (jobList != null) {
+                    jobList.add(jobInfo.toString());
+                }
+            }
+        }
+        return numberPending;
+    }
 }
diff --git a/service/src/com/android/car/garagemode/GarageModeService.java b/service/src/com/android/car/garagemode/GarageModeService.java
index 8527bc7..ea67b91 100644
--- a/service/src/com/android/car/garagemode/GarageModeService.java
+++ b/service/src/com/android/car/garagemode/GarageModeService.java
@@ -70,17 +70,9 @@
     public void dump(PrintWriter writer) {
         boolean isActive = mController.isGarageModeActive();
         writer.println("GarageModeInProgress " + isActive);
-        List<String> jobs = mController.pendingGarageModeJobs();
-        if (isActive) {
-            writer.println("GarageMode is currently waiting for " + jobs.size() + " jobs:");
-        } else {
-            writer.println("GarageMode was last waiting for " + jobs.size() + " jobs:");
-        }
-        // Dump the names of the jobs that GM is/was waiting for
-        int jobNumber = 1;
-        for (String job : jobs) {
-            writer.println("   " + jobNumber + ": " + job);
-            jobNumber++;
+        List<String> status = mController.dump();
+        for (int idx = 0; idx < status.size(); idx++) {
+            writer.println(status.get(idx));
         }
     }
 
diff --git a/service/src/com/android/car/hal/PowerHalService.java b/service/src/com/android/car/hal/PowerHalService.java
index 0eeca99..0eaa5cc 100644
--- a/service/src/com/android/car/hal/PowerHalService.java
+++ b/service/src/com/android/car/hal/PowerHalService.java
@@ -205,7 +205,7 @@
      */
     public void sendSleepEntry(int wakeupTimeSec) {
         Log.i(CarLog.TAG_POWER, "send sleep entry");
-        setPowerState(VehicleApPowerStateReport.DEEP_SLEEP_ENTRY, wakeupTimeSec * 1000);
+        setPowerState(VehicleApPowerStateReport.DEEP_SLEEP_ENTRY, wakeupTimeSec);
     }
 
     /**
@@ -230,7 +230,7 @@
      */
     public void sendShutdownStart(int wakeupTimeSec) {
         Log.i(CarLog.TAG_POWER, "send shutdown start");
-        setPowerState(VehicleApPowerStateReport.SHUTDOWN_START, wakeupTimeSec * 1000);
+        setPowerState(VehicleApPowerStateReport.SHUTDOWN_START, wakeupTimeSec);
     }
 
     /**
@@ -267,6 +267,10 @@
         } else if (brightness > 100) {
             brightness = 100;
         }
+        VehiclePropConfig prop = mProperties.get(DISPLAY_BRIGHTNESS);
+        if (prop == null) {
+            return;
+        }
         try {
             mHal.set(VehicleProperty.DISPLAY_BRIGHTNESS, 0).to(brightness);
             Log.i(CarLog.TAG_POWER, "send display brightness = " + brightness);
diff --git a/service/src/com/android/car/hal/PropertyHalService.java b/service/src/com/android/car/hal/PropertyHalService.java
index 545fc2b..484e667 100644
--- a/service/src/com/android/car/hal/PropertyHalService.java
+++ b/service/src/com/android/car/hal/PropertyHalService.java
@@ -183,6 +183,14 @@
     }
 
     /**
+     * Return true if property is a display_units property
+     * @param propId
+     */
+    public boolean isDisplayUnitsProperty(int propId) {
+        return mPropIds.isPropertyToChangeUnits(propId);
+    }
+
+    /**
      * Set the property value.
      * @param prop
      */
diff --git a/service/src/com/android/car/hal/PropertyHalServiceIds.java b/service/src/com/android/car/hal/PropertyHalServiceIds.java
index 5409b4d..82a89d7 100644
--- a/service/src/com/android/car/hal/PropertyHalServiceIds.java
+++ b/service/src/com/android/car/hal/PropertyHalServiceIds.java
@@ -26,6 +26,8 @@
 import android.util.Pair;
 import android.util.SparseArray;
 
+import java.util.HashSet;
+
 /**
  * Helper class to define which property IDs are used by PropertyHalService.  This class binds the
  * read and write permissions to the property ID.
@@ -39,11 +41,12 @@
      * properties.
      */
     private final SparseArray<Pair<String, String>> mProps;
+    private final HashSet<Integer> mPropForUnits;
     private static final String TAG = "PropertyHalServiceIds";
 
     public PropertyHalServiceIds() {
         mProps = new SparseArray<>();
-
+        mPropForUnits = new HashSet<>();
         // Add propertyId and read/write permissions
         // Cabin Properties
         mProps.put(VehicleProperty.DOOR_POS, new Pair<>(
@@ -385,24 +388,31 @@
         mProps.put(VehicleProperty.CABIN_LIGHTS_SWITCH, new Pair<>(
                 Car.PERMISSION_CONTROL_INTERIOR_LIGHTS,
                 Car.PERMISSION_CONTROL_INTERIOR_LIGHTS));
+        // Display_Units
         mProps.put(VehicleProperty.DISTANCE_DISPLAY_UNITS, new Pair<>(
                 Car.PERMISSION_READ_DISPLAY_UNITS,
                 Car.PERMISSION_CONTROL_DISPLAY_UNITS));
+        mPropForUnits.add(VehicleProperty.DISTANCE_DISPLAY_UNITS);
         mProps.put(VehicleProperty.FUEL_VOLUME_DISPLAY_UNITS, new Pair<>(
                 Car.PERMISSION_READ_DISPLAY_UNITS,
                 Car.PERMISSION_CONTROL_DISPLAY_UNITS));
+        mPropForUnits.add(VehicleProperty.FUEL_VOLUME_DISPLAY_UNITS);
         mProps.put(VehicleProperty.TIRE_PRESSURE_DISPLAY_UNITS, new Pair<>(
                 Car.PERMISSION_READ_DISPLAY_UNITS,
                 Car.PERMISSION_CONTROL_DISPLAY_UNITS));
+        mPropForUnits.add(VehicleProperty.TIRE_PRESSURE_DISPLAY_UNITS);
         mProps.put(VehicleProperty.EV_BATTERY_DISPLAY_UNITS, new Pair<>(
                 Car.PERMISSION_READ_DISPLAY_UNITS,
                 Car.PERMISSION_CONTROL_DISPLAY_UNITS));
+        mPropForUnits.add(VehicleProperty.EV_BATTERY_DISPLAY_UNITS);
         mProps.put(VehicleProperty.FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME, new Pair<>(
                 Car.PERMISSION_READ_DISPLAY_UNITS,
                 Car.PERMISSION_CONTROL_DISPLAY_UNITS));
+        mPropForUnits.add(VehicleProperty.FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME);
         mProps.put(VehicleProperty.VEHICLE_SPEED_DISPLAY_UNITS, new Pair<>(
                 Car.PERMISSION_READ_DISPLAY_UNITS,
                 Car.PERMISSION_CONTROL_DISPLAY_UNITS));
+        mPropForUnits.add(VehicleProperty.VEHICLE_SPEED_DISPLAY_UNITS);
     }
 
     /**
@@ -469,4 +479,11 @@
             return insertVendorProperty(propId);
         }
     }
+
+    /**
+     * Check if the property is one of display units properties.
+     */
+    public boolean isPropertyToChangeUnits(int propertyId) {
+        return mPropForUnits.contains(propertyId);
+    }
 }
diff --git a/service/src/com/android/car/hal/VehicleHal.java b/service/src/com/android/car/hal/VehicleHal.java
index 374ae7b..d85a357 100644
--- a/service/src/com/android/car/hal/VehicleHal.java
+++ b/service/src/com/android/car/hal/VehicleHal.java
@@ -23,6 +23,7 @@
 import static java.lang.Integer.toHexString;
 
 import android.annotation.CheckResult;
+import android.content.Context;
 import android.hardware.automotive.vehicle.V2_0.IVehicle;
 import android.hardware.automotive.vehicle.V2_0.IVehicleCallback;
 import android.hardware.automotive.vehicle.V2_0.SubscribeFlags;
@@ -89,14 +90,14 @@
     // Used by injectVHALEvent for testing purposes.  Delimiter for an array of data
     private static final String DATA_DELIMITER = ",";
 
-    public VehicleHal(IVehicle vehicle) {
+    public VehicleHal(Context context, IVehicle vehicle) {
         mHandlerThread = new HandlerThread("VEHICLE-HAL");
         mHandlerThread.start();
         // passing this should be safe as long as it is just kept and not used in constructor
         mPowerHal = new PowerHalService(this);
         mPropertyHal = new PropertyHalService(this);
         mInputHal = new InputHalService(this);
-        mVmsHal = new VmsHalService(this);
+        mVmsHal = new VmsHalService(context, this);
         mDiagnosticHal = new DiagnosticHalService(this);
         mAllServices.addAll(Arrays.asList(mPowerHal,
                 mInputHal,
diff --git a/service/src/com/android/car/hal/VmsHalService.java b/service/src/com/android/car/hal/VmsHalService.java
index 3f39f48..99263d7 100644
--- a/service/src/com/android/car/hal/VmsHalService.java
+++ b/service/src/com/android/car/hal/VmsHalService.java
@@ -17,8 +17,6 @@
 
 import static com.android.car.CarServiceUtils.toByteArray;
 
-import static java.lang.Integer.toHexString;
-
 import android.car.VehicleAreaType;
 import android.car.vms.IVmsPublisherClient;
 import android.car.vms.IVmsPublisherService;
@@ -31,9 +29,11 @@
 import android.car.vms.VmsLayersOffering;
 import android.car.vms.VmsOperationRecorder;
 import android.car.vms.VmsSubscriptionState;
+import android.content.Context;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropConfig;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.hardware.automotive.vehicle.V2_0.VehiclePropertyGroup;
 import android.hardware.automotive.vehicle.V2_0.VmsBaseMessageIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsMessageType;
 import android.hardware.automotive.vehicle.V2_0.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex;
@@ -41,6 +41,7 @@
 import android.hardware.automotive.vehicle.V2_0.VmsOfferingMessageIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsPublisherInformationIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsStartSessionMessageIntegerValuesIndex;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -52,8 +53,11 @@
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.car.CarLog;
+import com.android.car.vms.VmsClientManager;
 
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -62,7 +66,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
@@ -72,7 +75,7 @@
  * @see android.hardware.automotive.vehicle.V2_0
  */
 public class VmsHalService extends HalServiceBase {
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final String TAG = "VmsHalService";
     private static final int HAL_PROPERTY_ID = VehicleProperty.VEHICLE_MAP_SERVICE;
     private static final int NUM_INTEGERS_IN_VMS_LAYER = 3;
@@ -81,15 +84,14 @@
     private final VehicleHal mVehicleHal;
     private final int mCoreId;
     private final MessageQueue mMessageQueue;
+    private final int mClientMetricsProperty;
+    private final boolean mPropagatePropertyException;
     private volatile boolean mIsSupported = false;
 
+    private VmsClientManager mClientManager;
     private IVmsPublisherService mPublisherService;
-    private Consumer<IBinder> mPublisherOnHalConnected;
-    private Runnable mPublisherOnHalDisconnected;
     private IBinder mPublisherToken;
-
     private IVmsSubscriberService mSubscriberService;
-    private Consumer<IVmsSubscriberClient> mSuscriberOnHalDisconnected;
 
     private int mSubscriptionStateSequence = -1;
     private int mAvailableLayersSequence = -1;
@@ -183,11 +185,7 @@
             int messageType = msg.what;
             VehiclePropValue vehicleProp = (VehiclePropValue) msg.obj;
             if (DBG) Log.d(TAG, "Sending " + VmsMessageType.toString(messageType) + " message");
-            try {
-                setPropertyValue(vehicleProp);
-            } catch (RemoteException e) {
-                Log.e(TAG, "While sending " + VmsMessageType.toString(messageType));
-            }
+            setPropertyValue(vehicleProp);
             return true;
         }
     }
@@ -195,15 +193,35 @@
     /**
      * Constructor used by {@link VehicleHal}
      */
-    VmsHalService(VehicleHal vehicleHal) {
-        this(vehicleHal, SystemClock::uptimeMillis);
+    VmsHalService(Context context, VehicleHal vehicleHal) {
+        this(context, vehicleHal, SystemClock::uptimeMillis, (Build.IS_ENG || Build.IS_USERDEBUG));
     }
 
     @VisibleForTesting
-    VmsHalService(VehicleHal vehicleHal, Supplier<Long> getCoreId) {
+    VmsHalService(Context context, VehicleHal vehicleHal, Supplier<Long> getCoreId,
+            boolean propagatePropertyException) {
         mVehicleHal = vehicleHal;
         mCoreId = (int) (getCoreId.get() % Integer.MAX_VALUE);
         mMessageQueue = new MessageQueue();
+        mClientMetricsProperty = getClientMetricsProperty(context);
+        mPropagatePropertyException = propagatePropertyException;
+    }
+
+    private static int getClientMetricsProperty(Context context) {
+        int propId = context.getResources().getInteger(
+                com.android.car.R.integer.vmsHalClientMetricsProperty);
+        if (propId == 0) {
+            Log.i(TAG, "Metrics collection disabled");
+            return 0;
+        }
+        if ((propId & VehiclePropertyGroup.MASK) != VehiclePropertyGroup.VENDOR) {
+            Log.w(TAG, String.format("Metrics collection disabled, non-vendor property: 0x%x",
+                    propId));
+            return 0;
+        }
+
+        Log.i(TAG, String.format("Metrics collection property: 0x%x", propId));
+        return propId;
     }
 
     /**
@@ -215,21 +233,17 @@
     }
 
     /**
-     * Gets the {@link IVmsPublisherClient} implementation for the HAL's publisher callback.
+     * Sets a reference to the {@link VmsClientManager} implementation for use by the HAL.
      */
-    public void setPublisherConnectionCallbacks(Consumer<IBinder> onHalConnected,
-            Runnable onHalDisconnected) {
-        mPublisherOnHalConnected = onHalConnected;
-        mPublisherOnHalDisconnected = onHalDisconnected;
+    public void setClientManager(VmsClientManager clientManager) {
+        mClientManager = clientManager;
     }
 
     /**
      * Sets a reference to the {@link IVmsSubscriberService} implementation for use by the HAL.
      */
-    public void setVmsSubscriberService(IVmsSubscriberService service,
-            Consumer<IVmsSubscriberClient> onHalDisconnected) {
+    public void setVmsSubscriberService(IVmsSubscriberService service) {
         mSubscriberService = service;
-        mSuscriberOnHalDisconnected = onHalDisconnected;
     }
 
     @Override
@@ -247,10 +261,10 @@
     @Override
     public void init() {
         if (mIsSupported) {
-            if (DBG) Log.d(TAG, "Initializing VmsHalService VHAL property");
+            Log.i(TAG, "Initializing VmsHalService VHAL property");
             mVehicleHal.subscribeProperty(this, HAL_PROPERTY_ID);
         } else {
-            if (DBG) Log.d(TAG, "VmsHalService VHAL property not supported");
+            Log.i(TAG, "VmsHalService VHAL property not supported");
             return; // Do not continue initialization
         }
 
@@ -296,6 +310,38 @@
     }
 
     /**
+     * Dumps HAL client metrics obtained by reading the VMS HAL property.
+     *
+     * @param fd Dumpsys file descriptor to write client metrics to.
+     */
+    public void dumpMetrics(FileDescriptor fd) {
+        if (mClientMetricsProperty == 0) {
+            Log.w(TAG, "Metrics collection is disabled");
+            return;
+        }
+
+        VehiclePropValue vehicleProp = null;
+        try {
+            vehicleProp = mVehicleHal.get(mClientMetricsProperty);
+        } catch (PropertyTimeoutException | RuntimeException e) {
+            // Failures to retrieve metrics should be non-fatal
+            Log.e(TAG, "While reading metrics from client", e);
+        }
+        if (vehicleProp == null) {
+            if (DBG) Log.d(TAG, "Metrics unavailable");
+            return;
+        }
+
+        FileOutputStream fout = new FileOutputStream(fd);
+        try {
+            fout.write(toByteArray(vehicleProp.value.bytes));
+            fout.flush();
+        } catch (IOException e) {
+            Log.e(TAG, "Error writing metrics to output stream");
+        }
+    }
+
+    /**
      * Consumes/produces HAL messages.
      *
      * The format of these messages is defined in:
@@ -347,7 +393,7 @@
                         Log.e(TAG, "Unexpected message type: " + messageType);
                 }
             } catch (IndexOutOfBoundsException | RemoteException e) {
-                Log.e(TAG, "While handling: " + messageType, e);
+                Log.e(TAG, "While handling " + VmsMessageType.toString(messageType), e);
             }
         }
     }
@@ -363,22 +409,13 @@
     private void handleStartSessionEvent(List<Integer> message) {
         int coreId = message.get(VmsStartSessionMessageIntegerValuesIndex.SERVICE_ID);
         int clientId = message.get(VmsStartSessionMessageIntegerValuesIndex.CLIENT_ID);
-        if (DBG) {
-            Log.d(TAG,
-                    "Handling a session start event with coreId: " + coreId + " client: "
-                            + clientId);
-        }
+        Log.i(TAG, "Starting new session with coreId: " + coreId + " client: " + clientId);
 
         if (coreId != mCoreId) {
-            if (mPublisherOnHalDisconnected != null) {
-                mPublisherOnHalDisconnected.run();
+            if (mClientManager != null) {
+                mClientManager.onHalDisconnected();
             } else {
-                Log.w(TAG, "Publisher disconnect callback not registered");
-            }
-            if (mSuscriberOnHalDisconnected != null) {
-                mSuscriberOnHalDisconnected.accept(mSubscriberClient);
-            } else {
-                Log.w(TAG, "Subscriber disconnect callback not registered");
+                Log.w(TAG, "Client manager not registered");
             }
 
             // Drop all queued messages and client state
@@ -386,26 +423,18 @@
             mSubscriptionStateSequence = -1;
             mAvailableLayersSequence = -1;
 
-            // Enqueue an acknowledgement message
-            mMessageQueue.enqueue(VmsMessageType.START_SESSION,
-                    createStartSessionMessage(mCoreId, clientId));
+            // Send acknowledgement message
+            setPropertyValue(createStartSessionMessage(mCoreId, clientId));
         }
 
         // Notify client manager of connection
-        if (mPublisherOnHalConnected != null) {
-            mPublisherOnHalConnected.accept(mPublisherClient);
+        if (mClientManager != null) {
+            mClientManager.onHalConnected(mPublisherClient, mSubscriberClient);
         } else {
-            Log.w(TAG, "Publisher connect callback not registered");
+            Log.w(TAG, "Client manager not registered");
         }
 
-        // Notify subscriber service of connection
         if (mSubscriberService != null) {
-            try {
-                mSubscriberService.addVmsSubscriberToNotifications(mSubscriberClient);
-            } catch (RemoteException e) {
-                Log.e(TAG, "While adding subscriber callback", e);
-            }
-
             // Publish layer availability to HAL clients (this triggers HAL client initialization)
             try {
                 mSubscriberClient.onLayersAvailabilityChanged(
@@ -646,7 +675,7 @@
                         mPublisherService.getSubscriptions()));
     }
 
-    private void setPropertyValue(VehiclePropValue vehicleProp) throws RemoteException {
+    private void setPropertyValue(VehiclePropValue vehicleProp) {
         int messageType = vehicleProp.value.int32Values.get(
                 VmsBaseMessageIntegerValuesIndex.MESSAGE_TYPE);
 
@@ -658,11 +687,11 @@
 
         try {
             mVehicleHal.set(vehicleProp);
-        } catch (PropertyTimeoutException e) {
-            Log.e(CarLog.TAG_PROPERTY,
-                    "set, property not ready 0x" + toHexString(HAL_PROPERTY_ID));
-            throw new RemoteException(
-                    "Timeout while sending " + VmsMessageType.toString(messageType));
+        } catch (PropertyTimeoutException | RuntimeException e) {
+            Log.e(TAG, "While sending " + VmsMessageType.toString(messageType), e.getCause());
+            if (mPropagatePropertyException) {
+                throw new IllegalStateException(e);
+            }
         }
     }
 
diff --git a/service/src/com/android/car/pm/ActivityBlockingActivity.java b/service/src/com/android/car/pm/ActivityBlockingActivity.java
index 9dcb70a..a9f0d6a 100644
--- a/service/src/com/android/car/pm/ActivityBlockingActivity.java
+++ b/service/src/com/android/car/pm/ActivityBlockingActivity.java
@@ -27,20 +27,15 @@
 import android.car.drivingstate.CarUxRestrictionsManager;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
 import com.android.car.CarLog;
 import com.android.car.R;
 
@@ -54,39 +49,53 @@
     private Car mCar;
     private CarUxRestrictionsManager mUxRManager;
 
-    private TextView mBlockedAppName;
-    private ImageView mBlockedAppIcon;
-    private TextView mBlockingText;
-    private TextView mExitButtonMessage;
     private Button mExitButton;
+    private Button mToggleDebug;
 
     private int mBlockedTaskId;
 
+    private final View.OnClickListener mOnExitButtonClickedListener =
+            v -> {
+                if (isExitOptionCloseApplication()) {
+                    handleCloseApplication();
+                } else {
+                    handleRestartingTask();
+                }
+            };
+
+    private final ViewTreeObserver.OnGlobalLayoutListener mOnGlobalLayoutListener =
+            new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    mToggleDebug.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                    updateButtonWidths();
+                }
+            };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_blocking);
 
-        mBlockingText = findViewById(R.id.blocking_text);
-        mBlockedAppName = findViewById(R.id.blocked_app_name);
-        mBlockedAppIcon = findViewById(R.id.blocked_app_icon);
         mExitButton = findViewById(R.id.exit_button);
-        mExitButtonMessage = findViewById(R.id.exit_button_message);
-
-        mBlockingText.setText(getString(R.string.activity_blocked_text));
 
         // Listen to the CarUxRestrictions so this blocking activity can be dismissed when the
         // restrictions are lifted.
         // This Activity should be launched only after car service is initialized. Currently this
         // Activity is only launched from CPMS. So this is safe to do.
-        mCar = Car.createCar(this);
-        mUxRManager = (CarUxRestrictionsManager) mCar.getCarManager(
-                Car.CAR_UX_RESTRICTION_SERVICE);
-        // This activity would have been launched only in a restricted state.
-        // But ensuring when the service connection is established, that we are still
-        // in a restricted state.
-        handleUxRChange(mUxRManager.getCurrentCarUxRestrictions());
-        mUxRManager.registerListener(ActivityBlockingActivity.this::handleUxRChange);
+        mCar = Car.createCar(this, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER,
+                (car, ready) -> {
+                    if (!ready) {
+                        return;
+                    }
+                    mUxRManager = (CarUxRestrictionsManager) car.getCarManager(
+                            Car.CAR_UX_RESTRICTION_SERVICE);
+                    // This activity would have been launched only in a restricted state.
+                    // But ensuring when the service connection is established, that we are still
+                    // in a restricted state.
+                    handleUxRChange(mUxRManager.getCurrentCarUxRestrictions());
+                    mUxRManager.registerListener(ActivityBlockingActivity.this::handleUxRChange);
+                });
     }
 
     @Override
@@ -105,26 +114,9 @@
             if (Log.isLoggable(CarLog.TAG_AM, Log.DEBUG)) {
                 Log.d(CarLog.TAG_AM, "Blocking activity " + blockedActivity);
             }
-            // Show application icon and name of blocked activity.
-            Drawable appIcon = findApplicationIcon(blockedActivity);
-            if (appIcon != null) {
-                mBlockedAppIcon.setImageDrawable(appIcon);
-            } else {
-                mBlockedAppIcon.setVisibility(View.GONE);
-            }
-            mBlockedAppName.setText(findHumanReadableLabel(blockedActivity));
         }
 
-        boolean isRootDO = getIntent().getBooleanExtra(
-                BLOCKING_INTENT_EXTRA_IS_ROOT_ACTIVITY_DO, false);
-
-        // Display a button to restart task if root task is DO.
-        boolean showButton = mBlockedTaskId != INVALID_TASK_ID && isRootDO;
-        mExitButton.setVisibility(showButton ? View.VISIBLE : View.GONE);
-        mExitButton.setOnClickListener(v -> handleRestartingTask());
-        mExitButtonMessage.setVisibility(showButton ? View.VISIBLE : View.GONE);
-        mExitButtonMessage.setText(
-                getString(R.string.exit_button_message, getString(R.string.exit_button)));
+        displayExitButton();
 
         // Show more debug info for non-user build.
         if (Build.IS_ENG || Build.IS_USERDEBUG) {
@@ -132,6 +124,26 @@
         }
     }
 
+    private void displayExitButton() {
+        String exitButtonText = getExitButtonText();
+
+        mExitButton.setText(exitButtonText);
+        mExitButton.setOnClickListener(mOnExitButtonClickedListener);
+    }
+
+    // If the root activity is DO, the user will have the option to go back to that activity,
+    // otherwise, the user will have the option to close the blocked application
+    private boolean isExitOptionCloseApplication() {
+        boolean isRootDO = getIntent().getBooleanExtra(
+                BLOCKING_INTENT_EXTRA_IS_ROOT_ACTIVITY_DO, false);
+        return mBlockedTaskId == INVALID_TASK_ID || !isRootDO;
+    }
+
+    private String getExitButtonText() {
+        return isExitOptionCloseApplication() ? getString(R.string.exit_button_close_application)
+                : getString(R.string.exit_button_go_back);
+    }
+
     private void displayDebugInfo() {
         String blockedActivity = getIntent().getStringExtra(
                 BLOCKING_INTENT_EXTRA_BLOCKED_ACTIVITY_NAME);
@@ -142,12 +154,29 @@
 
         // We still want to ensure driving safety for non-user build;
         // toggle visibility of debug info with this button.
-        Button toggleDebug = findViewById(R.id.toggle_debug_info);
-        toggleDebug.setVisibility(View.VISIBLE);
-        toggleDebug.setOnClickListener(v -> {
+        mToggleDebug = findViewById(R.id.toggle_debug_info);
+        mToggleDebug.setVisibility(View.VISIBLE);
+        mToggleDebug.setOnClickListener(v -> {
             boolean isDebugVisible = debugInfo.getVisibility() == View.VISIBLE;
             debugInfo.setVisibility(isDebugVisible ? View.GONE : View.VISIBLE);
         });
+
+        mToggleDebug.getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
+    }
+
+    // When the Debug button is visible, we set both of the visible buttons to have the width
+    // of whichever button is wider
+    private void updateButtonWidths() {
+        Button debugButton = findViewById(R.id.toggle_debug_info);
+
+        int exitButtonWidth = mExitButton.getWidth();
+        int debugButtonWidth = debugButton.getWidth();
+
+        if (exitButtonWidth > debugButtonWidth) {
+            debugButton.setWidth(exitButtonWidth);
+        } else {
+            mExitButton.setWidth(debugButtonWidth);
+        }
     }
 
     private String getDebugInfo(String blockedActivity, String rootActivity) {
@@ -190,6 +219,8 @@
     protected void onDestroy() {
         super.onDestroy();
         mUxRManager.unregisterListener();
+        mToggleDebug.getViewTreeObserver().removeOnGlobalLayoutListener(mOnGlobalLayoutListener);
+        mCar.disconnect();
     }
 
     // If no distraction optimization is required in the new restrictions, then dismiss the
@@ -203,48 +234,16 @@
         }
     }
 
-    // Finds the icon of the application (package) the component belongs to.
-    @Nullable
-    private Drawable findApplicationIcon(String flattenComponentName) {
-        ComponentName componentName = ComponentName.unflattenFromString(flattenComponentName);
-        try {
-            return getPackageManager().getApplicationIcon(componentName.getPackageName());
-        } catch (PackageManager.NameNotFoundException e) {
-            if (Log.isLoggable(CarLog.TAG_AM, Log.INFO)) {
-                Log.i(CarLog.TAG_AM, "Could not find package for component name "
-                        + componentName.toString());
-            }
+    private void handleCloseApplication() {
+        if (isFinishing()) {
+            return;
         }
-        return null;
-    }
 
-    /**
-     * Returns a human-readable string for {@code flattenComponentName}.
-     *
-     * <p>It first attempts to return the application label for this activity. If that fails,
-     * it will return the last part in the activity name.
-     */
-    private String findHumanReadableLabel(String flattenComponentName) {
-        ComponentName componentName = ComponentName.unflattenFromString(flattenComponentName);
-        String label = null;
-        // Attempt to find application label.
-        try {
-            ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
-                    componentName.getPackageName(), 0);
-            CharSequence appLabel = getPackageManager().getApplicationLabel(applicationInfo);
-            if (appLabel != null) {
-                label = appLabel.toString();
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            if (Log.isLoggable(CarLog.TAG_AM, Log.INFO)) {
-                Log.i(CarLog.TAG_AM, "Could not find package for component name "
-                        + componentName.toString());
-            }
-        }
-        if (TextUtils.isEmpty(label)) {
-            label = componentName.getClass().getSimpleName();
-        }
-        return label;
+        Intent startMain = new Intent(Intent.ACTION_MAIN);
+        startMain.addCategory(Intent.CATEGORY_HOME);
+        startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(startMain);
+        finish();
     }
 
     private void handleRestartingTask() {
diff --git a/service/src/com/android/car/pm/CarAppMetadataReader.java b/service/src/com/android/car/pm/CarAppMetadataReader.java
index 648fded..3363d12 100644
--- a/service/src/com/android/car/pm/CarAppMetadataReader.java
+++ b/service/src/com/android/car/pm/CarAppMetadataReader.java
@@ -56,11 +56,13 @@
         final PackageManager pm = context.getPackageManager();
 
         // Check if any of the activities in the package are DO by checking all the
-        // <activity> elements.
+        // <activity> elements. MATCH_DISABLED_COMPONENTS is included so that we are immediately
+        // prepared to respond to any components that toggle from disabled to enabled.
         PackageInfo pkgInfo =
                 pm.getPackageInfoAsUser(
                         packageName, PackageManager.GET_ACTIVITIES
                                 | PackageManager.GET_META_DATA
+                                | PackageManager.MATCH_DISABLED_COMPONENTS
                                 | PackageManager.MATCH_DIRECT_BOOT_AWARE
                                 | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
                         userId);
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index d00c7f1..54d577a 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -213,7 +213,7 @@
         if (DBG_POLICY_SET) {
             Log.i(CarLog.TAG_PACKAGE, "policy setting from binder call, client:" + packageName);
         }
-        doSetAppBlockingPolicy(packageName, policy, flags, true /*setNow*/);
+        doSetAppBlockingPolicy(packageName, policy, flags);
     }
 
     /**
@@ -224,8 +224,8 @@
         mSystemActivityMonitoringService.restartTask(taskId);
     }
 
-    private void doSetAppBlockingPolicy(String packageName, CarAppBlockingPolicy policy, int flags,
-            boolean setNow) {
+    private void doSetAppBlockingPolicy(String packageName, CarAppBlockingPolicy policy,
+            int flags) {
         if (mContext.checkCallingOrSelfPermission(Car.PERMISSION_CONTROL_APP_BLOCKING)
                 != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException(
@@ -240,15 +240,22 @@
             throw new IllegalArgumentException(
                     "Cannot set both FLAG_SET_POLICY_ADD and FLAG_SET_POLICY_REMOVE flag");
         }
-        mHandler.requestUpdatingPolicy(packageName, policy, flags);
-        if (setNow) {
-            mHandler.requestPolicySetting();
+        synchronized (this) {
             if ((flags & CarPackageManager.FLAG_SET_POLICY_WAIT_FOR_CHANGE) != 0) {
-                synchronized (policy) {
-                    try {
-                        policy.wait();
-                    } catch (InterruptedException e) {
+                mWaitingPolicies.add(policy);
+            }
+        }
+        mHandler.requestUpdatingPolicy(packageName, policy, flags);
+        if ((flags & CarPackageManager.FLAG_SET_POLICY_WAIT_FOR_CHANGE) != 0) {
+            synchronized (this) {
+                try {
+                    while (mWaitingPolicies.contains(policy)) {
+                        wait();
                     }
+                } catch (InterruptedException e) {
+                    // Pass it over binder call
+                    throw new IllegalStateException(
+                            "Interrupted while waiting for policy completion", e);
                 }
             }
         }
@@ -394,7 +401,8 @@
                 }
                 mProxies.clear();
             }
-            wakeupClientsWaitingForPolicySettingLocked();
+            mWaitingPolicies.clear();
+            notifyAll();
         }
         mContext.unregisterReceiver(mPackageParsingEventReceiver);
         mContext.unregisterReceiver(mUserSwitchedEventReceiver);
@@ -435,8 +443,6 @@
             mUxRestrictionsListeners.put(displayId, listener);
             mCarUxRestrictionsService.registerUxRestrictionsChangeListener(listener, displayId);
         }
-        mSystemActivityMonitoringService.registerActivityLaunchListener(
-                mActivityLaunchListener);
         mVendorServiceController.init();
     }
 
@@ -446,6 +452,10 @@
         synchronized (this) {
             mHasParsedPackages = true;
         }
+        // Once the activity launch listener is registered we attempt to block any non-whitelisted
+        // activities that are launched. For this reason, we need to wait until after the whitelist
+        // has been created.
+        mSystemActivityMonitoringService.registerActivityLaunchListener(mActivityLaunchListener);
         blockTopActivitiesIfNecessary();
     }
 
@@ -454,23 +464,6 @@
         notifyAll();
     }
 
-    @GuardedBy("this")
-    private void wakeupClientsWaitingForPolicySettingLocked() {
-        for (CarAppBlockingPolicy waitingPolicy : mWaitingPolicies) {
-            synchronized (waitingPolicy) {
-                waitingPolicy.notifyAll();
-            }
-        }
-        mWaitingPolicies.clear();
-    }
-
-    private void doSetPolicy() {
-        synchronized (this) {
-            wakeupClientsWaitingForPolicySettingLocked();
-        }
-        blockTopActivitiesIfNecessary();
-    }
-
     private void doUpdatePolicy(String packageName, CarAppBlockingPolicy policy, int flags) {
         if (DBG_POLICY_SET) {
             Log.i(CarLog.TAG_PACKAGE, "setting policy from:" + packageName + ",policy:" + policy +
@@ -495,7 +488,8 @@
                 clientPolicy.replaceWhitelists(whitelistWrapper);
             }
             if ((flags & CarPackageManager.FLAG_SET_POLICY_WAIT_FOR_CHANGE) != 0) {
-                mWaitingPolicies.add(policy);
+                mWaitingPolicies.remove(policy);
+                notifyAll();
             }
             if (DBG_POLICY_SET) {
                 Log.i(CarLog.TAG_PACKAGE, "policy set:" + dumpPoliciesLocked(false));
@@ -853,7 +847,6 @@
         policyIntent.setAction(CarAppBlockingPolicyService.SERVICE_INTERFACE);
         List<ResolveInfo> policyInfos = mPackageManager.queryIntentServices(policyIntent, 0);
         if (policyInfos == null) { //no need to wait for service binding and retrieval.
-            mHandler.requestPolicySetting();
             return;
         }
         LinkedList<AppBlockingPolicyProxy> proxies = new LinkedList<>();
@@ -890,7 +883,6 @@
 
     private void doHandlePolicyConnection(AppBlockingPolicyProxy proxy,
             CarAppBlockingPolicy policy) {
-        boolean shouldSetPolicy = false;
         synchronized (this) {
             if (mProxies == null) {
                 proxy.disconnect();
@@ -898,7 +890,6 @@
             }
             mProxies.remove(proxy);
             if (mProxies.size() == 0) {
-                shouldSetPolicy = true;
                 mProxies = null;
             }
         }
@@ -908,13 +899,10 @@
                     Log.i(CarLog.TAG_PACKAGE, "policy setting from policy service:" +
                             proxy.getPackageName());
                 }
-                doSetAppBlockingPolicy(proxy.getPackageName(), policy, 0, false /*setNow*/);
+                doSetAppBlockingPolicy(proxy.getPackageName(), policy, 0);
             }
         } finally {
             proxy.disconnect();
-            if (shouldSetPolicy) {
-                mHandler.requestPolicySetting();
-            }
         }
     }
 
@@ -1032,6 +1020,15 @@
         if (topTask.topActivity == null) {
             return;
         }
+
+        // We are not handling the UI blocking until we know what is allowed and what is not.
+        if (!mHasParsedPackages) {
+            if (Log.isLoggable(CarLog.TAG_PACKAGE, Log.INFO)) {
+                Log.i(CarLog.TAG_PACKAGE, "Packages not parsed, so ignoring block for " + topTask);
+            }
+            return;
+        }
+
         boolean allowed = isActivityDistractionOptimized(
                 topTask.topActivity.getPackageName(),
                 topTask.topActivity.getClassName());
@@ -1175,11 +1172,10 @@
      * Reading policy and setting policy can take time. Run it in a separate handler thread.
      */
     private class PackageHandler extends Handler {
-        private final int MSG_INIT = 0;
-        private final int MSG_PARSE_PKG = 1;
-        private final int MSG_SET_POLICY = 2;
-        private final int MSG_UPDATE_POLICY = 3;
-        private final int MSG_RELEASE = 4;
+        private static final int MSG_INIT = 0;
+        private static final int MSG_PARSE_PKG = 1;
+        private static final int MSG_UPDATE_POLICY = 2;
+        private static final int MSG_RELEASE = 3;
 
         private PackageHandler(Looper looper) {
             super(looper);
@@ -1192,17 +1188,11 @@
 
         private void requestRelease() {
             removeMessages(MSG_INIT);
-            removeMessages(MSG_SET_POLICY);
             removeMessages(MSG_UPDATE_POLICY);
             Message msg = obtainMessage(MSG_RELEASE);
             sendMessage(msg);
         }
 
-        private void requestPolicySetting() {
-            Message msg = obtainMessage(MSG_SET_POLICY);
-            sendMessage(msg);
-        }
-
         private void requestUpdatingPolicy(String packageName, CarAppBlockingPolicy policy,
                 int flags) {
             Pair<String, CarAppBlockingPolicy> pair = new Pair<>(packageName, policy);
@@ -1231,9 +1221,6 @@
                 case MSG_PARSE_PKG:
                     doParseInstalledPackages();
                     break;
-                case MSG_SET_POLICY:
-                    doSetPolicy();
-                    break;
                 case MSG_UPDATE_POLICY:
                     Pair<String, CarAppBlockingPolicy> pair =
                             (Pair<String, CarAppBlockingPolicy>) msg.obj;
diff --git a/service/src/com/android/car/pm/VendorServiceController.java b/service/src/com/android/car/pm/VendorServiceController.java
index 189370e..b20dc89 100644
--- a/service/src/com/android/car/pm/VendorServiceController.java
+++ b/service/src/com/android/car/pm/VendorServiceController.java
@@ -251,7 +251,7 @@
      * Represents connection to the vendor service.
      */
     private static class VendorServiceConnection implements ServiceConnection {
-        private static final int REBIND_DELAY_MS = 1000;
+        private static final int REBIND_DELAY_MS = 5000;
         private static final int MAX_RECENT_FAILURES = 5;
         private static final int FAILURE_COUNTER_RESET_TIMEOUT = 5 * 60 * 1000; // 5 min.
         private static final int MSG_REBIND = 0;
diff --git a/service/src/com/android/car/stats/CarStatsService.java b/service/src/com/android/car/stats/CarStatsService.java
new file mode 100644
index 0000000..d74fb8c
--- /dev/null
+++ b/service/src/com/android/car/stats/CarStatsService.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.stats;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.StatsLogEventWrapper;
+import android.os.SystemClock;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.StatsLog;
+
+import com.android.car.stats.VmsClientLogger.ConnectionState;
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.car.ICarStatsService;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Implementation of {@link ICarStatsService}, for reporting pulled atoms via statsd.
+ *
+ * Also implements collection and dumpsys reporting of atoms in CSV format.
+ */
+public class CarStatsService extends ICarStatsService.Stub {
+    private static final boolean DEBUG = false;
+    private static final String TAG = "CarStatsService";
+    private static final String VMS_CONNECTION_STATS_DUMPSYS_HEADER =
+            "uid,packageName,attempts,connected,disconnected,terminated,errors";
+
+    private static final Function<VmsClientLogger, String> VMS_CONNECTION_STATS_DUMPSYS_FORMAT =
+            entry -> String.format(Locale.US,
+                    "%d,%s,%d,%d,%d,%d,%d",
+                    entry.getUid(), entry.getPackageName(),
+                    entry.getConnectionStateCount(ConnectionState.CONNECTING),
+                    entry.getConnectionStateCount(ConnectionState.CONNECTED),
+                    entry.getConnectionStateCount(ConnectionState.DISCONNECTED),
+                    entry.getConnectionStateCount(ConnectionState.TERMINATED),
+                    entry.getConnectionStateCount(ConnectionState.CONNECTION_ERROR));
+
+    private static final String VMS_CLIENT_STATS_DUMPSYS_HEADER =
+            "uid,layerType,layerChannel,layerVersion,"
+                    + "txBytes,txPackets,rxBytes,rxPackets,droppedBytes,droppedPackets";
+
+    private static final Function<VmsClientStats, String> VMS_CLIENT_STATS_DUMPSYS_FORMAT =
+            entry -> String.format(
+                    "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
+                    entry.getUid(),
+                    entry.getLayerType(), entry.getLayerChannel(), entry.getLayerVersion(),
+                    entry.getTxBytes(), entry.getTxPackets(),
+                    entry.getRxBytes(), entry.getRxPackets(),
+                    entry.getDroppedBytes(), entry.getDroppedPackets());
+
+    private static final Comparator<VmsClientStats> VMS_CLIENT_STATS_ORDER =
+            Comparator.comparingInt(VmsClientStats::getUid)
+                    .thenComparingInt(VmsClientStats::getLayerType)
+                    .thenComparingInt(VmsClientStats::getLayerChannel)
+                    .thenComparingInt(VmsClientStats::getLayerVersion);
+
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+
+    @GuardedBy("mVmsClientStats")
+    private final Map<Integer, VmsClientLogger> mVmsClientStats = new ArrayMap<>();
+
+    public CarStatsService(Context context) {
+        mContext = context;
+        mPackageManager = context.getPackageManager();
+    }
+
+    /**
+     * Gets a logger for the VMS client with a given UID.
+     */
+    public VmsClientLogger getVmsClientLogger(int clientUid) {
+        synchronized (mVmsClientStats) {
+            return mVmsClientStats.computeIfAbsent(
+                    clientUid,
+                    uid -> {
+                        String packageName = mPackageManager.getNameForUid(uid);
+                        if (DEBUG) {
+                            Log.d(TAG, "Created VmsClientLog: " + packageName);
+                        }
+                        return new VmsClientLogger(uid, packageName);
+                    });
+        }
+    }
+
+    @Override
+    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        List<String> flags = Arrays.asList(args);
+        if (args.length == 0 || flags.contains("--vms-client")) {
+            dumpVmsStats(writer);
+        }
+    }
+
+    @Override
+    public StatsLogEventWrapper[] pullData(int tagId) {
+        mContext.enforceCallingPermission(Manifest.permission.DUMP, null);
+        if (tagId != StatsLog.VMS_CLIENT_STATS) {
+            Log.w(TAG, "Unexpected tagId: " + tagId);
+            return null;
+        }
+
+        List<StatsLogEventWrapper> ret = new ArrayList<>();
+        long elapsedNanos = SystemClock.elapsedRealtimeNanos();
+        long wallClockNanos = SystemClock.currentTimeMicro() * 1000L;
+        pullVmsClientStats(tagId, elapsedNanos, wallClockNanos, ret);
+        return ret.toArray(new StatsLogEventWrapper[0]);
+    }
+
+    private void dumpVmsStats(PrintWriter writer) {
+        synchronized (mVmsClientStats) {
+            writer.println(VMS_CONNECTION_STATS_DUMPSYS_HEADER);
+            mVmsClientStats.values().stream()
+                    // Unknown UID will not have connection stats
+                    .filter(entry -> entry.getUid() > 0)
+                    // Sort stats by UID
+                    .sorted(Comparator.comparingInt(VmsClientLogger::getUid))
+                    .forEachOrdered(entry -> writer.println(
+                            VMS_CONNECTION_STATS_DUMPSYS_FORMAT.apply(entry)));
+            writer.println();
+
+            writer.println(VMS_CLIENT_STATS_DUMPSYS_HEADER);
+            dumpVmsClientStats(entry -> writer.println(
+                    VMS_CLIENT_STATS_DUMPSYS_FORMAT.apply(entry)));
+        }
+    }
+
+    private void pullVmsClientStats(int tagId, long elapsedNanos, long wallClockNanos,
+            List<StatsLogEventWrapper> pulledData) {
+        dumpVmsClientStats((entry) -> {
+            StatsLogEventWrapper e =
+                    new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos);
+            e.writeInt(entry.getUid());
+
+            e.writeInt(entry.getLayerType());
+            e.writeInt(entry.getLayerChannel());
+            e.writeInt(entry.getLayerVersion());
+
+            e.writeLong(entry.getTxBytes());
+            e.writeLong(entry.getTxPackets());
+            e.writeLong(entry.getRxBytes());
+            e.writeLong(entry.getRxPackets());
+            e.writeLong(entry.getDroppedBytes());
+            e.writeLong(entry.getDroppedPackets());
+            pulledData.add(e);
+        });
+    }
+
+    private void dumpVmsClientStats(Consumer<VmsClientStats> dumpFn) {
+        synchronized (mVmsClientStats) {
+            mVmsClientStats.values().stream()
+                    .flatMap(log -> log.getLayerEntries().stream())
+                    .sorted(VMS_CLIENT_STATS_ORDER)
+                    .forEachOrdered(dumpFn);
+        }
+    }
+}
diff --git a/service/src/com/android/car/stats/VmsClientLogger.java b/service/src/com/android/car/stats/VmsClientLogger.java
new file mode 100644
index 0000000..948db05
--- /dev/null
+++ b/service/src/com/android/car/stats/VmsClientLogger.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.stats;
+
+import android.annotation.Nullable;
+import android.car.vms.VmsLayer;
+import android.util.ArrayMap;
+import android.util.StatsLog;
+
+import com.android.internal.annotations.GuardedBy;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+
+/**
+ * Logger for per-client VMS statistics.
+ */
+public class VmsClientLogger {
+    /**
+     * Constants used for identifying client connection states.
+     */
+    public static class ConnectionState {
+        // Attempting to connect to the client
+        public static final int CONNECTING =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__CONNECTING;
+        // Client connection established
+        public static final int CONNECTED =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__CONNECTED;
+        // Client connection closed unexpectedly
+        public static final int DISCONNECTED =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__DISCONNECTED;
+        // Client connection closed by VMS
+        public static final int TERMINATED =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__TERMINATED;
+        // Error establishing the client connection
+        public static final int CONNECTION_ERROR =
+                StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED__STATE__CONNECTION_ERROR;
+    }
+
+    private final Object mLock = new Object();
+
+    private final int mUid;
+    private final String mPackageName;
+
+    @GuardedBy("mLock")
+    private Map<Integer, AtomicLong> mConnectionStateCounters = new ArrayMap<>();
+
+    @GuardedBy("mLock")
+    private final Map<VmsLayer, VmsClientStats> mLayerStats = new ArrayMap<>();
+
+    VmsClientLogger(int clientUid, @Nullable String clientPackage) {
+        mUid = clientUid;
+        mPackageName = clientPackage != null ? clientPackage : "";
+    }
+
+    public int getUid() {
+        return mUid;
+    }
+
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    /**
+     * Logs a connection state change for the client.
+     *
+     * @param connectionState New connection state
+     */
+    public void logConnectionState(int connectionState) {
+        StatsLog.write(StatsLog.VMS_CLIENT_CONNECTION_STATE_CHANGED,
+                mUid, mPackageName, connectionState);
+
+        AtomicLong counter;
+        synchronized (mLock) {
+            counter = mConnectionStateCounters.computeIfAbsent(connectionState,
+                    ignored -> new AtomicLong());
+        }
+        counter.incrementAndGet();
+    }
+
+    long getConnectionStateCount(int connectionState) {
+        AtomicLong counter;
+        synchronized (mLock) {
+            counter = mConnectionStateCounters.get(connectionState);
+        }
+        return counter == null ? 0L : counter.get();
+    }
+
+    /**
+     * Logs that a packet was published by the client.
+     *
+     * @param layer Layer of packet
+     * @param size Size of packet
+     */
+    public void logPacketSent(VmsLayer layer, long size) {
+        getLayerEntry(layer).packetSent(size);
+    }
+
+    /**
+     * Logs that a packet was received successfully by the client.
+     *
+     * @param layer Layer of packet
+     * @param size Size of packet
+     */
+    public void logPacketReceived(VmsLayer layer, long size) {
+        getLayerEntry(layer).packetReceived(size);
+    }
+
+    /**
+     * Logs that a packet was dropped due to an error delivering to the client.
+     *
+     * @param layer Layer of packet
+     * @param size Size of packet
+     */
+    public void logPacketDropped(VmsLayer layer, long size) {
+        getLayerEntry(layer).packetDropped(size);
+    }
+
+    Collection<VmsClientStats> getLayerEntries() {
+        synchronized (mLock) {
+            return mLayerStats.values().stream()
+                    .map(VmsClientStats::new) // Make a deep copy of the entries
+                    .collect(Collectors.toList());
+        }
+    }
+
+    private VmsClientStats getLayerEntry(VmsLayer layer) {
+        synchronized (mLock) {
+            return mLayerStats.computeIfAbsent(
+                    layer,
+                    (k) -> new VmsClientStats(mUid, layer));
+        }
+    }
+}
diff --git a/service/src/com/android/car/stats/VmsClientStats.java b/service/src/com/android/car/stats/VmsClientStats.java
new file mode 100644
index 0000000..9fbe1dd
--- /dev/null
+++ b/service/src/com/android/car/stats/VmsClientStats.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.stats;
+
+import android.car.vms.VmsLayer;
+
+import com.android.internal.annotations.GuardedBy;
+
+/**
+ * Java representation of VmsClientStats statsd atom.
+ *
+ * All access to this class is synchronized through VmsClientLog.
+ */
+class VmsClientStats {
+    private final Object mLock = new Object();
+
+    private final int mUid;
+
+    private final int mLayerType;
+    private final int mLayerChannel;
+    private final int mLayerVersion;
+
+    @GuardedBy("mLock")
+    private long mTxBytes;
+    @GuardedBy("mLock")
+    private long mTxPackets;
+
+    @GuardedBy("mLock")
+    private long mRxBytes;
+    @GuardedBy("mLock")
+    private long mRxPackets;
+
+    @GuardedBy("mLock")
+    private long mDroppedBytes;
+    @GuardedBy("mLock")
+    private long mDroppedPackets;
+
+    /**
+     * Constructor for a VmsClientStats entry.
+     *
+     * @param uid UID of client package.
+     * @param layer Vehicle Maps Service layer.
+     */
+    VmsClientStats(int uid, VmsLayer layer) {
+        mUid = uid;
+
+        mLayerType = layer.getType();
+        mLayerChannel = layer.getSubtype();
+        mLayerVersion = layer.getVersion();
+    }
+
+    /**
+     * Copy constructor for entries exported from {@link VmsClientLogger}.
+     */
+    VmsClientStats(VmsClientStats other) {
+        synchronized (other.mLock) {
+            this.mUid = other.mUid;
+
+            this.mLayerType = other.mLayerType;
+            this.mLayerChannel = other.mLayerChannel;
+            this.mLayerVersion = other.mLayerVersion;
+
+            this.mTxBytes = other.mTxBytes;
+            this.mTxPackets = other.mTxPackets;
+            this.mRxBytes = other.mRxBytes;
+            this.mRxPackets = other.mRxPackets;
+            this.mDroppedBytes = other.mDroppedBytes;
+            this.mDroppedPackets = other.mDroppedPackets;
+        }
+    }
+
+    /**
+     * Records that a packet was sent by a publisher client.
+     *
+     * @param size Size of packet.
+     */
+    void packetSent(long size) {
+        synchronized (mLock) {
+            mTxBytes += size;
+            mTxPackets++;
+        }
+    }
+
+    /**
+     * Records that a packet was successfully received by a subscriber client.
+     *
+     * @param size Size of packet.
+     */
+    void packetReceived(long size) {
+        synchronized (mLock) {
+            mRxBytes += size;
+            mRxPackets++;
+        }
+    }
+
+    /**
+     * Records that a packet was dropped while being delivered to a subscriber client.
+     *
+     * @param size Size of packet.
+     */
+    void packetDropped(long size) {
+        synchronized (mLock) {
+            mDroppedBytes += size;
+            mDroppedPackets++;
+        }
+    }
+
+    int getUid() {
+        return mUid;
+    }
+
+    int getLayerType() {
+        return mLayerType;
+    }
+
+    int getLayerChannel() {
+        return mLayerChannel;
+    }
+
+    int getLayerVersion() {
+        return mLayerVersion;
+    }
+
+    long getTxBytes() {
+        synchronized (mLock) {
+            return mTxBytes;
+        }
+    }
+
+    long getTxPackets() {
+        synchronized (mLock) {
+            return mTxPackets;
+        }
+    }
+
+    long getRxBytes() {
+        synchronized (mLock) {
+            return mRxBytes;
+        }
+    }
+
+    long getRxPackets() {
+        synchronized (mLock) {
+            return mRxPackets;
+        }
+    }
+
+    long getDroppedBytes() {
+        synchronized (mLock) {
+            return mDroppedBytes;
+        }
+    }
+
+    long getDroppedPackets() {
+        synchronized (mLock) {
+            return mDroppedPackets;
+        }
+    }
+}
+
diff --git a/service/src/com/android/car/systeminterface/DisplayInterface.java b/service/src/com/android/car/systeminterface/DisplayInterface.java
index 4d8f180..d20a177 100644
--- a/service/src/com/android/car/systeminterface/DisplayInterface.java
+++ b/service/src/com/android/car/systeminterface/DisplayInterface.java
@@ -28,6 +28,7 @@
 import android.database.ContentObserver;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManager.DisplayListener;
+import android.hardware.input.InputManager;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
@@ -41,6 +42,7 @@
 import android.view.Display;
 import android.view.DisplayAddress;
 import android.view.IWindowManager;
+import android.view.InputDevice;
 
 import com.android.car.CarLog;
 import com.android.car.CarPowerManagementService;
@@ -76,6 +78,7 @@
         private final ContentResolver mContentResolver;
         private final Context mContext;
         private final DisplayManager mDisplayManager;
+        private final InputManager mInputManager;
         private final int mMaximumBacklight;
         private final int mMinimumBacklight;
         private final PowerManager mPowerManager;
@@ -117,6 +120,7 @@
             mContext = context;
             mContentResolver = mContext.getContentResolver();
             mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+            mInputManager = (InputManager) mContext.getSystemService(Context.INPUT_SERVICE);
             mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
             mMaximumBacklight = mPowerManager.getMaximumScreenBrightnessSetting();
             mMinimumBacklight = mPowerManager.getMinimumScreenBrightnessSetting();
@@ -209,6 +213,19 @@
                 Log.i(CarLog.TAG_POWER, "off display");
                 mPowerManager.goToSleep(SystemClock.uptimeMillis());
             }
+            // Turn touchscreen input devices on or off, the same as the display
+            for (int deviceId : mInputManager.getInputDeviceIds()) {
+                InputDevice inputDevice = mInputManager.getInputDevice(deviceId);
+                if (inputDevice != null
+                        && (inputDevice.getSources() & InputDevice.SOURCE_TOUCHSCREEN)
+                        == InputDevice.SOURCE_TOUCHSCREEN) {
+                    if (on) {
+                        mInputManager.enableInputDevice(deviceId);
+                    } else {
+                        mInputManager.disableInputDevice(deviceId);
+                    }
+                }
+            }
         }
 
         @Override
diff --git a/service/src/com/android/car/systeminterface/SystemStateInterface.java b/service/src/com/android/car/systeminterface/SystemStateInterface.java
index c963ac0..d7d9de9 100644
--- a/service/src/com/android/car/systeminterface/SystemStateInterface.java
+++ b/service/src/com/android/car/systeminterface/SystemStateInterface.java
@@ -20,17 +20,20 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Looper;
 import android.os.PowerManager;
 import android.util.Log;
 import android.util.Pair;
 
 import com.android.car.procfsinspector.ProcessInfo;
 import com.android.car.procfsinspector.ProcfsInspector;
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.car.ICarServiceHelper;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -69,11 +72,17 @@
         // Do nothing
     }
 
+    /**
+     * Default implementation that is used internally.
+     */
+    @VisibleForTesting
     class DefaultImpl implements SystemStateInterface {
-        private final static Duration MIN_BOOT_COMPLETE_ACTION_DELAY = Duration.ofSeconds(10);
-        private final static int SUSPEND_TRY_TIMEOUT_MS = 1000;
+        private static final int MAX_WAIT_FOR_HELPER_SEC = 10;
+        private static final Duration MIN_BOOT_COMPLETE_ACTION_DELAY = Duration.ofSeconds(10);
+        private static final int SUSPEND_TRY_TIMEOUT_MS = 1_000;
 
-        private ICarServiceHelper mICarServiceHelper;
+        private ICarServiceHelper mICarServiceHelper; // mHelperLatch becomes 0 when this is set
+        private final CountDownLatch mHelperLatch = new CountDownLatch(1);
         private final Context mContext;
         private final PowerManager mPowerManager;
         private List<Pair<Runnable, Duration>> mActionsList = new ArrayList<>();
@@ -90,7 +99,8 @@
             }
         };
 
-        DefaultImpl(Context context) {
+        @VisibleForTesting
+        public DefaultImpl(Context context) {
             mContext = context;
             mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         }
@@ -102,20 +112,48 @@
 
         @Override
         public boolean enterDeepSleep() {
-            boolean deviceEnteredSleep;
-            //TODO set wake up time via VHAL, bug: 32061842
-            try {
-                int retVal;
-                retVal = mICarServiceHelper.forceSuspend(SUSPEND_TRY_TIMEOUT_MS);
-                deviceEnteredSleep = retVal == 0;
+            // TODO(b/32061842) Set wake up time via VHAL
+            if (!canInvokeHelper()) {
+                return false;
+            }
 
+            boolean deviceEnteredSleep = false;
+            try {
+                int retVal = mICarServiceHelper.forceSuspend(SUSPEND_TRY_TIMEOUT_MS);
+                deviceEnteredSleep = retVal == 0;
             } catch (Exception e) {
                 Log.e(TAG, "Unable to enter deep sleep", e);
-                deviceEnteredSleep = false;
             }
             return deviceEnteredSleep;
         }
 
+        // Checks if mICarServiceHelper is available. (It might be unavailable if
+        // we are asked to shut down before we're completely up and running.)
+        // If the helper is null, wait for it to be set.
+        // Returns true if the helper is available.
+        private boolean canInvokeHelper() {
+            if (Looper.myLooper() == Looper.getMainLooper()) {
+                // We should not be called from the main thread!
+                throw new IllegalStateException("SystemStateInterface.enterDeepSleep() "
+                        + "was called from the main thread");
+            }
+            if (mICarServiceHelper != null) {
+                return true;
+            }
+            // We have no helper. If we wait, maybe we will get a helper.
+            try {
+                mHelperLatch.await(MAX_WAIT_FOR_HELPER_SEC, TimeUnit.SECONDS);
+            } catch (InterruptedException ie) {
+                Thread.currentThread().interrupt(); // Restore interrupted status
+            }
+            if (mICarServiceHelper != null) {
+                return true;
+            }
+            Log.e(TAG, "Unable to enter deep sleep: ICarServiceHelper is still null "
+                    + "after waiting " + MAX_WAIT_FOR_HELPER_SEC + " seconds");
+            return false;
+        }
+
         @Override
         public void scheduleActionForBootCompleted(Runnable action, Duration delay) {
             if (MIN_BOOT_COMPLETE_ACTION_DELAY.compareTo(delay) < 0) {
@@ -134,6 +172,7 @@
         @Override
         public void setCarServiceHelper(ICarServiceHelper helper) {
             mICarServiceHelper = helper;
+            mHelperLatch.countDown();
         }
     }
 }
diff --git a/service/src/com/android/car/systeminterface/TimeInterface.java b/service/src/com/android/car/systeminterface/TimeInterface.java
index dea1153..fd350a5 100644
--- a/service/src/com/android/car/systeminterface/TimeInterface.java
+++ b/service/src/com/android/car/systeminterface/TimeInterface.java
@@ -19,6 +19,9 @@
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
 
 import android.os.SystemClock;
+
+import com.android.internal.annotations.GuardedBy;
+
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -42,16 +45,34 @@
     void cancelAllActions();
 
     class DefaultImpl implements TimeInterface {
-        private final ScheduledExecutorService mExecutor = newSingleThreadScheduledExecutor();
+        private final Object mLock = new Object();
+
+        @GuardedBy("mLock")
+        private ScheduledExecutorService mExecutor;
 
         @Override
         public void scheduleAction(Runnable r, long delayMs) {
-            mExecutor.scheduleAtFixedRate(r, delayMs, delayMs, TimeUnit.MILLISECONDS);
+            ScheduledExecutorService executor;
+            synchronized (mLock) {
+                executor = mExecutor;
+                if (executor == null) {
+                    executor = newSingleThreadScheduledExecutor();
+                    mExecutor = executor;
+                }
+            }
+            executor.scheduleAtFixedRate(r, delayMs, delayMs, TimeUnit.MILLISECONDS);
         }
 
         @Override
         public void cancelAllActions() {
-            mExecutor.shutdownNow();
+            ScheduledExecutorService executor;
+            synchronized (mLock) {
+                executor = mExecutor;
+                mExecutor = null;
+            }
+            if (executor != null) {
+                executor.shutdownNow();
+            }
         }
     }
 }
diff --git a/service/src/com/android/car/trust/BLEMessageV1Factory.java b/service/src/com/android/car/trust/BLEMessageV1Factory.java
index afb5c8c..4afe877 100644
--- a/service/src/com/android/car/trust/BLEMessageV1Factory.java
+++ b/service/src/com/android/car/trust/BLEMessageV1Factory.java
@@ -41,14 +41,6 @@
      */
     private static final int FIXED_32_SIZE = 4;
 
-    /**
-     * Additional bytes that are needed during the encoding of the {@code payload} field.
-     *
-     * <p>The {@code payload} field is defined as {@code bytes}, and thus, needs 2 extra bytes to
-     * encode: one to encode the field number and another for length delimiting.
-     */
-    private static final int ADDITIONAL_PAYLOAD_ENCODING_SIZE = 2;
-
     // The size needed to encode a boolean proto field
     private static final int BOOLEAN_FIELD_ENCODING_SIZE = 1;
 
@@ -145,13 +137,14 @@
     public static List<BLEMessage> makeBLEMessages(byte[] payload, OperationType operation,
             int maxSize, boolean isPayloadEncrypted) {
         List<BLEMessage> bleMessages = new ArrayList();
-        int maxPayloadSize = maxSize - getProtoHeaderSize(operation, isPayloadEncrypted);
-        int payloadLength = payload.length;
-        if (payloadLength <= maxPayloadSize) {
+        int payloadSize = payload.length;
+        int maxPayloadSize =
+                maxSize - getProtoHeaderSize(operation, payloadSize, isPayloadEncrypted);
+        if (payloadSize <= maxPayloadSize) {
             bleMessages.add(makeBLEMessage(payload, operation, isPayloadEncrypted));
             return bleMessages;
         }
-        int totalPackets = (int) Math.ceil((double) payloadLength / maxPayloadSize);
+        int totalPackets = (int) Math.ceil((double) payloadSize / maxPayloadSize);
         int start = 0;
         int end = maxPayloadSize;
         for (int i = 0; i < totalPackets; i++) {
@@ -164,7 +157,7 @@
                     .setPayload(ByteString.copyFrom(Arrays.copyOfRange(payload, start, end)))
                     .build());
             start = end;
-            end = Math.min(start + maxPayloadSize, payloadLength);
+            end = Math.min(start + maxPayloadSize, payloadSize);
         }
         return bleMessages;
     }
@@ -174,12 +167,18 @@
      * contain a payload.
      */
     @VisibleForTesting
-    static int getProtoHeaderSize(OperationType operation, boolean isPayloadEncrypted) {
-        int isPayloadEncryptedFieldSize =
-                isPayloadEncrypted ? (BOOLEAN_FIELD_ENCODING_SIZE + FIELD_NUMBER_ENCODING_SIZE) : 0;
+    static int getProtoHeaderSize(OperationType operation, int payloadSize,
+            boolean isPayloadEncrypted) {
+        int isPayloadEncryptedFieldSize = isPayloadEncrypted
+                ? BOOLEAN_FIELD_ENCODING_SIZE + FIELD_NUMBER_ENCODING_SIZE
+                : 0;
         int operationSize = getEncodedSize(operation.getNumber()) + FIELD_NUMBER_ENCODING_SIZE;
+
+        // The payload size is a varint.
+        int payloadEncodingSize = FIELD_NUMBER_ENCODING_SIZE + getEncodedSize(payloadSize);
+
         return CONSTANT_HEADER_FIELD_SIZE + operationSize + isPayloadEncryptedFieldSize
-                + ADDITIONAL_PAYLOAD_ENCODING_SIZE;
+                + payloadEncodingSize;
     }
 
     /**
diff --git a/service/src/com/android/car/trust/BLEVersionExchangeResolver.java b/service/src/com/android/car/trust/BLEVersionExchangeResolver.java
index 7b9a025..4465b25 100644
--- a/service/src/com/android/car/trust/BLEVersionExchangeResolver.java
+++ b/service/src/com/android/car/trust/BLEVersionExchangeResolver.java
@@ -59,7 +59,7 @@
                 .setMinSupportedMessagingVersion(MESSAGING_VERSION)
                 .setMaxSupportedMessagingVersion(MESSAGING_VERSION)
                 .setMinSupportedSecurityVersion(SECURITY_VERSION)
-                .setMinSupportedSecurityVersion(SECURITY_VERSION)
+                .setMaxSupportedSecurityVersion(SECURITY_VERSION)
                 .build();
     }
 
diff --git a/service/src/com/android/car/trust/CarBleTrustAgent.java b/service/src/com/android/car/trust/CarBleTrustAgent.java
index b8a186c..5c6115e 100644
--- a/service/src/com/android/car/trust/CarBleTrustAgent.java
+++ b/service/src/com/android/car/trust/CarBleTrustAgent.java
@@ -103,12 +103,7 @@
         }
         super.onDeviceLocked();
         mIsDeviceLocked = true;
-        if (BluetoothAdapter.getDefaultAdapter().getState() == BluetoothAdapter.STATE_OFF) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Not starting Unlock Advertising yet, since Bluetooth Adapter is off");
-            }
-            return;
-        }
+
         if (!hasTrustedDevice(uid)) {
             if (Log.isLoggable(TAG, Log.DEBUG)) {
                 Log.d(TAG, "Not starting Unlock Advertising yet, since current user: "
@@ -116,7 +111,7 @@
             }
             return;
         }
-        if (mCarTrustAgentUnlockService != null) {
+        if (isBluetoothAvailable() && mCarTrustAgentUnlockService != null) {
             mCarTrustAgentUnlockService.startUnlockAdvertising();
         }
     }
@@ -128,18 +123,29 @@
         }
         super.onDeviceUnlocked();
         mIsDeviceLocked = false;
-        if (BluetoothAdapter.getDefaultAdapter().getState() == BluetoothAdapter.STATE_OFF) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Not stopping Unlock Advertising, since Bluetooth Adapter is off");
-            }
-            return;
-        }
-        if (mCarTrustAgentUnlockService != null) {
-            mCarTrustAgentUnlockService.stopUnlockAdvertising();
 
+        if (isBluetoothAvailable() && mCarTrustAgentUnlockService != null) {
+            mCarTrustAgentUnlockService.stopUnlockAdvertising();
         }
     }
 
+    private boolean isBluetoothAvailable() {
+        BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (defaultAdapter == null) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "Bluetooth Adapter null.");
+            }
+            return false;
+        }
+        if (defaultAdapter.getState() == BluetoothAdapter.STATE_OFF) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "Bluetooth Adapter is off");
+            }
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public void onEscrowTokenRemoved(long handle, boolean successful) {
         if (Log.isLoggable(TAG, Log.DEBUG)) {
@@ -199,6 +205,9 @@
      * @return if the user has trusted device
      */
     private boolean hasTrustedDevice(int uid) {
+        if (mCarTrustAgentEnrollmentService == null) {
+            return false;
+        }
         List<TrustedDeviceInfo> trustedDeviceInfos = mCarTrustAgentEnrollmentService
                 .getEnrolledDeviceInfosForUser(uid);
         return trustedDeviceInfos != null && trustedDeviceInfos.size() > 0;
diff --git a/service/src/com/android/car/trust/CarTrustAgentBleManager.java b/service/src/com/android/car/trust/CarTrustAgentBleManager.java
index 09c59e6..1e43300 100644
--- a/service/src/com/android/car/trust/CarTrustAgentBleManager.java
+++ b/service/src/com/android/car/trust/CarTrustAgentBleManager.java
@@ -57,7 +57,6 @@
  * the Trusted Device feature.
  */
 class CarTrustAgentBleManager extends BleManager {
-
     private static final String TAG = "CarTrustBLEManager";
 
     /**
@@ -70,6 +69,15 @@
     private static final UUID CLIENT_CHARACTERISTIC_CONFIG =
             UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
 
+    /**
+     * Reserved bytes for an ATT write request payload.
+     *
+     * <p>The attribute protocol uses 3 bytes to encode the command type and attribute ID. These
+     * bytes need to be subtracted from the reported MTU size and the resulting value will
+     * represent the total amount of bytes that can be sent in a write.
+     */
+    private static final int ATT_PAYLOAD_RESERVED_BYTES = 3;
+
     /** @hide */
     @IntDef(prefix = {"TRUSTED_DEVICE_OPERATION_"}, value = {
             TRUSTED_DEVICE_OPERATION_NONE,
@@ -94,7 +102,16 @@
     private String mOriginalBluetoothName;
     private byte[] mUniqueId;
     private String mEnrollmentDeviceName;
-    private int mMtuSize = 20;
+
+    /**
+     * The maximum amount of bytes that can be written over BLE.
+     *
+     * <p>This initial value is 20 because BLE has a default write of 23 bytes. However, 3 bytes
+     * are subtracted due to bytes being reserved for the command type and attribute ID.
+     *
+     * @see #ATT_PAYLOAD_RESERVED_BYTES
+     */
+    private int mMaxWriteSize = 20;
 
     // Enrollment Service and Characteristic UUIDs
     private UUID mEnrollmentServiceUuid;
@@ -169,7 +186,12 @@
 
     @Override
     protected void onMtuSizeChanged(int size) {
-        mMtuSize = size;
+        mMaxWriteSize = size - ATT_PAYLOAD_RESERVED_BYTES;
+
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "MTU size changed to: " + size
+                    + "; setting max payload size to: " + mMaxWriteSize);
+        }
     }
 
     @Override
@@ -347,7 +369,8 @@
         // Characteristic the connected bluetooth device will write to.
         BluetoothGattCharacteristic clientCharacteristic =
                 new BluetoothGattCharacteristic(mEnrollmentClientWriteUuid,
-                        BluetoothGattCharacteristic.PROPERTY_WRITE,
+                        BluetoothGattCharacteristic.PROPERTY_WRITE
+                                | BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE,
                         BluetoothGattCharacteristic.PERMISSION_WRITE);
 
         // Characteristic that this manager will write to.
@@ -380,7 +403,8 @@
         // Characteristic the connected bluetooth device will write to.
         BluetoothGattCharacteristic clientCharacteristic = new BluetoothGattCharacteristic(
                 mUnlockClientWriteUuid,
-                BluetoothGattCharacteristic.PROPERTY_WRITE,
+                BluetoothGattCharacteristic.PROPERTY_WRITE
+                        | BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE,
                 BluetoothGattCharacteristic.PERMISSION_WRITE);
 
         // Characteristic that this manager will write to.
@@ -524,7 +548,7 @@
         }
 
         List<BLEMessage> bleMessages = BLEMessageV1Factory.makeBLEMessages(message, operation,
-                mMtuSize, isPayloadEncrypted);
+                mMaxWriteSize, isPayloadEncrypted);
 
         if (Log.isLoggable(TAG, Log.DEBUG)) {
             Log.d(TAG, "sending " + bleMessages.size() + " messages to device");
diff --git a/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java b/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
index 0f54647..7f2923d 100644
--- a/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
+++ b/service/src/com/android/car/trust/CarTrustAgentEnrollmentService.java
@@ -16,6 +16,7 @@
 
 package com.android.car.trust;
 
+import static android.car.Car.PERMISSION_CAR_ENROLL_TRUST;
 import static android.car.trust.CarTrustAgentEnrollmentManager.ENROLLMENT_HANDSHAKE_FAILURE;
 import static android.car.trust.CarTrustAgentEnrollmentManager.ENROLLMENT_NOT_ALLOWED;
 
@@ -33,6 +34,7 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.RequiresPermission;
 import android.app.ActivityManager;
 import android.bluetooth.BluetoothDevice;
 import android.car.encryptionrunner.EncryptionRunner;
@@ -52,6 +54,7 @@
 import android.util.Log;
 
 import com.android.car.BLEStreamProtos.BLEOperationProto.OperationType;
+import com.android.car.ICarImpl;
 import com.android.car.R;
 import com.android.car.Utils;
 import com.android.internal.annotations.GuardedBy;
@@ -171,7 +174,9 @@
      * the enrollment of the trusted device.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void startEnrollmentAdvertising() {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (!mTrustedDeviceService.getSharedPrefs()
                 .getBoolean(TRUSTED_DEVICE_ENROLLMENT_ENABLED_KEY, true)) {
             Log.e(TAG, "Trusted Device Enrollment disabled");
@@ -192,7 +197,9 @@
      * Stop BLE advertisement for Enrollment
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void stopEnrollmentAdvertising() {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         logEnrollmentEvent(STOP_ENROLLMENT_ADVERTISING);
         addEnrollmentServiceLog("stopEnrollmentAdvertising");
         mCarTrustAgentBleManager.stopEnrollmentAdvertising();
@@ -205,7 +212,9 @@
      * @param device the remote Bluetooth device that will receive the signal.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void enrollmentHandshakeAccepted(BluetoothDevice device) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         logEnrollmentEvent(ENROLLMENT_HANDSHAKE_ACCEPTED);
         addEnrollmentServiceLog("enrollmentHandshakeAccepted");
         if (device == null || !device.equals(mRemoteEnrollmentDevice)) {
@@ -226,7 +235,9 @@
      * navigated away from the app before completing enrollment.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void terminateEnrollmentHandshake() {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         addEnrollmentServiceLog("terminateEnrollmentHandshake");
         // Disconnect from BLE
         mCarTrustAgentBleManager.disconnectRemoteDevice();
@@ -252,7 +263,9 @@
      * @return True if the escrow token is active, false if not
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public boolean isEscrowTokenActive(long handle, int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (mTokenActiveStateMap.get(handle) != null) {
             return mTokenActiveStateMap.get(handle);
         }
@@ -266,7 +279,9 @@
      * @param uid    user id
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void removeEscrowToken(long handle, int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         mEnrollmentDelegate.removeEscrowToken(handle, uid);
         addEnrollmentServiceLog("removeEscrowToken (handle:" + handle + " uid:" + uid + ")");
     }
@@ -277,7 +292,9 @@
      * @param uid user id
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void removeAllTrustedDevices(int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         for (TrustedDeviceInfo device : getEnrolledDeviceInfosForUser(uid)) {
             removeEscrowToken(device.getHandle(), uid);
         }
@@ -291,7 +308,9 @@
      * @param isEnabled {@code true} to enable; {@code false} to disable the feature.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void setTrustedDeviceEnrollmentEnabled(boolean isEnabled) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         SharedPreferences.Editor editor = mTrustedDeviceService.getSharedPrefs().edit();
         editor.putBoolean(TRUSTED_DEVICE_ENROLLMENT_ENABLED_KEY, isEnabled);
         if (!editor.commit()) {
@@ -308,7 +327,9 @@
      *                  back.
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public void setTrustedDeviceUnlockEnabled(boolean isEnabled) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         mTrustedDeviceService.getCarTrustAgentUnlockService()
                 .setTrustedDeviceUnlockEnabled(isEnabled);
     }
@@ -322,7 +343,9 @@
      */
     @NonNull
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public List<TrustedDeviceInfo> getEnrolledDeviceInfosForUser(int uid) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         Set<String> enrolledDeviceInfos = mTrustedDeviceService.getSharedPrefs().getStringSet(
                 String.valueOf(uid), new HashSet<>());
         List<TrustedDeviceInfo> trustedDeviceInfos = new ArrayList<>(enrolledDeviceInfos.size());
@@ -342,7 +365,9 @@
      * @param listener {@link ICarTrustAgentEnrollmentCallback}
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void registerEnrollmentCallback(ICarTrustAgentEnrollmentCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
@@ -835,8 +860,10 @@
      * @param listener client to unregister
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void unregisterEnrollmentCallback(
             ICarTrustAgentEnrollmentCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
@@ -858,7 +885,9 @@
      * @param listener {@link ICarTrustAgentBleCallback}
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void registerBleCallback(ICarTrustAgentBleCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
@@ -903,7 +932,9 @@
      * @param listener client to unregister
      */
     @Override
+    @RequiresPermission(PERMISSION_CAR_ENROLL_TRUST)
     public synchronized void unregisterBleCallback(ICarTrustAgentBleCallback listener) {
+        ICarImpl.assertTrustAgentEnrollmentPermission(mContext);
         if (listener == null) {
             throw new IllegalArgumentException("Listener is null");
         }
diff --git a/service/src/com/android/car/user/CarUserNoticeService.java b/service/src/com/android/car/user/CarUserNoticeService.java
new file mode 100644
index 0000000..045d960
--- /dev/null
+++ b/service/src/com/android/car/user/CarUserNoticeService.java
@@ -0,0 +1,413 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.user;
+
+import static android.car.hardware.power.CarPowerManager.CarPowerStateListener;
+
+import static com.android.car.CarLog.TAG_USER;
+
+import android.annotation.Nullable;
+import android.annotation.UserIdInt;
+import android.app.ActivityManager;
+import android.app.AppOpsManager;
+import android.car.CarNotConnectedException;
+import android.car.hardware.power.CarPowerManager;
+import android.car.settings.CarSettings;
+import android.car.user.IUserNotice;
+import android.car.user.IUserNoticeUI;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
+
+import com.android.car.CarLocalServices;
+import com.android.car.CarServiceBase;
+import com.android.car.R;
+import com.android.internal.annotations.GuardedBy;
+
+import java.io.PrintWriter;
+
+/**
+ * Service to show initial notice UI to user. It only launches it when setting is enabled and
+ * it is up to notice UI (=Service) to dismiss itself upon user's request.
+ *
+ * <p>Conditions to show notice UI are:
+ * <ol>
+ *   <li>Cold boot
+ *   <li><User switching
+ *   <li>Car power state change to ON (happens in wakeup from suspend to RAM)
+ * </ol>
+ */
+public final class CarUserNoticeService implements CarServiceBase {
+
+    // Keyguard unlocking can be only polled as we cannot dismiss keyboard.
+    // Polling will stop when keyguard is unlocked.
+    private static final long KEYGUARD_POLLING_INTERVAL_MS = 100;
+
+    private final Context mContext;
+
+    // null means feature disabled.
+    @Nullable
+    private final Intent mServiceIntent;
+
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
+
+    private final Object mLock = new Object();
+
+    // This one records if there is a service bound. This will be cleared as soon as service is
+    // unbound (=UI dismissed)
+    @GuardedBy("mLock")
+    private boolean mServiceBound = false;
+
+    // This one represents if UI is shown for the current session. This should be kept until
+    // next event to show UI comes up.
+    @GuardedBy("mLock")
+    private boolean mUiShown = false;
+
+    @GuardedBy("mLock")
+    @UserIdInt
+    private int mUserId = UserHandle.USER_NULL;
+
+    @GuardedBy("mLock")
+    private CarPowerManager mCarPowerManager;
+
+    @GuardedBy("mLock")
+    private IUserNoticeUI mUiService;
+
+    @GuardedBy("mLock")
+    @UserIdInt
+    private int mIgnoreUserId = UserHandle.USER_NULL;
+
+    private final CarUserService.UserCallback mUserCallback = new CarUserService.UserCallback() {
+        @Override
+        public void onUserLockChanged(@UserIdInt int userId, boolean unlocked) {
+            // Nothing to do
+        }
+
+        @Override
+        public void onSwitchUser(@UserIdInt int userId) {
+            mMainHandler.post(() -> {
+                stopUi(/* clearUiShown= */ true);
+                synchronized (mLock) {
+                    // This should be the only place to change user
+                    mUserId = userId;
+                }
+                startNoticeUiIfNecessary();
+            });
+        }
+    };
+
+    private final CarPowerStateListener mPowerStateListener = new CarPowerStateListener() {
+        @Override
+        public void onStateChanged(int state) {
+            if (state == CarPowerManager.CarPowerStateListener.SHUTDOWN_PREPARE) {
+                mMainHandler.post(() -> stopUi(/* clearUiShown= */ true));
+            } else if (state == CarPowerManager.CarPowerStateListener.ON) {
+                // Only ON can be relied on as car can restart while in garage mode.
+                mMainHandler.post(() -> startNoticeUiIfNecessary());
+            }
+        }
+    };
+
+    private final BroadcastReceiver mDisplayBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Runs in main thread, so do not use Handler.
+            if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
+                if (isDisplayOn()) {
+                    Log.i(TAG_USER, "SCREEN_OFF while display is already on");
+                    return;
+                }
+                Log.i(TAG_USER, "Display off, stopping UI");
+                stopUi(/* clearUiShown= */ true);
+            } else if (Intent.ACTION_SCREEN_ON.equals(intent.getAction())) {
+                if (!isDisplayOn()) {
+                    Log.i(TAG_USER, "SCREEN_ON while display is already off");
+                    return;
+                }
+                Log.i(TAG_USER, "Display on, starting UI");
+                startNoticeUiIfNecessary();
+            }
+        }
+    };
+
+    private final IUserNotice.Stub mIUserNotice = new IUserNotice.Stub() {
+        @Override
+        public void onDialogDismissed() {
+            mMainHandler.post(() -> stopUi(/* clearUiShown= */ false));
+        }
+    };
+
+    private final ServiceConnection mUiServiceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            synchronized (mLock) {
+                if (!mServiceBound) {
+                    // already unbound but passed due to timing. This should be just ignored.
+                    return;
+                }
+            }
+            IUserNoticeUI binder = IUserNoticeUI.Stub.asInterface(service);
+            try {
+                binder.setCallbackBinder(mIUserNotice);
+            } catch (RemoteException e) {
+                Log.w(TAG_USER, "UserNoticeUI Service died", e);
+                // Wait for reconnect
+                binder = null;
+            }
+            synchronized (mLock) {
+                mUiService = binder;
+            }
+        }
+
+        public void onServiceDisconnected(ComponentName name) {
+            // UI crashed. Stop it so that it does not come again.
+            stopUi(/* clearUiShown= */ true);
+        }
+    };
+
+    // added for debugging purpose
+    @GuardedBy("mLock")
+    private int mKeyguardPollingCounter;
+
+    private final Runnable mKeyguardPollingRunnable = () -> {
+        synchronized (mLock) {
+            mKeyguardPollingCounter++;
+        }
+        startNoticeUiIfNecessary();
+    };
+
+    public CarUserNoticeService(Context context) {
+        Resources res = context.getResources();
+        String componentName = res.getString(R.string.config_userNoticeUiService);
+        if (componentName.isEmpty()) {
+            // feature disabled
+            mContext = null;
+            mServiceIntent = null;
+            return;
+        }
+        mContext = context;
+        mServiceIntent = new Intent();
+        mServiceIntent.setComponent(ComponentName.unflattenFromString(componentName));
+    }
+
+    public void ignoreUserNotice(int userId) {
+        synchronized (mLock) {
+            mIgnoreUserId = userId;
+        }
+    }
+
+    private boolean checkKeyguardLockedWithPolling() {
+        mMainHandler.removeCallbacks(mKeyguardPollingRunnable);
+        IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
+        boolean locked = true;
+        if (wm != null) {
+            try {
+                locked = wm.isKeyguardLocked();
+            } catch (RemoteException e) {
+                Log.w(TAG_USER, "system server crashed", e);
+            }
+        }
+        if (locked) {
+            mMainHandler.postDelayed(mKeyguardPollingRunnable, KEYGUARD_POLLING_INTERVAL_MS);
+        }
+        return locked;
+    }
+
+    private boolean isNoticeScreenEnabledInSetting(@UserIdInt int userId) {
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                CarSettings.Secure.KEY_ENABLE_INITIAL_NOTICE_SCREEN_TO_USER,
+                1 /*enable by default*/, userId) == 1;
+    }
+
+    private boolean isDisplayOn() {
+        PowerManager pm = mContext.getSystemService(PowerManager.class);
+        if (pm == null) {
+            return false;
+        }
+        return pm.isInteractive();
+    }
+
+    private boolean grantSystemAlertWindowPermission(@UserIdInt int userId) {
+        AppOpsManager appOpsManager = mContext.getSystemService(AppOpsManager.class);
+        if (appOpsManager == null) {
+            Log.w(TAG_USER, "AppOpsManager not ready yet");
+            return false;
+        }
+        String packageName = mServiceIntent.getComponent().getPackageName();
+        int packageUid;
+        try {
+            packageUid = mContext.getPackageManager().getPackageUidAsUser(packageName, userId);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.wtf(TAG_USER, "Target package for config_userNoticeUiService not found:"
+                    + packageName + " userId:" + userId);
+            return false;
+        }
+        appOpsManager.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, packageUid, packageName,
+                AppOpsManager.MODE_ALLOWED);
+        Log.i(TAG_USER, "Granted SYSTEM_ALERT_WINDOW permission to package:" + packageName
+                + " package uid:" + packageUid);
+        return true;
+    }
+
+    private void startNoticeUiIfNecessary() {
+        int userId;
+        synchronized (mLock) {
+            if (mUiShown || mServiceBound) {
+                return;
+            }
+            userId = mUserId;
+            if (mIgnoreUserId == userId) {
+                return;
+            } else {
+                mIgnoreUserId = UserHandle.USER_NULL;
+            }
+        }
+        if (userId == UserHandle.USER_NULL) {
+            return;
+        }
+        // headless user 0 is ignored.
+        if (userId == UserHandle.USER_SYSTEM) {
+            return;
+        }
+        if (!isNoticeScreenEnabledInSetting(userId)) {
+            return;
+        }
+        if (userId != ActivityManager.getCurrentUser()) {
+            // user has switched. will be handled by user switch callback
+            return;
+        }
+        // Dialog can be not shown if display is off.
+        // DISPLAY_ON broadcast will handle this later.
+        if (!isDisplayOn()) {
+            return;
+        }
+        // Do not show it until keyguard is dismissed.
+        if (checkKeyguardLockedWithPolling()) {
+            return;
+        }
+        if (!grantSystemAlertWindowPermission(userId)) {
+            return;
+        }
+        boolean bound = mContext.bindServiceAsUser(mServiceIntent, mUiServiceConnection,
+                Context.BIND_AUTO_CREATE, UserHandle.of(userId));
+        if (bound) {
+            Log.i(TAG_USER, "Bound UserNoticeUI Service Service:" + mServiceIntent);
+            synchronized (mLock) {
+                mServiceBound = true;
+                mUiShown = true;
+            }
+        } else {
+            Log.w(TAG_USER, "Cannot bind to UserNoticeUI Service Service" + mServiceIntent);
+        }
+    }
+
+    private void stopUi(boolean clearUiShown) {
+        mMainHandler.removeCallbacks(mKeyguardPollingRunnable);
+        boolean serviceBound;
+        synchronized (mLock) {
+            mUiService = null;
+            serviceBound = mServiceBound;
+            mServiceBound = false;
+            if (clearUiShown) {
+                mUiShown = false;
+            }
+        }
+        if (serviceBound) {
+            Log.i(TAG_USER, "Unbound UserNoticeUI Service");
+            mContext.unbindService(mUiServiceConnection);
+        }
+    }
+
+    @Override
+    public void init() {
+        if (mServiceIntent == null) {
+            // feature disabled
+            return;
+        }
+
+        CarPowerManager carPowerManager;
+        synchronized (mLock) {
+            mCarPowerManager = CarLocalServices.createCarPowerManager(mContext);
+            carPowerManager = mCarPowerManager;
+        }
+        try {
+            carPowerManager.setListener(mPowerStateListener);
+        } catch (CarNotConnectedException e) {
+            // should not happen
+            throw new RuntimeException("CarNotConnectedException from CarPowerManager", e);
+        }
+        CarUserService userService = CarLocalServices.getService(CarUserService.class);
+        userService.addUserCallback(mUserCallback);
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+        intentFilter.addAction(Intent.ACTION_SCREEN_ON);
+        mContext.registerReceiver(mDisplayBroadcastReceiver, intentFilter);
+    }
+
+    @Override
+    public void release() {
+        if (mServiceIntent == null) {
+            // feature disabled
+            return;
+        }
+        mContext.unregisterReceiver(mDisplayBroadcastReceiver);
+        CarUserService userService = CarLocalServices.getService(CarUserService.class);
+        userService.removeUserCallback(mUserCallback);
+        CarPowerManager carPowerManager;
+        synchronized (mLock) {
+            carPowerManager = mCarPowerManager;
+            mUserId = UserHandle.USER_NULL;
+        }
+        carPowerManager.clearListener();
+        stopUi(/* clearUiShown= */ true);
+    }
+
+    @Override
+    public void dump(PrintWriter writer) {
+        synchronized (mLock) {
+            if (mServiceIntent == null) {
+                writer.println("*CarUserNoticeService* disabled");
+                return;
+            }
+            if (mUserId == UserHandle.USER_NULL) {
+                writer.println("*CarUserNoticeService* User not started yet.");
+                return;
+            }
+            writer.println("*CarUserNoticeService* mServiceIntent:" + mServiceIntent
+                    + ", mUserId:" + mUserId
+                    + ", mUiShown:" + mUiShown
+                    + ", mServiceBound:" + mServiceBound
+                    + ", mKeyguardPollingCounter:" + mKeyguardPollingCounter
+                    + ", Setting enabled:" + isNoticeScreenEnabledInSetting(mUserId)
+                    + ", Ignore User: " + mIgnoreUserId);
+        }
+    }
+}
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 5377920..e0b4be8 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -25,6 +25,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources;
 import android.location.LocationManager;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -33,6 +34,7 @@
 import android.util.Log;
 
 import com.android.car.CarServiceBase;
+import com.android.car.R;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
@@ -134,6 +136,13 @@
         writer.println("maxRunningUsers:" + mMaxRunningUsers);
         writer.println("BackgroundUsersToRestart:" + backgroundUsersToRestart);
         writer.println("BackgroundUsersRestarted:" + backgroundUsersRestarted);
+        writer.println("Relevant overlayable  properties");
+        Resources res = mContext.getResources();
+        String indent = "  ";
+        writer.printf("%sowner_name=%s\n", indent,
+                res.getString(com.android.internal.R.string.owner_name));
+        writer.printf("%sdefault_guest_name=%s\n", indent,
+                res.getString(R.string.default_guest_name));
     }
 
     private void updateDefaultUserRestriction() {
@@ -160,8 +169,7 @@
         if (Intent.ACTION_USER_SWITCHED.equals(intent.getAction())) {
             // Update last active user if the switched-to user is a persistent, non-system user.
             final int currentUser = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
-            if (currentUser > UserHandle.USER_SYSTEM
-                        && mCarUserManagerHelper.isPersistentUser(currentUser)) {
+            if (currentUser > UserHandle.USER_SYSTEM) {
                 mCarUserManagerHelper.setLastActiveUser(currentUser);
             }
         }
@@ -172,7 +180,7 @@
         mUserCallbacks.add(callback);
     }
 
-    /** Removes previuosly added callback to lilsten user events. */
+    /** Removes previously added callback to listen user events. */
     public void removeUserCallback(UserCallback callback) {
         mUserCallbacks.remove(callback);
     }
diff --git a/service/src/com/android/car/vms/VmsBrokerService.java b/service/src/com/android/car/vms/VmsBrokerService.java
index 26626ff..ad0bfad 100644
--- a/service/src/com/android/car/vms/VmsBrokerService.java
+++ b/service/src/com/android/car/vms/VmsBrokerService.java
@@ -22,53 +22,37 @@
 import android.car.vms.VmsLayersOffering;
 import android.car.vms.VmsOperationRecorder;
 import android.car.vms.VmsSubscriptionState;
-import android.content.pm.PackageManager;
-import android.os.Binder;
 import android.os.IBinder;
-import android.os.Process;
 import android.util.Log;
 
 import com.android.car.VmsLayersAvailability;
 import com.android.car.VmsPublishersInfo;
 import com.android.car.VmsRouting;
 import com.android.internal.annotations.GuardedBy;
-import com.android.internal.annotations.VisibleForTesting;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.IntSupplier;
 
 /**
  * Broker service facilitating subscription handling and message passing between
  * VmsPublisherService, VmsSubscriberService, and VmsHalService.
  */
 public class VmsBrokerService {
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final String TAG = "VmsBrokerService";
 
-    @VisibleForTesting
-    static final String HAL_CLIENT = "HalClient";
-
-    @VisibleForTesting
-    static final String UNKNOWN_PACKAGE = "UnknownPackage";
-
     private CopyOnWriteArrayList<PublisherListener> mPublisherListeners =
             new CopyOnWriteArrayList<>();
     private CopyOnWriteArrayList<SubscriberListener> mSubscriberListeners =
             new CopyOnWriteArrayList<>();
-    private PackageManager mPackageManager;
-    private IntSupplier mGetCallingPid;
-    private IntSupplier mGetCallingUid;
 
     private final Object mLock = new Object();
     @GuardedBy("mLock")
     private final VmsRouting mRouting = new VmsRouting();
     @GuardedBy("mLock")
-    private final Map<IBinder, String> mBinderPackage = new HashMap<>();
-    @GuardedBy("mLock")
     private final Map<IBinder, Map<Integer, VmsLayersOffering>> mOfferings = new HashMap<>();
     @GuardedBy("mLock")
     private final VmsLayersAvailability mAvailableLayers = new VmsLayersAvailability();
@@ -92,15 +76,6 @@
      */
     public interface SubscriberListener {
         /**
-         * Callback triggered when data is published for a given layer.
-         *
-         * @param layer       Layer data is being published for
-         * @param publisherId Publisher of data
-         * @param payload     Layer data
-         */
-        void onMessageReceived(VmsLayer layer, int publisherId, byte[] payload);
-
-        /**
          * Callback triggered when the layers available for subscription changes.
          *
          * @param availableLayers Current layer availability
@@ -109,22 +84,6 @@
     }
 
     /**
-     * Constructs new broker service.
-     */
-    public VmsBrokerService(PackageManager packageManager) {
-        this(packageManager, Binder::getCallingPid, Binder::getCallingUid);
-    }
-
-    @VisibleForTesting
-    VmsBrokerService(PackageManager packageManager, IntSupplier getCallingPid,
-            IntSupplier getCallingUid) {
-        if (DBG) Log.d(TAG, "Started VmsBrokerService!");
-        mPackageManager = packageManager;
-        mGetCallingPid = getCallingPid;
-        mGetCallingUid = getCallingUid;
-    }
-
-    /**
      * Adds a listener for publisher callbacks.
      *
      * @param listener Publisher callback listener
@@ -168,8 +127,6 @@
     public void addSubscription(IVmsSubscriberClient subscriber) {
         synchronized (mLock) {
             mRouting.addSubscription(subscriber);
-            // Add mapping from binder to package name of subscriber.
-            mBinderPackage.computeIfAbsent(subscriber.asBinder(), k -> getCallingPackage());
         }
     }
 
@@ -199,9 +156,6 @@
 
             // Add the listeners subscription to the layer
             mRouting.addSubscription(subscriber, layer);
-
-            // Add mapping from binder to package name of subscriber.
-            mBinderPackage.computeIfAbsent(subscriber.asBinder(), k -> getCallingPackage());
         }
         if (firstSubscriptionForLayer) {
             notifyOfSubscriptionChange();
@@ -249,9 +203,6 @@
 
             // Add the listeners subscription to the layer
             mRouting.addSubscription(subscriber, layer, publisherId);
-
-            // Add mapping from binder to package name of subscriber.
-            mBinderPackage.computeIfAbsent(subscriber.asBinder(), k -> getCallingPackage());
         }
         if (firstSubscriptionForLayer) {
             notifyOfSubscriptionChange();
@@ -270,8 +221,10 @@
         boolean layerHasSubscribers;
         synchronized (mLock) {
             if (!mRouting.hasLayerFromPublisherSubscriptions(layer, publisherId)) {
-                Log.i(TAG, "Trying to remove a layer with no subscription: "
+                if (DBG) {
+                    Log.d(TAG, "Trying to remove a layer with no subscription: "
                         + layer + ", publisher ID:" + publisherId);
+                }
                 return;
             }
 
@@ -296,9 +249,6 @@
         boolean subscriptionStateChanged;
         synchronized (mLock) {
             subscriptionStateChanged = mRouting.removeDeadSubscriber(subscriber);
-
-            // Remove mapping from binder to package name of subscriber.
-            mBinderPackage.remove(subscriber.asBinder());
         }
         if (subscriptionStateChanged) {
             notifyOfSubscriptionChange();
@@ -394,15 +344,6 @@
         }
     }
 
-    /**
-     * Gets the package name for a given IVmsSubscriberClient
-     */
-    public String getPackageName(IVmsSubscriberClient subscriber) {
-        synchronized (mLock) {
-            return mBinderPackage.get(subscriber.asBinder());
-        }
-    }
-
     private void updateLayerAvailability() {
         Set<VmsLayersOffering> allPublisherOfferings = new HashSet<>();
         synchronized (mLock) {
@@ -415,9 +356,8 @@
     }
 
     private void notifyOfSubscriptionChange() {
-        if (DBG) Log.d(TAG, "Notifying publishers on subscriptions");
-
         VmsSubscriptionState subscriptionState = getSubscriptionState();
+        Log.i(TAG, "Notifying publishers of subscriptions: " + subscriptionState);
         // Notify the App publishers
         for (PublisherListener listener : mPublisherListeners) {
             listener.onSubscriptionChange(subscriptionState);
@@ -425,29 +365,11 @@
     }
 
     private void notifyOfAvailabilityChange() {
-        if (DBG) Log.d(TAG, "Notifying subscribers on layers availability");
-
         VmsAvailableLayers availableLayers = getAvailableLayers();
+        Log.i(TAG, "Notifying subscribers of layers availability: " + availableLayers);
         // Notify the App subscribers
         for (SubscriberListener listener : mSubscriberListeners) {
             listener.onLayersAvailabilityChange(availableLayers);
         }
     }
-
-    // If we're in a binder call, returns back the package name of the caller of the binder call.
-    private String getCallingPackage() {
-        int callingPid = mGetCallingPid.getAsInt();
-        // Since the HAL lives in the same process, if the callingPid is equal to this process's
-        // PID, we know it's the HAL client.
-        if (callingPid == Process.myPid()) {
-            return HAL_CLIENT;
-        }
-        int callingUid = mGetCallingUid.getAsInt();
-        String packageName = mPackageManager.getNameForUid(callingUid);
-        if (packageName == null) {
-            return UNKNOWN_PACKAGE;
-        } else {
-            return packageName;
-        }
-    }
 }
diff --git a/service/src/com/android/car/vms/VmsClientManager.java b/service/src/com/android/car/vms/VmsClientManager.java
index 24f66b9..f2c4813 100644
--- a/service/src/com/android/car/vms/VmsClientManager.java
+++ b/service/src/com/android/car/vms/VmsClientManager.java
@@ -17,18 +17,20 @@
 package com.android.car.vms;
 
 import android.car.Car;
-import android.car.userlib.CarUserManagerHelper;
-import android.content.BroadcastReceiver;
+import android.car.vms.IVmsPublisherClient;
+import android.car.vms.IVmsSubscriberClient;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
+import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.Process;
+import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.ArrayMap;
@@ -36,15 +38,22 @@
 
 import com.android.car.CarServiceBase;
 import com.android.car.R;
+import com.android.car.VmsPublisherService;
 import com.android.car.hal.VmsHalService;
+import com.android.car.stats.CarStatsService;
+import com.android.car.stats.VmsClientLogger;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.PrintWriter;
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.NoSuchElementException;
+import java.util.function.IntSupplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Manages service connections lifecycle for VMS publisher clients.
@@ -53,77 +62,70 @@
  * according to the Android user lifecycle.
  */
 public class VmsClientManager implements CarServiceBase {
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final String TAG = "VmsClientManager";
-    private static final String HAL_CLIENT_NAME = "VmsHalClient";
-
-    /**
-     * Interface for receiving updates about client connections.
-     */
-    public interface ConnectionListener {
-        /**
-         * Called when a client connection is established or re-established.
-         *
-         * @param clientName    String that uniquely identifies the service and user.
-         * @param clientService The IBinder of the client's communication channel.
-         */
-        void onClientConnected(String clientName, IBinder clientService);
-
-        /**
-         * Called when a client connection is terminated.
-         *
-         * @param clientName String that uniquely identifies the service and user.
-         */
-        void onClientDisconnected(String clientName);
-    }
+    private static final String HAL_CLIENT_NAME = "HalClient";
+    private static final String UNKNOWN_PACKAGE = "UnknownPackage";
 
     private final Context mContext;
-    private final Handler mHandler;
+    private final PackageManager mPackageManager;
     private final UserManager mUserManager;
     private final CarUserService mUserService;
-    private final CarUserManagerHelper mUserManagerHelper;
+    private final CarStatsService mStatsService;
+    private final Handler mHandler;
+    private final IntSupplier mGetCallingUid;
     private final int mMillisBeforeRebind;
 
-    @GuardedBy("mListeners")
-    private final ArrayList<ConnectionListener> mListeners = new ArrayList<>();
-    @GuardedBy("mSystemClients")
-    private final Map<String, ClientConnection> mSystemClients = new ArrayMap<>();
-    @GuardedBy("mSystemClients")
-    private IBinder mHalClient;
-    @GuardedBy("mSystemClients")
+    private final Object mLock = new Object();
+
+    @GuardedBy("mLock")
+    private final VmsBrokerService mBrokerService;
+    @GuardedBy("mLock")
+    private VmsPublisherService mPublisherService;
+
+    @GuardedBy("mLock")
+    private final Map<String, PublisherConnection> mSystemClients = new ArrayMap<>();
+    @GuardedBy("mLock")
+    private IVmsPublisherClient mHalClient;
+    @GuardedBy("mLock")
     private boolean mSystemUserUnlocked;
 
-    @GuardedBy("mCurrentUserClients")
-    private final Map<String, ClientConnection> mCurrentUserClients = new ArrayMap<>();
-    @GuardedBy("mCurrentUserClients")
+    @GuardedBy("mLock")
+    private final Map<String, PublisherConnection> mCurrentUserClients = new ArrayMap<>();
+    @GuardedBy("mLock")
     private int mCurrentUser;
 
-    @GuardedBy("mRebindCounts")
-    private final Map<String, AtomicLong> mRebindCounts = new ArrayMap<>();
+    @GuardedBy("mLock")
+    private final Map<IBinder, SubscriberConnection> mSubscribers = new ArrayMap<>();
 
     @VisibleForTesting
     final Runnable mSystemUserUnlockedListener = () -> {
-        synchronized (mSystemClients) {
+        synchronized (mLock) {
             mSystemUserUnlocked = true;
         }
         bindToSystemClients();
     };
 
     @VisibleForTesting
-    final BroadcastReceiver mUserSwitchReceiver = new BroadcastReceiver() {
+    public final CarUserService.UserCallback mUserCallback = new CarUserService.UserCallback() {
         @Override
-        public void onReceive(Context context, Intent intent) {
-            if (DBG) Log.d(TAG, "Received " + intent);
-            synchronized (mCurrentUserClients) {
-                int currentUserId = mUserManagerHelper.getCurrentForegroundUserId();
-                if (mCurrentUser != currentUserId) {
+        public void onSwitchUser(int userId) {
+            synchronized (mLock) {
+                if (mCurrentUser != userId) {
+                    mCurrentUser = userId;
                     terminate(mCurrentUserClients);
+                    terminate(mSubscribers.values().stream()
+                            .filter(subscriber -> subscriber.mUserId != mCurrentUser)
+                            .filter(subscriber -> subscriber.mUserId != UserHandle.USER_SYSTEM));
                 }
-                mCurrentUser = currentUserId;
+            }
+            bindToUserClients();
+        }
 
-                if (Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())
-                        || mUserManager.isUserUnlocked(mCurrentUser)) {
-                    bindToSystemClients();
+        @Override
+        public void onUserLockChanged(int userId, boolean unlocked) {
+            synchronized (mLock) {
+                if (mCurrentUser == userId && unlocked) {
                     bindToUserClients();
                 }
             }
@@ -131,115 +133,221 @@
     };
 
     /**
-     * Constructor for client managers.
+     * Constructor for client manager.
      *
      * @param context           Context to use for registering receivers and binding services.
+     * @param statsService      Service for logging client metrics.
      * @param userService       User service for registering system unlock listener.
-     * @param userManagerHelper User manager for querying current user state.
+     * @param brokerService     Service managing the VMS publisher/subscriber state.
      * @param halService        Service providing the HAL client interface
      */
-    public VmsClientManager(Context context, CarUserService userService,
-            CarUserManagerHelper userManagerHelper, VmsHalService halService) {
+    public VmsClientManager(Context context, CarStatsService statsService,
+            CarUserService userService, VmsBrokerService brokerService,
+            VmsHalService halService) {
+        this(context, statsService, userService, brokerService, halService,
+                new Handler(Looper.getMainLooper()), Binder::getCallingUid);
+    }
+
+    @VisibleForTesting
+    VmsClientManager(Context context, CarStatsService statsService,
+            CarUserService userService, VmsBrokerService brokerService,
+            VmsHalService halService, Handler handler, IntSupplier getCallingUid) {
         mContext = context;
-        mHandler = new Handler(Looper.getMainLooper());
-        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        mPackageManager = context.getPackageManager();
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mStatsService = statsService;
         mUserService = userService;
-        mUserManagerHelper = userManagerHelper;
-        mMillisBeforeRebind = mContext.getResources().getInteger(
+        mCurrentUser = UserHandle.USER_NULL;
+        mBrokerService = brokerService;
+        mHandler = handler;
+        mGetCallingUid = getCallingUid;
+        mMillisBeforeRebind = context.getResources().getInteger(
                 com.android.car.R.integer.millisecondsBeforeRebindToVmsPublisher);
-        halService.setPublisherConnectionCallbacks(this::onHalConnected, this::onHalDisconnected);
+
+        halService.setClientManager(this);
+    }
+
+    /**
+     * Registers the publisher service for connection callbacks.
+     *
+     * @param publisherService Publisher service to register.
+     */
+    public void setPublisherService(VmsPublisherService publisherService) {
+        synchronized (mLock) {
+            mPublisherService = publisherService;
+        }
     }
 
     @Override
     public void init() {
         mUserService.runOnUser0Unlock(mSystemUserUnlockedListener);
-
-        IntentFilter userSwitchFilter = new IntentFilter();
-        userSwitchFilter.addAction(Intent.ACTION_USER_SWITCHED);
-        userSwitchFilter.addAction(Intent.ACTION_USER_UNLOCKED);
-        mContext.registerReceiverAsUser(mUserSwitchReceiver, UserHandle.ALL, userSwitchFilter, null,
-                null);
+        mUserService.addUserCallback(mUserCallback);
     }
 
     @Override
     public void release() {
-        mContext.unregisterReceiver(mUserSwitchReceiver);
-        notifyListenersOnClientDisconnected(HAL_CLIENT_NAME);
-        synchronized (mSystemClients) {
+        mUserService.removeUserCallback(mUserCallback);
+        synchronized (mLock) {
+            if (mHalClient != null) {
+                mPublisherService.onClientDisconnected(HAL_CLIENT_NAME);
+            }
             terminate(mSystemClients);
-        }
-        synchronized (mCurrentUserClients) {
             terminate(mCurrentUserClients);
+            terminate(mSubscribers.values().stream());
         }
     }
 
     @Override
     public void dump(PrintWriter writer) {
-        dumpMetrics(writer);
-    }
-
-    @Override
-    public void dumpMetrics(PrintWriter writer) {
         writer.println("*" + getClass().getSimpleName() + "*");
-        synchronized (mSystemClients) {
+        synchronized (mLock) {
+            writer.println("mCurrentUser:" + mCurrentUser);
             writer.println("mHalClient: " + (mHalClient != null ? "connected" : "disconnected"));
             writer.println("mSystemClients:");
             dumpConnections(writer, mSystemClients);
-        }
-        synchronized (mCurrentUserClients) {
+
             writer.println("mCurrentUserClients:");
             dumpConnections(writer, mCurrentUserClients);
-            writer.println("mCurrentUser:" + mCurrentUser);
-        }
-        synchronized (mRebindCounts) {
-            writer.println("mRebindCounts:");
-            for (Map.Entry<String, AtomicLong> entry : mRebindCounts.entrySet()) {
-                writer.printf("\t%s: %s\n", entry.getKey(), entry.getValue());
+
+            writer.println("mSubscribers:");
+            for (SubscriberConnection subscriber : mSubscribers.values()) {
+                writer.printf("\t%s\n", subscriber);
             }
         }
     }
 
-    private void dumpConnections(PrintWriter writer, Map<String, ClientConnection> connectionMap) {
-        for (ClientConnection connection : connectionMap.values()) {
+
+    /**
+     * Adds a subscriber for connection tracking.
+     *
+     * @param subscriberClient Subscriber client to track.
+     */
+    public void addSubscriber(IVmsSubscriberClient subscriberClient) {
+        if (subscriberClient == null) {
+            Log.e(TAG, "Trying to add a null subscriber: "
+                    + getCallingPackage(mGetCallingUid.getAsInt()));
+            throw new IllegalArgumentException("subscriber cannot be null.");
+        }
+
+        synchronized (mLock) {
+            IBinder subscriberBinder = subscriberClient.asBinder();
+            if (mSubscribers.containsKey(subscriberBinder)) {
+                // Already registered
+                return;
+            }
+
+            int callingUid = mGetCallingUid.getAsInt();
+            int subscriberUserId = UserHandle.getUserId(callingUid);
+            if (subscriberUserId != mCurrentUser && subscriberUserId != UserHandle.USER_SYSTEM) {
+                throw new SecurityException("Caller must be foreground user or system");
+            }
+
+            SubscriberConnection subscriber = new SubscriberConnection(
+                    subscriberClient, callingUid, getCallingPackage(callingUid), subscriberUserId);
+            if (DBG) Log.d(TAG, "Registering subscriber: " + subscriber);
+            try {
+                subscriberBinder.linkToDeath(subscriber, 0);
+            } catch (RemoteException e) {
+                throw new IllegalStateException("Subscriber already dead: " + subscriber, e);
+            }
+            mSubscribers.put(subscriberBinder, subscriber);
+        }
+    }
+
+    /**
+     * Removes a subscriber for connection tracking and expires its subscriptions.
+     *
+     * @param subscriberClient Subscriber client to remove.
+     */
+    public void removeSubscriber(IVmsSubscriberClient subscriberClient) {
+        synchronized (mLock) {
+            SubscriberConnection subscriber = mSubscribers.get(subscriberClient.asBinder());
+            if (subscriber != null) {
+                subscriber.terminate();
+            }
+        }
+    }
+
+    /**
+     * Returns all active subscriber clients.
+     */
+    public Collection<IVmsSubscriberClient> getAllSubscribers() {
+        synchronized (mLock) {
+            return mSubscribers.values().stream()
+                    .map(subscriber -> subscriber.mClient)
+                    .collect(Collectors.toList());
+        }
+    }
+
+    /**
+     * Gets the application UID associated with a subscriber client.
+     */
+    public int getSubscriberUid(IVmsSubscriberClient subscriberClient) {
+        synchronized (mLock) {
+            SubscriberConnection subscriber = mSubscribers.get(subscriberClient.asBinder());
+            return subscriber != null ? subscriber.mUid : Process.INVALID_UID;
+        }
+    }
+
+    /**
+     * Gets the package name for a given subscriber client.
+     */
+    public String getPackageName(IVmsSubscriberClient subscriberClient) {
+        synchronized (mLock) {
+            SubscriberConnection subscriber = mSubscribers.get(subscriberClient.asBinder());
+            return subscriber != null ? subscriber.mPackageName : UNKNOWN_PACKAGE;
+        }
+    }
+
+    /**
+     * Registers the HAL client connections.
+     */
+    public void onHalConnected(IVmsPublisherClient publisherClient,
+            IVmsSubscriberClient subscriberClient) {
+        synchronized (mLock) {
+            mHalClient = publisherClient;
+            mPublisherService.onClientConnected(HAL_CLIENT_NAME, mHalClient);
+            mSubscribers.put(subscriberClient.asBinder(),
+                    new SubscriberConnection(subscriberClient, Process.myUid(), HAL_CLIENT_NAME,
+                            UserHandle.USER_SYSTEM));
+        }
+        mStatsService.getVmsClientLogger(Process.myUid())
+                .logConnectionState(ConnectionState.CONNECTED);
+    }
+
+    /**
+     *
+     */
+    public void onHalDisconnected() {
+        synchronized (mLock) {
+            if (mHalClient != null) {
+                mPublisherService.onClientDisconnected(HAL_CLIENT_NAME);
+                mStatsService.getVmsClientLogger(Process.myUid())
+                        .logConnectionState(ConnectionState.DISCONNECTED);
+            }
+            mHalClient = null;
+            terminate(mSubscribers.values().stream()
+                    .filter(subscriber -> HAL_CLIENT_NAME.equals(subscriber.mPackageName)));
+        }
+    }
+
+    private void dumpConnections(PrintWriter writer,
+            Map<String, PublisherConnection> connectionMap) {
+        for (PublisherConnection connection : connectionMap.values()) {
             writer.printf("\t%s: %s\n",
                     connection.mName.getPackageName(),
                     connection.mIsBound ? "connected" : "disconnected");
         }
     }
 
-    /**
-     * Registers a new client connection state listener.
-     *
-     * @param listener Listener to register.
-     */
-    public void registerConnectionListener(ConnectionListener listener) {
-        synchronized (mListeners) {
-            if (!mListeners.contains(listener)) {
-                mListeners.add(listener);
-            }
-        }
-        notifyListenerOfConnectedClients(listener);
-    }
-
-    /**
-     * Unregisters a client connection state listener.
-     *
-     * @param listener Listener to remove.
-     */
-    public void unregisterConnectionListener(ConnectionListener listener) {
-        synchronized (mListeners) {
-            mListeners.remove(listener);
-        }
-    }
-
     private void bindToSystemClients() {
         String[] clientNames = mContext.getResources().getStringArray(
                 R.array.vmsPublisherSystemClients);
-        Log.i(TAG, "Attempting to bind " + clientNames.length + " system client(s)");
-        synchronized (mSystemClients) {
+        synchronized (mLock) {
             if (!mSystemUserUnlocked) {
                 return;
             }
+            Log.i(TAG, "Attempting to bind " + clientNames.length + " system client(s)");
             for (String clientName : clientNames) {
                 bind(mSystemClients, clientName, UserHandle.SYSTEM);
             }
@@ -247,15 +355,24 @@
     }
 
     private void bindToUserClients() {
-        synchronized (mCurrentUserClients) {
+        bindToSystemClients(); // Bind system clients on user switch, if they are not already bound.
+        synchronized (mLock) {
+            if (mCurrentUser == UserHandle.USER_NULL) {
+                Log.e(TAG, "Unknown user in foreground.");
+                return;
+            }
             // To avoid the risk of double-binding, clients running as the system user must only
             // ever be bound in bindToSystemClients().
-            // In a headless multi-user system, the system user will never be in the foreground.
             if (mCurrentUser == UserHandle.USER_SYSTEM) {
                 Log.e(TAG, "System user in foreground. Userspace clients will not be bound.");
                 return;
             }
 
+            if (!mUserManager.isUserUnlockingOrUnlocked(mCurrentUser)) {
+                Log.i(TAG, "Waiting for foreground user " + mCurrentUser + " to be unlocked.");
+                return;
+            }
+
             String[] clientNames = mContext.getResources().getStringArray(
                     R.array.vmsPublisherUserClients);
             Log.i(TAG, "Attempting to bind " + clientNames.length + " user client(s)");
@@ -266,7 +383,7 @@
         }
     }
 
-    private void bind(Map<String, ClientConnection> connectionMap, String clientName,
+    private void bind(Map<String, PublisherConnection> connectionMap, String clientName,
             UserHandle userHandle) {
         if (connectionMap.containsKey(clientName)) {
             Log.i(TAG, "Already bound: " + clientName);
@@ -288,83 +405,45 @@
             return;
         }
 
+        VmsClientLogger statsLog = mStatsService.getVmsClientLogger(
+                UserHandle.getUid(userHandle.getIdentifier(), serviceInfo.applicationInfo.uid));
+
         if (!Car.PERMISSION_BIND_VMS_CLIENT.equals(serviceInfo.permission)) {
-            Log.w(TAG, "Client service: " + clientName
+            Log.e(TAG, "Client service: " + clientName
                     + " does not require " + Car.PERMISSION_BIND_VMS_CLIENT + " permission");
+            statsLog.logConnectionState(ConnectionState.CONNECTION_ERROR);
             return;
         }
 
-        ClientConnection connection = new ClientConnection(name, userHandle);
+        PublisherConnection connection = new PublisherConnection(name, userHandle, statsLog);
         if (connection.bind()) {
             Log.i(TAG, "Client bound: " + connection);
             connectionMap.put(clientName, connection);
         } else {
-            Log.w(TAG, "Binding failed: " + connection);
+            Log.e(TAG, "Binding failed: " + connection);
         }
     }
 
-    private void terminate(Map<String, ClientConnection> connectionMap) {
-        connectionMap.values().forEach(ClientConnection::terminate);
+    private void terminate(Map<String, PublisherConnection> connectionMap) {
+        connectionMap.values().forEach(PublisherConnection::terminate);
         connectionMap.clear();
     }
 
-    private void notifyListenerOfConnectedClients(ConnectionListener listener) {
-        synchronized (mSystemClients) {
-            if (mHalClient != null) {
-                listener.onClientConnected(HAL_CLIENT_NAME, mHalClient);
-            }
-            mSystemClients.values().forEach(conn -> conn.notifyIfConnected(listener));
-        }
-        synchronized (mCurrentUserClients) {
-            mCurrentUserClients.values().forEach(conn -> conn.notifyIfConnected(listener));
-        }
-    }
-
-    private void notifyListenersOnClientConnected(String clientName, IBinder clientService) {
-        synchronized (mListeners) {
-            for (ConnectionListener listener : mListeners) {
-                listener.onClientConnected(clientName, clientService);
-            }
-        }
-    }
-
-    private void notifyListenersOnClientDisconnected(String clientName) {
-        synchronized (mListeners) {
-            for (ConnectionListener listener : mListeners) {
-                listener.onClientDisconnected(clientName);
-            }
-        }
-    }
-
-    private void onHalConnected(IBinder halClient) {
-        synchronized (mSystemClients) {
-            mHalClient = halClient;
-            notifyListenersOnClientConnected(HAL_CLIENT_NAME, mHalClient);
-        }
-    }
-
-    private void onHalDisconnected() {
-        synchronized (mSystemClients) {
-            mHalClient = null;
-            notifyListenersOnClientDisconnected(HAL_CLIENT_NAME);
-        }
-        synchronized (mRebindCounts) {
-            mRebindCounts.computeIfAbsent(HAL_CLIENT_NAME, k -> new AtomicLong()).incrementAndGet();
-        }
-    }
-
-    class ClientConnection implements ServiceConnection {
+    class PublisherConnection implements ServiceConnection {
         private final ComponentName mName;
         private final UserHandle mUser;
         private final String mFullName;
+        private final VmsClientLogger mStatsLog;
         private boolean mIsBound = false;
         private boolean mIsTerminated = false;
-        private IBinder mClientService;
+        private boolean mRebindScheduled = false;
+        private IVmsPublisherClient mClientService;
 
-        ClientConnection(ComponentName name, UserHandle user) {
+        PublisherConnection(ComponentName name, UserHandle user, VmsClientLogger statsLog) {
             mName = name;
             mUser = user;
             mFullName = mName.flattenToString() + " U=" + mUser.getIdentifier();
+            mStatsLog = statsLog;
         }
 
         synchronized boolean bind() {
@@ -374,6 +453,7 @@
             if (mIsTerminated) {
                 return false;
             }
+            mStatsLog.logConnectionState(ConnectionState.CONNECTING);
 
             if (DBG) Log.d(TAG, "binding: " + mFullName);
             Intent intent = new Intent();
@@ -385,6 +465,10 @@
                 Log.e(TAG, "While binding " + mFullName, e);
             }
 
+            if (!mIsBound) {
+                mStatsLog.logConnectionState(ConnectionState.CONNECTION_ERROR);
+            }
+
             return mIsBound;
         }
 
@@ -400,50 +484,71 @@
                 Log.e(TAG, "While unbinding " + mFullName, t);
             }
             mIsBound = false;
-            if (mClientService != null) {
-                notifyListenersOnClientDisconnected(mFullName);
-            }
-            mClientService = null;
         }
 
-        synchronized void rebind() {
-            unbind();
+        synchronized void scheduleRebind() {
+            if (mRebindScheduled) {
+                return;
+            }
+
             if (DBG) {
                 Log.d(TAG,
                         String.format("rebinding %s after %dms", mFullName, mMillisBeforeRebind));
             }
-            if (!mIsTerminated) {
-                mHandler.postDelayed(this::bind, mMillisBeforeRebind);
-                synchronized (mRebindCounts) {
-                    mRebindCounts.computeIfAbsent(mName.getPackageName(), k -> new AtomicLong())
-                            .incrementAndGet();
-                }
+            mHandler.postDelayed(this::doRebind, mMillisBeforeRebind);
+            mRebindScheduled = true;
+        }
+
+        synchronized void doRebind() {
+            mRebindScheduled = false;
+            // Do not rebind if the connection has been terminated, or the client service has
+            // reconnected on its own.
+            if (mIsTerminated || mClientService != null) {
+                return;
             }
+
+            Log.i(TAG, "Rebinding: " + mFullName);
+            // Ensure that the client is not bound before attempting to rebind.
+            // If the client is not currently bound, unbind() will have no effect.
+            unbind();
+            bind();
         }
 
         synchronized void terminate() {
             if (DBG) Log.d(TAG, "terminating: " + mFullName);
             mIsTerminated = true;
+            notifyOnDisconnect(ConnectionState.TERMINATED);
             unbind();
         }
 
-        synchronized void notifyIfConnected(ConnectionListener listener) {
+        synchronized void notifyOnDisconnect(int connectionState) {
             if (mClientService != null) {
-                listener.onClientConnected(mFullName, mClientService);
+                mPublisherService.onClientDisconnected(mFullName);
+                mClientService = null;
+                mStatsLog.logConnectionState(connectionState);
             }
         }
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
             if (DBG) Log.d(TAG, "onServiceConnected: " + mFullName);
-            mClientService = service;
-            notifyListenersOnClientConnected(mFullName, mClientService);
+            mClientService = IVmsPublisherClient.Stub.asInterface(service);
+            mPublisherService.onClientConnected(mFullName, mClientService);
+            mStatsLog.logConnectionState(ConnectionState.CONNECTED);
         }
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
             if (DBG) Log.d(TAG, "onServiceDisconnected: " + mFullName);
-            rebind();
+            notifyOnDisconnect(ConnectionState.DISCONNECTED);
+            scheduleRebind();
+        }
+
+        @Override
+        public void onBindingDied(ComponentName name) {
+            if (DBG) Log.d(TAG, "onBindingDied: " + mFullName);
+            notifyOnDisconnect(ConnectionState.DISCONNECTED);
+            scheduleRebind();
         }
 
         @Override
@@ -451,4 +556,59 @@
             return mFullName;
         }
     }
+
+    private void terminate(Stream<SubscriberConnection> subscribers) {
+        // Make a copy of the stream, so that terminate() doesn't cause a concurrent modification
+        subscribers.collect(Collectors.toList()).forEach(SubscriberConnection::terminate);
+    }
+
+    // If we're in a binder call, returns back the package name of the caller of the binder call.
+    private String getCallingPackage(int uid) {
+        String packageName = mPackageManager.getNameForUid(uid);
+        if (packageName == null) {
+            return UNKNOWN_PACKAGE;
+        } else {
+            return packageName;
+        }
+    }
+
+    private class SubscriberConnection implements IBinder.DeathRecipient {
+        private final IVmsSubscriberClient mClient;
+        private final int mUid;
+        private final String mPackageName;
+        private final int mUserId;
+
+        SubscriberConnection(IVmsSubscriberClient subscriberClient, int uid, String packageName,
+                int userId) {
+            mClient = subscriberClient;
+            mUid = uid;
+            mPackageName = packageName;
+            mUserId = userId;
+        }
+
+        @Override
+        public void binderDied() {
+            if (DBG) Log.d(TAG, "Subscriber died: " + this);
+            terminate();
+        }
+
+        @Override
+        public String toString() {
+            return mPackageName + " U=" + mUserId;
+        }
+
+        void terminate() {
+            if (DBG) Log.d(TAG, "Terminating subscriber: " + this);
+            synchronized (mLock) {
+                mBrokerService.removeDeadSubscriber(mClient);
+                IBinder subscriberBinder = mClient.asBinder();
+                try {
+                    subscriberBinder.unlinkToDeath(this, 0);
+                } catch (NoSuchElementException e) {
+                    if (DBG) Log.d(TAG, "While unlinking subscriber binder for " + this, e);
+                }
+                mSubscribers.remove(subscriberBinder);
+            }
+        }
+    }
 }
diff --git a/tests/BugReportApp/Android.mk b/tests/BugReportApp/Android.mk
index f948b82..186fe4b 100644
--- a/tests/BugReportApp/Android.mk
+++ b/tests/BugReportApp/Android.mk
@@ -37,7 +37,8 @@
 LOCAL_DEX_PREOPT := false
 
 LOCAL_JAVA_LIBRARIES += \
-    android.car
+    android.car \
+    br_google_auto_value_target
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     androidx.recyclerview_recyclerview \
@@ -56,6 +57,11 @@
 
 LOCAL_REQUIRED_MODULES := privapp_whitelist_com.google.android.car.bugreport
 
+# Explicitly define annotation processors even if javac can find them from
+# LOCAL_STATIC_JAVA_LIBRARIES.
+LOCAL_ANNOTATION_PROCESSORS := br_google_auto_value
+LOCAL_ANNOTATION_PROCESSOR_CLASSES := com.google.auto.value.processor.AutoValueProcessor
+
 include $(BUILD_PACKAGE)
 
 # ====  prebuilt library  ========================
@@ -76,3 +82,28 @@
     br_apache_commons:$(COMMON_LIBS_PATH)/org/eclipse/tycho/tycho-bundles-external/0.18.1/eclipse/plugins/org.apache.commons.codec_1.4.0.v201209201156.jar
 
 include $(BUILD_MULTI_PREBUILT)
+
+# Following shenanigans are needed for LOCAL_ANNOTATION_PROCESSORS.
+
+# ====  prebuilt host libraries  ========================
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+    br_google_auto_value:../../../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar
+
+include $(BUILD_HOST_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := br_google_auto_value_target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+# Use the following include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/BugReportApp/AndroidManifest.xml b/tests/BugReportApp/AndroidManifest.xml
index 90958c7..dcccb83 100644
--- a/tests/BugReportApp/AndroidManifest.xml
+++ b/tests/BugReportApp/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.car.bugreport"
-          android:versionCode="8"
-          android:versionName="1.6.0">
+          android:versionCode="13"
+          android:versionName="1.7.2">
 
     <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -29,8 +29,13 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.DUMP"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/ic_launcher"
+                 android:requestLegacyExternalStorage="true">
         <activity android:name=".BugReportInfoActivity"
                   android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
                   android:exported="true"
@@ -42,15 +47,26 @@
             </intent-filter>
         </activity>
 
-        <!-- singleInstance allows starting bugreport dialog when BugReportInfoActivity is open. -->
+        <!--
+          singleInstance allows starting bugreport dialog when BugReportInfoActivity is open.
+        -->
         <activity android:name=".BugReportActivity"
                   android:theme="@android:style/Theme.DeviceDefault.Dialog"
                   android:exported="true"
-                  android:launchMode="singleInstance">
+                  android:launchMode="singleInstance"
+                  android:excludeFromRecents="true">
+            <meta-data android:name="distractionOptimized" android:value="true"/>
+            <intent-filter>
+                <action android:name="com.google.android.car.bugreport.action.START_SILENT"/>
+            </intent-filter>
         </activity>
 
         <service android:name=".BugReportService"
-                 android:exported="false"/>
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.android.car.bugreport.action.START_SILENT"/>
+            </intent-filter>
+        </service>
 
         <service android:name="com.google.android.car.bugreport.UploadJob"
                  android:permission="android.permission.BIND_JOB_SERVICE"
diff --git a/tests/BugReportApp/README.md b/tests/BugReportApp/README.md
index 2dac8e9..476efe4 100644
--- a/tests/BugReportApp/README.md
+++ b/tests/BugReportApp/README.md
@@ -38,37 +38,56 @@
 [overlayed](https://source.android.com/setup/develop/new-device#use-resource-overlays)
 for specific products.
 
+### Config
+
+Configs are defined in `Config.java`.
+
 ### System Properties
 
-- `android.car.bugreport.disableautoupload` - set it to `true` to disable auto-upload to Google
-   Cloud, and allow users to manually upload or copy the bugreports to flash drive.
+- `android.car.bugreport.force_enable` - set it `true` to enable bugreport app on **all builds**.
 
 ### Upload configuration
 
 BugReport app uses `res/raw/gcs_credentials.json` for authentication and
 `res/values/configs.xml` for obtaining GCS bucket name.
 
+## Starting bugreporting
+
+The app supports following intents:
+
+1. `adb shell am start com.google.android.car.bugreport/.BugReportActivity`
+    - generates `MetaBugReport.Type.INTERACTIVE` bug report, shows audio message dialog before
+    collecting bugreport.
+2. `adb shell am start-foreground-service -a com.google.android.car.bugreport.action.START_SILENT com.google.android.car.bugreport/.BugReportService`
+    - generates `MetaBugReport.Type.SILENT` bug report, without audio message. It shows audio dialog
+    after collecting bugreport.
+
 ## Testing
 
 ### Manually testing the app using the test script
 
-BugReportApp comes with `utils/bugreport_app_tester.py` script that automates
-many of the BugReportApp testing process. Please follow these instructions
-to test the app:
+Please follow these instructions to test the app:
 
 1. Connect the device to your computer.
 2. Make sure the device has Internet.
-3. Run the script: `$ python bugreport_app_tester.py`
-   * The script works on python 2.7 and above.
-   * If multiple devices connected, see the usage
-     `$ python bugreport_app_tester.py --help`.
-   * Warning: the script will delete all the bug reports on the device.
-4. Script might take up to 10 minutes to finish.
+3. Start BugReport app; here is the list of possible ways to start:
+   * Long press HVAC (A/C) icon
+   * Long press Rear Defrost hardware button (hold up to 6 seconds)
+   * Long press notification icon
+   * Open BugReport app from launcher menu or external apps menu; and click Start Bug Report button.
+   * Using adb, see above instructions under `Starting bugreporting`.
+4. Bug report collection might take up to 7 minutes to finish.
    * It might fail to upload bugreport when time/time-zone is invalid.
    * In rare cases it might not upload the bugreport, depending Android's
      task scheduling rules.
-5. Please manually verify the script's results.
+   * You should see progress bar in notification shade.
+5. Pull collected zip files from the device:
+   * `adb pull /data/user/0/com.google.android.car.bugreport/bug_reports_pending/`
 6. Please manually verify bug report contents.
    * Images - the should contain screenshots of all the physical displays.
    * Audio files - they should contain the audio message you recorded.
    * Dumpstate (bugreport) - it should contain logs and other information.
+7. In any case if bugreport app is not properly functioning, please take adb bugreport and share
+   the zip file with developers: `$ adb bugreport`.
+
+NOTE: `utils/bugreport_app_tester.py` is deprecated.
diff --git a/tests/BugReportApp/res/layout/bug_info_view.xml b/tests/BugReportApp/res/layout/bug_info_view.xml
index 3736c00..199b368 100644
--- a/tests/BugReportApp/res/layout/bug_info_view.xml
+++ b/tests/BugReportApp/res/layout/bug_info_view.xml
@@ -26,99 +26,68 @@
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TITLE"
-            android:textColor="@android:color/holo_green_light"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="USER"
-            android:textColor="@android:color/holo_red_dark"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="BUG TIME"
-            android:textColor="@android:color/holo_red_light"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="STATUS"
-            android:textColor="@android:color/holo_orange_light"
-            android:textSize="28sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="OTHER"
-            android:textColor="@android:color/holo_blue_dark"
-            android:textSize="28sp" />
-
-        <Button
-            android:id="@+id/bug_info_upload_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
-            android:textSize="@dimen/bug_report_button_text_size"
-            android:text="@string/bugreport_upload_button_text" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
-        android:orientation="vertical">
-
-        <TextView
             android:id="@+id/bug_info_row_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left"
-            android:textSize="28sp" />
+            android:textColor="@*android:color/car_yellow_500"
+            android:textSize="@dimen/bug_report_default_text_size" />
 
-
-        <TextView
-            android:id="@+id/bug_info_row_user"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="28sp" />
-
-
-        <TextView
-            android:id="@+id/bug_info_row_timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="28sp" />
-
-
-        <TextView
-            android:id="@+id/bug_info_row_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="28sp" />
-
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
+                android:text="@string/bugreport_info_status"
+                android:textSize="@dimen/bug_report_default_text_size" />
+            <TextView
+                android:id="@+id/bug_info_row_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/bug_report_default_text_size" />
+        </LinearLayout>
 
         <TextView
             android:id="@+id/bug_info_row_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="28sp" />
+            android:visibility="gone"
+            android:textSize="@dimen/bug_report_default_text_size" />
 
-        <Button
-            android:id="@+id/bug_info_move_button"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
-            android:textSize="@dimen/bug_report_button_text_size"
-            android:text="@string/bugreport_move_button_text" />
-
+            android:orientation="horizontal">
+            <Button
+                android:id="@+id/bug_info_add_audio_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
+                android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
+                android:visibility="gone"
+                android:textSize="@dimen/bug_report_button_text_size"
+                android:text="@string/bugreport_add_audio_button_text" />
+            <Button
+                android:id="@+id/bug_info_upload_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
+                android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
+                android:visibility="gone"
+                android:textSize="@dimen/bug_report_button_text_size"
+                android:text="@string/bugreport_upload_button_text" />
+            <Button
+                android:id="@+id/bug_info_move_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
+                android:visibility="gone"
+                android:textSize="@dimen/bug_report_button_text_size"
+                android:text="@string/bugreport_move_button_text" />
+        </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/tests/BugReportApp/res/layout/bug_report_activity.xml b/tests/BugReportApp/res/layout/bug_report_activity.xml
index d5dce22..888c628 100644
--- a/tests/BugReportApp/res/layout/bug_report_activity.xml
+++ b/tests/BugReportApp/res/layout/bug_report_activity.xml
@@ -16,15 +16,16 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/bugreport_background"
+    android:padding="@dimen/bug_report_padding"
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/submit_bug_report_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/bug_report_padding"
-        android:background="@color/bugreport_background"
         android:visibility="gone"
         android:orientation="vertical">
         <TextView
@@ -34,6 +35,16 @@
             android:textColor="@color/bugreport_text"
             android:gravity="center"
             android:text="@string/bugreport_dialog_title"/>
+        <TextView
+            android:id="@+id/bug_report_add_audio_to_existing"
+            android:layout_marginTop="@dimen/bug_report_voice_recording_margin_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/bugreport_text"
+            android:gravity="center"
+            android:visibility="gone"
+            android:text="@string/bugreport_dialog_add_audio_to_existing"/>
         <com.google.android.car.bugreport.VoiceRecordingView
             android:id="@+id/voice_recording_view"
             android:layout_marginTop="@dimen/bug_report_voice_recording_margin_top"
@@ -65,23 +76,12 @@
             android:layout_marginTop="@dimen/bug_report_button_margin_top"
             android:padding="@dimen/bug_report_secondary_button_padding"
             android:text="@string/bugreport_dialog_cancel"/>
-        <Button
-            android:id="@+id/button_show_bugreports"
-            style="@style/standard_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/bug_report_button_margin_top"
-            android:padding="@dimen/bug_report_small_button_padding"
-            android:visibility="gone"
-            android:text="@string/bugreport_dialog_show_bugreports"/>
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/in_progress_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/bugreport_background"
-        android:padding="@dimen/bug_report_padding"
         android:visibility="gone"
         android:orientation="vertical">
         <TextView
@@ -115,4 +115,14 @@
             android:padding="@dimen/bug_report_secondary_button_padding"
             android:text="@string/bugreport_dialog_close"/>
     </LinearLayout>
+
+    <Button
+        android:id="@+id/button_show_bugreports"
+        style="@style/standard_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/bug_report_button_margin_top"
+        android:padding="@dimen/bug_report_small_button_padding"
+        android:visibility="gone"
+        android:text="@string/bugreport_dialog_show_bugreports"/>
 </LinearLayout>
diff --git a/tests/BugReportApp/res/values-af/strings.xml b/tests/BugReportApp/res/values-af/strings.xml
new file mode 100644
index 0000000..9289688
--- /dev/null
+++ b/tests/BugReportApp/res/values-af/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Foutverslag"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Maak toe"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Begin foutverslag"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Dien in"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Kanselleer"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Laai op"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Stoor"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Wys foutverslae"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Maak toe"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Praat en beskryf die kwessie"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Oudioboodskap vir foutverslag om %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opname is klaar"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"\'n Foutverslag word reeds saamgestel"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"\'n Foutverslag is saamgestel"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Voeg oudio by"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Voeg oudio by en Laai op"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Skuif na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Laai op"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Laai op na GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Gee asseblief toestemmings"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Foutverslag word reeds saamgestel"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Foutverslaggewing het begin"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Foutverslag het misluk"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Kon nie skerm opneem nie"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Stortingstand het misluk"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Foutverslag is aan die gang"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Foutverslag is saamgestel"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Foutverslag se statuskanaal"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-am/strings.xml b/tests/BugReportApp/res/values-am/strings.xml
new file mode 100644
index 0000000..3b7ca5c
--- /dev/null
+++ b/tests/BugReportApp/res/values-am/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"የሳንካ ሪፖርት"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ዝጋ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"የሳንካ ሪፖርትን ጀምር"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ሁኔታ፦"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"አስገባ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ይቅር"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ስቀል"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"አስቀምጥ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"የሳንካ ሪፖርቶችን አሳይ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ዝጋ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ችግሩን ይናገሩ እና ይግለጹ"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ላይ የሳንካ ሪፖርት የኦዲዮ መልእከት"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ቀረጻ አልቋል"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"አንድ የሳንካ ሪፖርት አስቀድሞ በመሰብሰብ ላይ ነው"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"አንድ የሳንካ ሪፖርት ተሰብስቧል"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ኦዲዮ አክል"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ኦዲዮን አክል እና ስቀል"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"ወደ ዩኤስቢ ውሰድ"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ስቀል"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"ወደ GCS ስቀል"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"እባክዎ ፈቃዶችን ይስጡ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"የሳንካ ሪፖርት አስቀድሞ በመሰብሰብ ላይ ነው"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ሳንካን ሪፖርት ማድረግ ስራ ጀምሯል"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"የሳንካ ሪፖርት አልተሳካም"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ማያ ገጽን ማንሳት አልተሳካም"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"የስህተት ምዝግብ አልተሳካም"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"የሳንካ ሪፖርት በሂደት ላይ ነው"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"የሳንካ ሪፖርት ተሰብስቧል"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"የሳንካ ሪፖርት ሁኔታ ሰርጥ"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ar/strings.xml b/tests/BugReportApp/res/values-ar/strings.xml
new file mode 100644
index 0000000..5362a12
--- /dev/null
+++ b/tests/BugReportApp/res/values-ar/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"تقرير الأخطاء"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"إغلاق"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"بدء إعداد تقرير الأخطاء"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"الحالة:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"إرسال"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"إلغاء"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"تحميل"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"حفظ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"عرض تقارير الأخطاء"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"إغلاق"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"التحدث ووصف المشكلة"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"رسالة صوتية لتقرير الخطأ في %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"انتهى التسجيل."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"جارٍ جمع تقرير أخطاء."</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"تم جمع تقرير أخطاء."</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"إضافة رسالة صوتية"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"إضافة رسالة صوتية والتحميل"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"نقل إلى USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"تحميل"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"تحميل إلى GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"يُرجى منح الأذونات."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"جارٍ جمع تقرير الأخطاء."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"بدأ إجراء تقرير الخطأ."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"تعذّر إعداد تقرير الأخطاء."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"تعذّر الحصول على لقطة شاشة."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"تعذّر نسخ الحالة."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"تقرير الأخطاء قيد التقدّم."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"تم جمع تقرير الأخطاء."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"قناة حالة تقرير الأخطاء"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-as/strings.xml b/tests/BugReportApp/res/values-as/strings.xml
new file mode 100644
index 0000000..80c8eb2
--- /dev/null
+++ b/tests/BugReportApp/res/values-as/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"বাগ ৰিপ’ৰ্ট"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"বন্ধ কৰক"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"বাগ ৰিপ’ৰ্ট আৰম্ভ কৰক"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"স্থিতি:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"দাখিল কৰক"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"বাতিল কৰক"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"আপল’ড কৰক"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"ছেভ কৰক"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"বাগ ৰিপ’ৰ্টসমূহ দেখুৱাওক"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"বন্ধ কৰক"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"কওক আৰু সমস্যাটোৰ বিষয়ে বৰ্ণনা কৰক"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%sত বাগ ৰিপ’ৰ্টৰ বাবে অডিঅ’ বাৰ্তা"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ৰেকৰ্ড কৰা সম্পূৰ্ণ হ’ল"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"এটা বাগ ৰিপ’ৰ্ট ইতিমধ্যে সংগ্ৰহ কৰি থকা হৈছে"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"এটা বাগ ৰিপ’ৰ্ট সংগ্ৰহ কৰা হৈছে"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"অডিঅ’ যোগ কৰক"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"অডিঅ’ যোগ কৰক আৰু আপল’ড কৰক"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBলৈ স্থানান্তৰ কৰক"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"আপল’ড কৰক"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSত আপল’ড কৰক"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"অনুগ্ৰহ কৰি অনুমতি প্ৰদান কৰক"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"বাগ ৰিপ’ৰ্ট ইতিমধ্যে সংগ্ৰহ কৰি থকা হৈছে"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"বাগ ৰিপ’ৰ্ট কৰাটো আৰম্ভ হৈছে"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"বাগ ৰিপ’ৰ্ট বিফল হ’ল"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"স্ক্রীন কেপচাৰ কৰাত বিফল হ’ল"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ডাম্প ষ্টেট বিফল হ’ল"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"বাগ ৰিপ’ৰ্ট প্ৰগতিত আছে"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"বাগ ৰিপ’র্ট সংগ্ৰহ কৰা হৈছে"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"বাগ ৰিপ’ৰ্টৰ স্থিতিৰ চেনেল"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-az/strings.xml b/tests/BugReportApp/res/values-az/strings.xml
new file mode 100644
index 0000000..e8facc9
--- /dev/null
+++ b/tests/BugReportApp/res/values-az/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Baq Hesabatı"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Bağlayın"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Baq hesabatını başladın"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Təqdim edin"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Ləğv edin"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Yükləyin"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Saxlayın"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Baq hesabatlarını göstərin"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Bağlayın"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Danışın &amp; Məsələni təsvir edin"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s radələrində baq raportu üçün Audio mesaj"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Yazma bitdi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Baq hesabatı hazırda əldə edilir"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Baq hesabatı əldə edilib"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audio əlavə edin"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audio əlavə edin və yükləyin"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB\'yə köçürün"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Yükləyin"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS\'a yükləyin"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"İcazələri təmin edin"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Baq hesabatı hazırda əldə edilir"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Baq raportlaması başladı"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Baq hesabatı alınmadı"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekran çəkilişi alınmadı"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dampinq alınmadı"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Baq hesabatı davam edir"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Baq hesabatı əldə edilib"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Baq hesabatı status kanalı"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-b+sr+Latn/strings.xml b/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..f78771d
--- /dev/null
+++ b/tests/BugReportApp/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Izveštaj o grešci"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zatvori"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pokreni pravljenje izveštaja o grešci"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošalji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Otkaži"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Otpremi"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Sačuvaj"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Prikaži izveštaje o greškama"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zatvori"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Izgovorite i objasnite problem"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio poruka za izveštaj o grešci u %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izveštaj o grešci se već prikuplja"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Prikupljen je izveštaj o grešci"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj audio i otpremi"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premesti na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Otpremi"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Otpremi u GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Dajte dozvole"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izveštaj o grešci se već prikuplja"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pokrenut je izveštaj o grešci"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Pravljenje izveštaja o grešci nije uspelo"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje ekrana nije uspelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Snimanje stanja nije uspelo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"U toku je pravljenje izveštaja o grešci"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izveštaj o grešci je prikupljen"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal statusa izveštaja o grešci"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-be/strings.xml b/tests/BugReportApp/res/values-be/strings.xml
new file mode 100644
index 0000000..ab6639f
--- /dev/null
+++ b/tests/BugReportApp/res/values-be/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Справаздача пра памылкі"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Закрыць"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Запусціць справаздачу пра памылкі"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Стан:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Пацвердзіць"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Скасаваць"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Запампаваць"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Захаваць"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Паказаць справаздачы пра памылкі"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Закрыць"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Апісанне праблемы"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Галасавое паведамленне для справаздачы пра памылкі ў %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запіс скончаны"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Справаздача пра памылкі ўжо складаецца"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Справаздача пра памылкі складзена"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Дадаць аўдыя"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Дадаць аўдыя і запампаваць"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Перамясціць на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Запампаваць"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Запампаваць у GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Дайце дазволы"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Справаздача пра памылкі ўжо складаецца"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Запушчана справаздача пра памылкі"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Не ўдалося стварыць справаздачу пра памылкі"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не ўдалося зрабіць здымак экрана"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Не ўдалося стварыць дамп стану"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Справаздача пра памылкі апрацоўваецца"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Справаздача пра памылкі складзена"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал стану справаздачы пра памылкі"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-bg/strings.xml b/tests/BugReportApp/res/values-bg/strings.xml
new file mode 100644
index 0000000..720c2d6
--- /dev/null
+++ b/tests/BugReportApp/res/values-bg/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Сигнал за програмна грешка"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Затваряне"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Създаване на сигнал за програмна грешка"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Състояние:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Изпращане"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Отказ"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Качване"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Запазване"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Показване на сигналите за програмна грешка"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Затваряне"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Използвайте гласа си, за да опишете проблема"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудиосъобщение за сигнала за програмна грешка в %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Записването завърши"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Създаването на сигнал за програмна грешка вече е в ход"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Създаден бе сигнал за програмна грешка"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Добавяне на аудио"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Добавяне на аудио и качване"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Преместване към USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Качване"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Качване в GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Моля, предоставете разрешения"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Създаването на сигнал за програмна грешка вече е в ход"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Подаването на сигнал за програмна грешка започна"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Създаването на сигнал за програмна грешка не бе успешно"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Заснемането на екрана не бе успешно"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Създаването на моментна снимка на състоянието не бе успешно"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Създава се сигнал за програмна грешка"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Сигналът за програмна грешка е създаден"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал за състоянието на сигнала за програмна грешка"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-bn/strings.xml b/tests/BugReportApp/res/values-bn/strings.xml
new file mode 100644
index 0000000..e458f0d
--- /dev/null
+++ b/tests/BugReportApp/res/values-bn/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"সমস্যার বিষয়ে রিপোর্ট"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"বন্ধ করুন"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"সমস্যার বিষয়ে রিপোর্ট শুরু করুন"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"স্ট্যাটাস:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"জমা দিন"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"বাতিল করুন"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"আপলোড করুন"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"সেভ করুন"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"সমস্যার বিষয়ে রিপোর্ট দেখুন"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"বন্ধ করুন"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"কথা বলুন এবং সমস্যার বিষয়ে বিবরণ দিন"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"সমস্যার বিষয়ে রিপোর্ট করার জন্য %s-এ অডিও মেসেজ করুন"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"রেকর্ড করা হয়ে গেছে"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ইতিমধ্যে একটি সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হচ্ছে"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হয়েছে"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"অডিও মেসেজ যোগ করুন"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"অডিও যোগ করুন এবং আপলোড করুন"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-এ সরান"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"আপলোড করুন"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-এ আপলোড করুন"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"অনুমতির অনুমোদন দিন"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"সমস্যার বিষয়ে রিপোর্ট ইতিমধ্যে সংগ্রহ করা হচ্ছে"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"সমস্যার বিষয়ে রিপোর্ট করা শুরু করুন"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"সমস্যার বিষয়ে রিপোর্ট করা যায়নি"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"স্ক্রিন ক্যাপচার করা যায়নি"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ডাম্পের স্ট্যাটাস লোড করা যায়নি"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"সমস্যার বিষয়ে রিপোর্ট প্রগ্রেসে রয়েছে"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"সমস্যার বিষয়ে রিপোর্ট সংগ্রহ করা হয়"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"সমস্যার বিষয়ে রিপোর্টের স্ট্যাটাসের চ্যানেল"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-bs/strings.xml b/tests/BugReportApp/res/values-bs/strings.xml
new file mode 100644
index 0000000..640be50
--- /dev/null
+++ b/tests/BugReportApp/res/values-bs/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Izvještaj o greškama"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zatvori"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pokreni kreiranje izvještaja o greškama"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošalji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Otkaži"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Otpremi"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Sačuvaj"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Prikaži izvještaje o greškama"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zatvori"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite i opišite problem"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Zvučna poruka za izvještaj o grešci u %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izvještaj o greškama se već prikuplja"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Prikupljen je izvještaj o greškama"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj zvučnu poruku"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj zvučnu poruku i otpremi"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premjesti na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Otpremi"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Otpremi na GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Dajte odobrenja"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izvještaj o greškama se već prikuplja"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Započeto je izvještavanje o grešci"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Kreiranje izvještaja o greškama nije uspjelo"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje ekrana nije uspjelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Odbacivanje stanja nije uspjelo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Kreiranje izvještaja o greškama je u toku"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izvještaj o greškama je prikupljen"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Status kanala izvještaja o greškama"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ca/strings.xml b/tests/BugReportApp/res/values-ca/strings.xml
new file mode 100644
index 0000000..4b47edd
--- /dev/null
+++ b/tests/BugReportApp/res/values-ca/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe d\'errors"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Tanca"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Inicia l\'informe d\'errors"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estat:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Envia"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel·la"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Penja"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Desa"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostra l\'informe d\'errors"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Tanca"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Enuncia i descriu el problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Missatge d\'àudio de l\'informe d\'errors a les %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ha finalitzat la gravació"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ja s\'està recollint un informe d\'errors"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"S\'ha recollit un informe d\'errors"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Afegeix àudio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Afegeix àudio i penja"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mou a l\'USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Penja"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Penja a GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concedeix permisos"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ja s\'està recollint l\'informe d\'errors"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"S\'ha iniciat l\'informe d\'errors"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ha fallat l\'informe d\'errors"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No s\'ha pogut capturar la pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ha fallat l\'estat d\'abocament"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"L\'informe d\'errors està en curs"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"S\'ha recollit l\'informe d\'errors"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de l\'estat de l\'informe d\'errors"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-cs/strings.xml b/tests/BugReportApp/res/values-cs/strings.xml
new file mode 100644
index 0000000..96d7f9b
--- /dev/null
+++ b/tests/BugReportApp/res/values-cs/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Zpráva o chybě"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zavřít"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Vytvořit zprávu o chybě"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stav:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Odeslat"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Zrušit"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Nahrát"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Uložit"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Zobrazit zprávy o chybě"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zavřít"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Popište problém nahlas"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Hlasová zpráva pro hlášení o chybě v %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Nahrávání dokončeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Zaznamenávání zprávy o chybě již probíhá"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Zpráva o chybě byla zaznamenána"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Přidat zvuk"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Přidat zvuk a nahrát"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Přesunout na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Nahrát"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Nahrát do GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Udělte prosím oprávnění"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Zaznamenávání zprávy o chybě již probíhá"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Nahlašování chyby bylo zahájeno"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Vytvoření zprávy o chybě se nezdařilo"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snímek obrazovky se nezdařil"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Vypsání stavu se nezdařilo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Probíhá vytváření zprávy o chybě"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Zpráva o chybě je zaznamenána"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanál stavu zprávy o chybě"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-da/strings.xml b/tests/BugReportApp/res/values-da/strings.xml
new file mode 100644
index 0000000..c7bc37e
--- /dev/null
+++ b/tests/BugReportApp/res/values-da/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Fejlrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Luk"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start fejlrapporten"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Send"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuller"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Gem"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Vis fejlrapporter"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Luk"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Tal og beskriv problemet"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Lydbesked for fejlrapport kl. %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Registreringen er afsluttet"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Der indsamles allerede en fejlrapport"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Der er blevet indsamlet en fejlrapport"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Tilføj lyd"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Tilføj lyd og upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Flyt til USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload til GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Giv tilladelser"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Der indsamles allerede fejlrapport"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Fejlrapportering er i gang"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Fejlrapporten blev ikke oprettet"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot mislykkedes"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump-tilstand mislykkedes"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Fejlrapporten er under udformning"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Fejlrapporten er indsamlet"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Statuskanal for fejlrapporten"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-de/strings.xml b/tests/BugReportApp/res/values-de/strings.xml
new file mode 100644
index 0000000..b19c720
--- /dev/null
+++ b/tests/BugReportApp/res/values-de/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Fehlerbericht"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Schließen"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Fehlerbericht starten"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Senden"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Abbrechen"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Hochladen"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Speichern"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Fehlerberichte zeigen"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Schließen"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Erkläre das Problem"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audionachricht für Fehlerbericht bei %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Aufnahme abgeschlossen"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ein Fehlerbericht wird bereits erstellt"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Ein Fehlerbericht wurde erstellt"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audionachricht hinzufügen"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audionachricht hinzufügen &amp; hochladen"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Zu USB wechseln"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Hochladen"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Auf GSC hochladen"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Erteile Berechtigungen"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Fehlerbericht wird bereits erstellt"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Fehlerbericht wird gestartet"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Fehlerbericht fehlgeschlagen"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Fehler bei der Aufnahme des Screenshots"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Fehler beim Erstellen des Dump-Status"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Der Fehlerbericht ist in Bearbeitung"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Fehlerbericht wird erstellt"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal für den Fehlerbericht-Status"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-el/strings.xml b/tests/BugReportApp/res/values-el/strings.xml
new file mode 100644
index 0000000..2a31225
--- /dev/null
+++ b/tests/BugReportApp/res/values-el/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Αναφορά σφάλματος"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Κλείσιμο"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Έναρξη αναφοράς σφάλματος"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Κατάσταση:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Υποβολή"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Ακύρωση"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Μεταφόρτωση"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Αποθήκευση"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Εμφάνιση αναφορών σφαλμάτων"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Κλείσιμο"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Εκφωνήστε το πρόβλημα που αντιμετωπίζετε."</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ηχητικό μήνυμα για αναφορά σφάλματος στις %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Η εγγραφή ολοκληρώθηκε."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Γίνεται ήδη λήψη μιας αναφοράς σφάλματος."</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Έγινε λήψη μιας αναφοράς σφάλματος."</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Προσθήκη ήχου"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Προσθήκη ήχου και μεταφόρτωση"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Μετακίνηση σε USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Μεταφόρτωση"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Μεταφόρτωση στο GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Παραχωρήστε άδειες"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Γίνεται ήδη λήψη αναφοράς σφάλματος."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Η αναφορά σφαλμάτων ξεκίνησε"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Η αναφορά σφάλματος απέτυχε."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Η καταγραφή οθόνης απέτυχε."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Η κατάσταση απόρριψης απέτυχε."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Η αναφορά σφάλματος είναι σε εξέλιξη."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Γίνεται λήψη αναφοράς σφάλματος."</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Κανάλι κατάστασης αναφοράς σφάλματος"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-en-rAU/strings.xml b/tests/BugReportApp/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..1c8a539
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rAU/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Save"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-en-rCA/strings.xml b/tests/BugReportApp/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..1c8a539
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rCA/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Save"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-en-rGB/strings.xml b/tests/BugReportApp/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..1c8a539
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rGB/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Save"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-en-rIN/strings.xml b/tests/BugReportApp/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..1c8a539
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rIN/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bug report"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Close"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start bug report"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Submit"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancel"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Save"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Show bug reports"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Close"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Speak and describe the issue"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message for bug report at %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Recording finished"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"A bug report is already being collected"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A bug report has been collected"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Add audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Add audio and upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Move to USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload to GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Please grant permissions"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bug report already being collected"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bug reporting is started"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bug report failed"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screen capture failed"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state failed"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bug report is in progress"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bug report is collected"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Bug report status channel"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-en-rXC/strings.xml b/tests/BugReportApp/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..e9715bb
--- /dev/null
+++ b/tests/BugReportApp/res/values-en-rXC/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎Bug Report‎‏‎‎‏‎"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎Close‎‏‎‎‏‎"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎Start Bug Report‎‏‎‎‏‎"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎Status:‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎Submit‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎Upload‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎Save‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎Show Bug Reports‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎Close‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎Speak &amp; Describe The Issue‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎Audio message for bug report at %s‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Recording finished‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎A bug report is already being collected‎‏‎‎‏‎"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎A bug report has been collected‎‏‎‎‏‎"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎Add Audio‎‏‎‎‏‎"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎Add Audio &amp; Upload‎‏‎‎‏‎"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎Move to USB‎‏‎‎‏‎"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎Upload‎‏‎‎‏‎"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎Upload to GCS‎‏‎‎‏‎"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎Please grant permissions‎‏‎‎‏‎"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎Bug report already being collected‎‏‎‎‏‎"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎Bug reporting is started‎‏‎‎‏‎"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎Bug report failed‎‏‎‎‏‎"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎Screen capture failed‎‏‎‎‏‎"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎Dump state failed‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎Bug report is in progress‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎Bug report is collected‎‏‎‎‏‎"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎Bug report status channel‎‏‎‎‏‎"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-es-rUS/strings.xml b/tests/BugReportApp/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..a972508
--- /dev/null
+++ b/tests/BugReportApp/res/values-es-rUS/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe de errores"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Cerrar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar informe de errores"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Subir"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Guardar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar informes de errores"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Cerrar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Habla y describe el problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensaje de audio sobre el informe de errores de la(s) %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Finalizó la grabación"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ya se está recopilando un informe de errores"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Se recopiló un informe de errores"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Agregar audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Agregar audio y subir"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover al USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Subir"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Subir a GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Otorga los permisos correspondientes"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ya se está recopilando el informe de errores"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Se inició el informe de errores"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"No se pudo generar el informe de errores"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No se pudo tomar la captura de pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Se produjo un error con el estado de volcado"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"El informe de errores está en progreso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se recopiló el informe de errores"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de estado del informe de errores"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-es/strings.xml b/tests/BugReportApp/res/values-es/strings.xml
new file mode 100644
index 0000000..a9ae8ba
--- /dev/null
+++ b/tests/BugReportApp/res/values-es/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe de errores"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Cerrar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar informe de errores"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Subir"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Guardar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar informes de errores"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Cerrar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Habla y describe el problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensaje de audio para el informe de errores de %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Grabación terminada"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ya se está recopilando un informe de errores"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Se ha recopilado un informe de errores"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Añadir audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Añadir audio y subir"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover al USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Subir"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Subir a GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concede permisos"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ya se está recopilando el informe de errores"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Se ha iniciado el informe de errores"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"No se ha podido crear el informe de errores"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"No se ha podido hacer la captura de pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"No se ha podido obtener el estado de volcado"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"El informe de errores está en curso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se ha recopilado el informe de errores"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de estado de informes de errores"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-et/strings.xml b/tests/BugReportApp/res/values-et/strings.xml
new file mode 100644
index 0000000..ef06e9e0
--- /dev/null
+++ b/tests/BugReportApp/res/values-et/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Veaaruanne"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Sule"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Alusta veaaruande jäädvustamist"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Olek:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Esita"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Tühista"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Laadi üles"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Salvesta"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Kuva veaaruanded"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Sule"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kõnelege ja kirjeldage probleemi"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Helisõnum veaaruande kohta: %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Salvestamine lõpetati"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Veaaruannet juba jäädvustatakse"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Jäädvustati veaaruanne"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Lisa heli"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Lisa heli ja laadi üles"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Teisalda USB-le"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Laadi üles"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Laadi üles teenusesse GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Andke load"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Veaaruannet juba jäädvustatakse"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Veaaruande loomist alustati"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Veaaruande jäädvustamine ebaõnnestus"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekraanikuva jäädvustamine ebaõnnestus"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Mälutõmmise olek: ebaõnnestus"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Veaaruande jäädvustamine on pooleli"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Veaaruanne on jäädvustatud"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Veaaruande oleku kanal"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-eu/strings.xml b/tests/BugReportApp/res/values-eu/strings.xml
new file mode 100644
index 0000000..81fa7df
--- /dev/null
+++ b/tests/BugReportApp/res/values-eu/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Akatsen txostena"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Itxi"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Sortu akatsen txostena"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Egoera:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Bidali"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Utzi"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Kargatu"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Gorde"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Erakutsi akatsen txostenak"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Itxi"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Azaldu arazoa ozen"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Akatsen txostenerako audio-mezua (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Amaitu da grabatzen"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Dagoeneko bildu da akatsen txosten bat"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Bildu da akatsen txosten bat"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Gehitu audioa"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Gehitu eta kargatu audioa"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Eraman USBra"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Kargatu"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Kargatu Google-ren hodeiko biltegira"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Eman baimenak"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Dagoeneko bildu da akatsen txostena"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Hasi da akatsen txostena sortzen"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ezin izan da sortu akatsen txostena"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ezin izan da egin pantaila-argazkia"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ezin izan da irauli egoera"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Akatsen txostena sortzen"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bildu da akatsen txostena"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Akatsen txostenaren egoeraren kanala"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-fa/strings.xml b/tests/BugReportApp/res/values-fa/strings.xml
new file mode 100644
index 0000000..c4926c9
--- /dev/null
+++ b/tests/BugReportApp/res/values-fa/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"گزارش اشکال"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"بستن"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"شروع گزارش اشکال"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"وضعیت:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ارسال"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"لغو"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"بارگذاری"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"ذخیره"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"نمایش گزارش‌های اشکال"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"بستن"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"بیان و توضیح مشکل"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"پیام صوتی برای گزارش اشکال در %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ضبط تمام شد"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"گزارش اشکالی از قبل جمع‌آوری شده است"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"گزارش اشکالی جمع‌آوری شد"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"افزودن صدا"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"افزودن صدا و بارگذاری"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"انتقال به USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"بارگذاری"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"بارگذاری در GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"لطفاً اجازه اعطا کنید"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"گزارش اشکال از قبل جمع‌آوری شده است"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"گزارش اشکال شروع شد"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"گزارش اشکال انجام نشد"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ضبط صفحه انجام نشد"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"وضعیت کپی نشد"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"گزارش اشکال درحال انجام است"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"گزارش اشکال جمع‌آوری شده است"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"کانال وضعیت گزارش اشکال"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-fi/strings.xml b/tests/BugReportApp/res/values-fi/strings.xml
new file mode 100644
index 0000000..cd46aed
--- /dev/null
+++ b/tests/BugReportApp/res/values-fi/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Virheraportti"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Sulje"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Aloita virheraportti"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Tila:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Lähetä"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Peruuta"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Lataa"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Tallenna"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Näytä virheraportit"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Sulje"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kuvaile ongelmaa puhumalla"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ääniviesti virheraportin kohdassa %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Tallennus lopetettu"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Virheraporttia kerätään jo"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Virheraportti on kerätty"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Lisää ääniviesti"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Lisää ääniviesti ja lataa"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Vaihda USB:hen"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Lataa"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Lataa GCS:ään"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Myönnä käyttöluvat"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Virheraporttia kerätään jo"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Virheraportointi aloitettu"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Virheraportti ei onnistunut"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Kuvakaappaus ei onnistunut"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Vedoksen tilavirhe"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Virheraporttia luodaan"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Virheraportti kerätty"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Virheraportin tilakanava"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-fr-rCA/strings.xml b/tests/BugReportApp/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..4da30e2
--- /dev/null
+++ b/tests/BugReportApp/res/values-fr-rCA/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Rapport de bogue"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fermer"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Lancer le rapport de bogue"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"État :"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Envoyer"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuler"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Téléverser"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Enregistrer"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Afficher les rapports de bogue"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fermer"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parler et décrire le problème"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Message audio pour le rapport de bogue à %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Enregistrement terminé"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Un rapport de bogue est déjà en cours de récupération"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Un rapport de bogue a été récupéré"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ajouter un message audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ajouter un message audio et téléverser"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Déplacer vers USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Téléverser"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Téléverser sur GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Veuillez accorder les autorisations"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Rapport de bogue déjà en cours de récupération"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"La création d\'un rapport de bogue est commencée"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Échec du rapport de bogue"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Échec de la capture d\'écran"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Échec de l\'état de la capture"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Le rapport de bogue est en cours de création"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Récupération du rapport de bogue en cours…"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Chaîne d\'état du rapport de bogue"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-fr/strings.xml b/tests/BugReportApp/res/values-fr/strings.xml
new file mode 100644
index 0000000..35b1cb7
--- /dev/null
+++ b/tests/BugReportApp/res/values-fr/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Rapport de bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fermer"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Lancer le rapport de bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"État :"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Envoyer"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuler"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Importer"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Enregistrer"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Afficher les rapports de bugs"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fermer"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parler et décrire le problème"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Message audio pour le rapport de bug à %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Enregistrement terminé"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Un rapport de bug est déjà en cours de création"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Un rapport de bug a été créé"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ajouter un message audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ajouter un message audio et l\'importer"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Déplacer le contenu vers USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Importer"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Importer sur GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Veuillez accorder les autorisations"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Un rapport de bug est déjà en cours de création"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"La création d\'un rapport de bug a commencé"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Échec du rapport de bug"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Échec de la capture d\'écran"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Échec de l\'état de la copie"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Le rapport de bug est en cours de création"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Le rapport de bug a été créé"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Chaîne d\'état du rapport de bug"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-gl/strings.xml b/tests/BugReportApp/res/values-gl/strings.xml
new file mode 100644
index 0000000..81001af
--- /dev/null
+++ b/tests/BugReportApp/res/values-gl/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Informe de erros"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Pechar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar informe de erros"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Cargar"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Gardar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar informes de erros"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Pechar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fala e describe o problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensaxe de audio para o informe de erro (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"A gravación rematou"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Xa se está recompilando un informe de erros"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Recompilouse un informe de erros"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Engadir audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Engadir audio e cargar"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover ao USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Cargar"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Cargar en GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concede permisos"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Recompilando xa un informe de erros"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Iniciouse o informe de erro"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Produciuse un erro no informe de erros"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Produciuse un erro ao capturar a pantalla"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Produciuse un erro no estado do baleirado"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O informe de erros está en curso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Recompilouse o informe de erros"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canle de estado do informe de erros"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-gu/strings.xml b/tests/BugReportApp/res/values-gu/strings.xml
new file mode 100644
index 0000000..fc8c085
--- /dev/null
+++ b/tests/BugReportApp/res/values-gu/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ખામીની જાણકારી"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"બંધ કરો"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ખામીની જાણકારી શરૂ કરો"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"સ્ટેટસ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"સબમિટ કરો"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"રદ કરો"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"અપલોડ કરો"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"સાચવો"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ખામીની જાણકારી બતાવો"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"બંધ કરો"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"સમસ્યા જણાવો અને વર્ણન કરો"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s વાગ્યે ખામીની જાણકારી માટેનો ઑડિયો સંદેશ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"રેકૉર્ડ કરવાનું સમાપ્ત થયું"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ખામીની જાણકારી પહેલેથી એકત્રિત કરવામાં આવી રહી છે"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ખામીની જાણકારી એકત્રિત કરવામાં આવી છે"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ઑડિયો ઉમેરો"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ઑડિયો ઉમેરો અને અપલોડ કરો"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBમાં ખસેડો"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"અપલોડ કરો"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS પર અપલોડ કરો"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"કૃપા કરીને પરવાનાગીઓ આપો"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ખામીની જાણકારી પહેલેથી એકત્રિત કરેલી છે"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ખામીની જાણકારી આપવાની સુવિધા શરૂ કરી છે"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ખામીની જાણકારી નિષ્ફળ થઈ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"સ્ક્રીન કૅપ્ચર કરવું નિષ્ફળ થયું"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ડમ્પ સ્ટેટ નિષ્ફળ થયું"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ખામીની જાણકારીની પ્રક્રિયા ચાલુ છે"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ખામીની જાણકારી એકત્રિત કરેલી છે"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ખામીની જાણકારી સ્ટેટસ ચૅનલ"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-hi/strings.xml b/tests/BugReportApp/res/values-hi/strings.xml
new file mode 100644
index 0000000..ca999e7
--- /dev/null
+++ b/tests/BugReportApp/res/values-hi/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"गड़बड़ी की रिपोर्ट"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"बंद करें"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"गड़बड़ी की रिपोर्ट बनाना शुरू करें"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"स्थिति:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"सबमिट करें"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"रद्द करें"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"अपलोड करें"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"सेव करें"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"गड़बड़ी की रिपोर्ट दिखाएं"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"बंद करें"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलें और समस्या बताएं"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"गड़बड़ी की रिपोर्ट का ऑडियो मैसेज इस %s पर उपलब्ध है"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रिकॉर्डिंग पूरी हुई"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"गड़बड़ी की रिपोर्ट इकट्ठा की जा रही है"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"गड़बड़ी की रिपोर्ट इकट्ठा की गई"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ऑडियो मैसेज जोड़ें"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ऑडियो मैसेज जोड़ें और अपलोड करें"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"यूएसबी का इस्तेमाल करें"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"अपलोड करें"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS (जीसीएस) पर अपलोड करें"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया अनुमति दें"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"गड़बड़ी की रिपोर्ट इकट्ठा की जा रही है"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"गड़बड़ी की रिपोर्ट मिलने की सुविधा उपलब्ध है"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"गड़बड़ी की रिपोर्ट नहीं बन पाई"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रीन कैप्चर नहीं की जा सकी"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप की स्थिति लोड नहीं की जा सकी"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"गड़बड़ी की रिपोर्ट बनाई जा रही है"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"गड़बड़ी की रिपोर्ट इकट्ठा की गई"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"गड़बड़ी की रिपोर्ट की स्थिति का चैनल"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-hr/strings.xml b/tests/BugReportApp/res/values-hr/strings.xml
new file mode 100644
index 0000000..bccb44a
--- /dev/null
+++ b/tests/BugReportApp/res/values-hr/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Izvješće o programskoj pogrešci"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zatvori"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pokreni izvješće o programskoj pogrešci"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošalji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Odustani"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Prijenos"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Spremi"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Prikaz izvješća o programskoj pogrešci"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zatvori"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite i opišite poteškoću"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audioporuka za izvješće o programskoj pogrešci u %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snimanje je završeno"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Izvješće o programskoj pogrešci već se izrađuje"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Izrađeno je izvješće o programskoj pogrešci"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj zvuk"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj zvuk i prenesi"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premjesti na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Prijenos"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Prenesi na GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Odobrite dopuštenja"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Izvješće o programskoj pogrešci već se izrađuje"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Započelo je izvješćivanje o programskoj pogrešci"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Izrada izvješća o programskoj pogrešci nije uspjela"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Snimanje zaslona nije uspjelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Snimanje stanja nije uspjelo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"U tijeku je izrada izvješća o programskoj pogrešci"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Izvješće o programskoj pogrešci je izrađeno"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal statusa izvješća o programskoj pogrešci"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-hu/strings.xml b/tests/BugReportApp/res/values-hu/strings.xml
new file mode 100644
index 0000000..5e6ca67
--- /dev/null
+++ b/tests/BugReportApp/res/values-hu/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Hibajelentés"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Bezárás"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Hibajelentés indítása"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Állapot:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Küldés"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Mégse"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Feltöltés"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Mentés"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Hibajelentések megjelenítése"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Bezárás"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Beszéljen, és írja le a problémát"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Hangüzenet hozzáadása a hibajelentéshez (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Felvétel befejezve"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Már folyamatban van a hibajelentés begyűjtése"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"A rendszerbe hibajelentés érkezett"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Hang hozzáadása"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Hang hozzáadása és feltöltés"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Áthelyezés USB-re"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Feltöltés"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Feltöltés ide: GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Adja meg az engedélyeket"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Már folyamatban van a hibajelentés begyűjtése"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"A hibajelentés elkezdődött"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Sikertelen hibajelentés"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nem sikerült a képernyő rögzítése"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Kiírás állapota sikertelen"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"A hibajelentés folyamatban van"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Hibajelentés begyűjtve"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Hibajelentés állapotcsatornája"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-hy/strings.xml b/tests/BugReportApp/res/values-hy/strings.xml
new file mode 100644
index 0000000..5ed63f9
--- /dev/null
+++ b/tests/BugReportApp/res/values-hy/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Հաղորդում վրիպակի մասին"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Փակել"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Գործարկել վրիպակի մասին զեկույցը"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Կարգավիճակը՝"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Ուղարկել"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Չեղարկել"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Վերբեռնել"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Պահել"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Ցույց տալ վրիպակի մասին զեկույցները"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Փակել"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Բարձրաձայն նկարագրեք սխալը"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Վրիպակների մասին հաղորդման վերաբերյալ ձայնային հաղորդագրություն, ժամը՝ %s։"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Գրանցումն ավարտվեց"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Վրիպակների մասին զեկույցն արդեն բեռնվում է"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Սխալի մասին զեկույցը բեռնվել է"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ավելացնել աուդիո"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ավելացնել աուդիո և վերբեռնել"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Տեղափոխել USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Վերբեռնել"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Վերբեռնել GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Տրամադրեք թույլտվություններ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Վրիպակների մասին զեկույցն արդեն բեռնվել է"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Վրիպակների մասին հաղորդումը սկսված է"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Վրիպակի զեկույցի հետ կապված սխալ առաջացավ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Չհաջողվեց ստեղծել սքրինշոթ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Գրանցման կարգավիճակի սխալ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Վրիպակի մասին զեկույցը բեռնվում է"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Վրիպակի մասին զեկույցը բեռնվել է"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Վրիպակի մասին զեկույցի կարգավիճակի ալիք"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-in/strings.xml b/tests/BugReportApp/res/values-in/strings.xml
new file mode 100644
index 0000000..60a3af1
--- /dev/null
+++ b/tests/BugReportApp/res/values-in/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Laporan Bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Tutup"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Mulai Laporan Bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Kirim"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Batal"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Simpan"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Tampilkan Laporan Bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Tutup"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Ungkapkan &amp; Jelaskan Masalah"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Pesan audio untuk laporan bug pada %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Perekaman selesai"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Satu laporan bug siap dikumpulkan"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Satu laporan bug telah dikumpulkan"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Tambah Audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Tambah Audio &amp; Upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Pindahkan ke USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Upload ke GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Harap beri izin"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Laporan bug siap dikumpulkan"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pelaporan bug dimulai"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Laporan bug gagal"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot gagal"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Status dump gagal"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Laporan bug sedang berlangsung"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Laporan bug dikumpulkan"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Saluran status laporan bug"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-is/strings.xml b/tests/BugReportApp/res/values-is/strings.xml
new file mode 100644
index 0000000..b383518
--- /dev/null
+++ b/tests/BugReportApp/res/values-is/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Villutilkynning"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Loka"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Skrá villutilkynningu"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Staða:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Senda inn"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Hætta við"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Hlaða inn"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Vista"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Sýna villutilkynningar"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Loka"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Talaðu og lýstu vandamálinu"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Hljóðskilaboð villutilkynningar kl. %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Skráningu lokið"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Þegar er verið að skrá villutilkynningu"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Villutilkynning var skráð"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Bæta við hljóði"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Bæta við hljóði og hlaða inn"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Færa á USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Hlaða inn"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Hlaða inn á GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Veittu heimildir"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Villutilkynning hefur þegar verið skráð"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Byrjað að tilkynna villu"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ekki tókst að útbúa villutilkynningu"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skjámyndataka mistókst"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ekki tókst sækja stöðu"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Verið er að útbúa villutilkynningu"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Villutilkynning skráð"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Stöðurás villutilkynninga"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-it/strings.xml b/tests/BugReportApp/res/values-it/strings.xml
new file mode 100644
index 0000000..3fdff3d
--- /dev/null
+++ b/tests/BugReportApp/res/values-it/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Segnalazione di bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Chiudi"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Avvia BugReport"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stato:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Invia"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annulla"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Carica"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Salva"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostra segnalazioni di bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Chiudi"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Parla e descrivi il problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Messaggio audio per segnalazione di bug alle %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Registrazione terminata"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"È già in corso la raccolta di una segnalazione di bug"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"È stata raccolta una segnalazione di bug"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Aggiungi audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Aggiungi audio e carica"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Sposta su USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Carica"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Carica su GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Concedi le autorizzazioni"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Raccolta della segnalazione di bug già in corso"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Segnalazione di bug avviata"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Segnalazione di bug non riuscita"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Acquisizione schermata non riuscita"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump dello stato non riuscito"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Segnalazione di bug in corso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Segnalazione di bug raccolta"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canale stato segnalazione di bug"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-iw/strings.xml b/tests/BugReportApp/res/values-iw/strings.xml
new file mode 100644
index 0000000..956cc5e
--- /dev/null
+++ b/tests/BugReportApp/res/values-iw/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"דוח על באג"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"סגירה"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"התחלה של דוח על באג"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"סטטוס:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"שליחה"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ביטול"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"העלאה"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"שמירה"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"להצגת דוחות על באגים"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"סגירה"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"דיבור ותיאור של הבעיה"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"הודעת האודיו בנושא הדוח על באג ב-%s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ההקלטה הסתיימה"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"כבר מתבצע איסוף של דוח על באג"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"נאסף דוח על באג"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"הוספת אודיו"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"הוספת אודיו והעלאה"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"העברה אל USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"העלאה"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"העלאה אל GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"יש להעניק הרשאות"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"כבר מתבצע איסוף של דוח על באג"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"תהליך הדיווח על באג החל"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"נכשל דוח על באג"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"צילום מסך נכשל"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"נכשל מצב Dump"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"דוח על באג נמצא בתהליך"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"מתבצע איסוף של דוח על באג"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ערוץ סטטוס של דוח על באג"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ja/strings.xml b/tests/BugReportApp/res/values-ja/strings.xml
new file mode 100644
index 0000000..6635bf3
--- /dev/null
+++ b/tests/BugReportApp/res/values-ja/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"バグレポート"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"閉じる"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"バグレポートの収集を開始"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ステータス:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"送信"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"キャンセル"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"アップロード"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"保存"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"バグレポートを表示"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"閉じる"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"問題の説明"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"バグレポート（%s）の音声メッセージ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"録画を終了しました"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"バグレポートの収集はすでに開始しています"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"バグレポートを収集しました"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"音声を追加"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"音声を追加してアップロード"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB へ移動"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"アップロード"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS にアップロード"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"権限を付与してください"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"バグレポートの収集はすでに開始しています"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"バグレポートを開始しました"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"バグレポートを収集できませんでした"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"画面をキャプチャできませんでした"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ステータスをダンプできませんでした"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"バグレポートを収集しています"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"バグレポートを収集しました"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"バグレポート ステータス チャンネル"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ka/strings.xml b/tests/BugReportApp/res/values-ka/strings.xml
new file mode 100644
index 0000000..7fdadb5
--- /dev/null
+++ b/tests/BugReportApp/res/values-ka/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"სისტემის ხარვეზის ანგარიში"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"დახურვა"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"სისტემის ხარვეზის ანგარიშის მომზადების დაწყება"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"სტატუსი:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"გაგზავნა"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"გაუქმება"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ატვირთვა"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"შენახვა"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"სისტემის ხარვეზის ანგარიშების ჩვენება"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"დახურვა"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ისაუბრეთ და აღწერეთ პრობლემა"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"სისტემის ხარვეზის ანგარიშის აუდიო შეტყობინება %s-ზე"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ჩაწერა დასრულდა"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"სისტემის ხარვეზის ანგარიში უკვე მზადდება"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"სისტემის ხარვეზის ანგარიში მომზადდა"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"აუდიოს დამატება"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"აუდიოს დამატება და ატვირთვა"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-ზე გადატანა"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ატვირთვა"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-ზე ატვირთვა"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"გთხოვთ მისცეთ უფლებები"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"სისტემის ხარვეზის ანგარიში უკვე მომზადდა"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"სისტემის ხარვეზის ანგარიშის გაგზავნა დაიწყო"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"სისტემის ხარვეზის ანგარიში ვერ მომზადდა"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ეკრანის აღბეჭდვა ვერ მოხერხდა"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ჩაწერის მდგომარეობა შეფერხდა"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"მიმდინარეობს სისტემის ხარვეზის ანგარიშის მომზადება"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"სისტემის ხარვეზის ანგარიში მომზადებულია"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"სისტემის ხარვეზის ანგარიშის სტატუსის არხი"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-kk/strings.xml b/tests/BugReportApp/res/values-kk/strings.xml
new file mode 100644
index 0000000..a4b67a6
--- /dev/null
+++ b/tests/BugReportApp/res/values-kk/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Қате туралы есеп"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Жабу"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Қате туралы есеп алуды бастау"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Күйі:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Жіберу"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Бас тарту"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Жүктеп салу"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Сақтау"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Қате туралы есептерді көрсету"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Жабу"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Қатені ауызша сипаттап беріңіз"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Қате туралы есептің аудиохабары (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Жазу аяқталды."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Қате туралы есеп әлдеқашан алынып жатыр"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Қате туралы есеп алынды"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Аудиохабар енгізу"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Аудиохабар енгізу және жүктеп салу"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-ге көшіру"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Жүктеп салу"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS серверіне жүктеп салу"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Рұқсаттар беріңіз."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Қате туралы есеп әлдеқашан алынып жатыр."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Қате туралы есеп жүктелуде"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Қате туралы есеп алынбады."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Скриншот түсірілмеді."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Дамп күйі алынбады."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Қате туралы есеп алынуда"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Қате туралы есеп алынды"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Қате туралы есеп арнасы"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-km/strings.xml b/tests/BugReportApp/res/values-km/strings.xml
new file mode 100644
index 0000000..2d86e9c
--- /dev/null
+++ b/tests/BugReportApp/res/values-km/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"បិទ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ចាប់ផ្ដើម​របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ស្ថានភាព៖"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ដាក់​បញ្ជូន"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"បោះបង់"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"បង្ហោះ"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"រក្សាទុក"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"បង្ហាញ​របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"បិទ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"និយាយ និង​រៀបរាប់​អំពី​បញ្ហា"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"សារជាសំឡេង​សម្រាប់របាយការណ៍​អំពីបញ្ហានៅម៉ោង %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"បាន​បញ្ចប់​ការថត​ហើយ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ស្រាប់ហើយ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"បានប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ហើយ"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"បញ្ចូល​សំឡេង"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"បញ្ចូល​សំឡេង និងបង្ហោះ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"ផ្លាស់​ទី​ទៅ USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"បង្ហោះ"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"បង្ហោះ​ទៅ GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"សូម​ផ្ដល់​ការ​អនុញ្ញាត"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​ស្រាប់ហើយ"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ការរាយការណ៍​អំពីបញ្ហាត្រូវ​បានចាប់ផ្ដើម"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"មិនអាច​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា​បានទេ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"មិន​អាច​ថត​អេក្រង់​បានទេ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"មិនអាច​ប្រមូល​ស្ថិតិ​បានទេ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"កំពុង​ប្រមូល​របាយការណ៍​អំពី​បញ្ហា"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"របាយការណ៍​អំពី​បញ្ហា​ត្រូវបាន​ប្រមូល"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"បណ្ដាញ​ស្ថានភាព​នៃ​របាយការណ៍​អំពី​បញ្ហា"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-kn/strings.xml b/tests/BugReportApp/res/values-kn/strings.xml
new file mode 100644
index 0000000..e39f88f
--- /dev/null
+++ b/tests/BugReportApp/res/values-kn/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ತಾಂತ್ರಿಕ ದೋಷ ವರದಿ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ಮುಚ್ಚಿರಿ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ಸ್ಥಿತಿ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ಸಲ್ಲಿಸಿ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"ಉಳಿಸಿ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ಬಗ್ ವರದಿಗಳನ್ನು ತೋರಿಸಿ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ಮುಚ್ಚಿರಿ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ಸಮಸ್ಯೆಯ ಕುರಿತು ಮಾತನಾಡಿ ಮತ್ತು ವಿವರಿಸಿ"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ನಲ್ಲಿ ಬಗ್ ವರದಿ ಮಾಡುವಿಕೆಗಾಗಿ ಆಡಿಯೊ ಸಂದೇಶ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ರೆಕಾರ್ಡಿಂಗ್ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ಬಗ್ ವರದಿಯನ್ನು ಈಗಾಗಲೇ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ಆಡಿಯೊವನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ಆಡಿಯೊವನ್ನು ಸೇರಿಸಿ ಮತ್ತು ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB ಗೆ ಸರಿಸಿ"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS ಗೆ ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ಅನುಮತಿಗಳನ್ನು ನೀಡಿ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ಬಗ್ ವರದಿಯನ್ನು ಈಗಾಗಲೇ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ಬಗ್ ವರದಿ ಮಾಡುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ಸ್ಕ್ರೀನ್ ಕ್ಯಾಪ್ಚರ್ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ಡಂಪ್ ಸ್ಥಿತಿ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿದೆ"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ಬಗ್ ವರದಿಯನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ಬಗ್ ವರದಿಮಾಡುವಿಕೆ ಸ್ಥಿತಿ ಚಾನಲ್"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ko/strings.xml b/tests/BugReportApp/res/values-ko/strings.xml
new file mode 100644
index 0000000..64d4bb7
--- /dev/null
+++ b/tests/BugReportApp/res/values-ko/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"버그 신고"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"닫기"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"버그 신고 시작"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"상태:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"제출"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"취소"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"업로드"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"저장"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"버그 보고서 표시"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"닫기"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"문제 말하기 및 설명하기"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"버그 신고용 음성 메시지가 %s에 등록되었습니다."</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"녹음 완료"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"이미 버그 신고를 수집하는 중"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"버그 신고가 수집됨"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"오디오 추가"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"오디오 추가 및 업로드"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB로 이동"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"업로드"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS로 업로드"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"권한을 부여해 주세요."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"이미 버그 신고를 수집하는 중입니다."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"버그 신고를 시작했습니다."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"버그 신고 실패"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"화면 캡처에 실패했습니다."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"dumpstate에 실패했습니다."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"버그 신고가 진행 중입니다."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"버그 신고가 수집됨"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"버그 신고 상태 채널"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ky/strings.xml b/tests/BugReportApp/res/values-ky/strings.xml
new file mode 100644
index 0000000..6ef7370
--- /dev/null
+++ b/tests/BugReportApp/res/values-ky/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Мүчүлүштүк тууралуу кабар берүү"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Жабуу"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Мүчүлүштүк тууралуу кабарды берип баштоо"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Абалы:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Тапшыруу"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Жокко чыгаруу"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Жүктөп берүү"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Сактоо"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Мүчүлүштүк тууралуу кабарларды көрсөтүү"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Жабуу"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Маселени сүрөттөп бериңиз"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Саат %s мүчүлүштүк тууралуу кабардын аудио билдирүүсү"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Жаздырылып бүттү"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Мүчүлүштүк тууралуу кабар алынган"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Мүчүлүштүк тууралуу кабар алынды"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Аудио билдирүү кошуу"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Аудио билдирүү кошуп, жүктөп берүү"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB\'ге жылдыруу"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Жүктөп берүү"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS\'ке жүктөп берүү"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Уруксаттарды бериңиз"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Мүчүлүштүк тууралуу кабар алынган"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Мүчүлүштүк тууралуу кабар берилип баштады"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Мүчүлүштүк тууралуу кабар берилген жок"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Экран тартылып алынган жок"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Абал тууралуу маалымат алынган жок"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Мүчүлүштүк тууралуу кабар даярдалууда"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Мүчүлүштүк тууралуу кабар алынды"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Мүчүлүштүк тууралуу кабар берүү абалынын каналы"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-lo/strings.xml b/tests/BugReportApp/res/values-lo/strings.xml
new file mode 100644
index 0000000..362a4aa
--- /dev/null
+++ b/tests/BugReportApp/res/values-lo/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ລາຍງານບັນຫາ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ປິດ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ເລີີ່ມລາຍງານບັນຫາ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ສະຖານະ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ສົ່ງຂໍ້ມູນ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ຍົກເລີກ"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ອັບໂຫລດ"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"ບັນທຶກ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ສະແດງລາຍງານບັນຫາ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ປິດ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ເວົ້າ ແລະ ອະທິບາຍບັນຫາ"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"ຂໍ້ຄວາມສຽງສຳລັບລາຍງານບັນຫາເມື່ອ %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ສຳເລັດການບັນທຶກແລ້ວ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ກຳລັງເກັບກຳລາຍງານບັນຫາ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ເພີ່ມສຽງ"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ເພີ່ມສຽງ ແລະ ອັບໂຫຼດ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"ຍ້າຍໄປໃສ່ USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ອັບໂຫລດ"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"ອັບໂຫຼດໃສ່ GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ກະລຸນາໃຫ້ການອະນຸຍາດ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ເລີ່ມການລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ລາຍງານບັນຫາບໍ່ສຳເລັດ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ບັນທຶກພາບໜ້າຈໍບໍ່ສຳເລັດ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ດຳສະເຕດບໍ່ສຳເລັດ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ລາຍງານບັນຫາພວມດຳເນີນຢູ່"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ເກັບກຳລາຍງານບັນຫາແລ້ວ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ຊ່ອງທາງຂອງສະຖານະລາຍງານບັນຫາ"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-lt/strings.xml b/tests/BugReportApp/res/values-lt/strings.xml
new file mode 100644
index 0000000..12ee21f
--- /dev/null
+++ b/tests/BugReportApp/res/values-lt/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Pranešimas apie riktą"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Uždaryti"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Pradėti pranešimą apie riktą"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Būsena:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pateikti"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Atšaukti"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Įkelti"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Išsaugoti"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Rodyti pranešimus apie riktus"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Uždaryti"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Kalbėkite ir apibūdinkite problemą"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Garso pranešimas apie riktą: %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Įrašymas baigtas"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Pranešimas apie riktą jau gaunamas"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Gautas pranešimas apie riktą"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Pridėti garso įrašą"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Pridėti garso įrašą ir įkelti"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Perkelti į USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Įkelti"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Įkelti į GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Suteikite leidimus"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Pranešimas apie riktą jau gaunamas"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pranešimo apie riktą procesas pradėtas"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Nepavyko gauti pranešimo apie riktą"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nepavyko užfiksuoti ekrano"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nepavyko pateikti atminties išklotinės"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Pranešimas apie riktą vykdomas"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Pranešimas apie riktą gautas"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Pranešimo apie riktą kanalas"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-lv/strings.xml b/tests/BugReportApp/res/values-lv/strings.xml
new file mode 100644
index 0000000..509c297
--- /dev/null
+++ b/tests/BugReportApp/res/values-lv/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Kļūdas pārskats"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Aizvērt"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Sākt kļūdu pārskata izveidi"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Statuss:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Iesniegt"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Atcelt"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Augšupielādēt"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Saglabāt"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Rādīt kļūdu pārskatus"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Aizvērt"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Runājiet un raksturojiet problēmu"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio ziņojums kļūdas pārskatam (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ierakstīšana pabeigta"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Kļūdas pārskats jau tiek iegūts"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Kļūdas pārskats ir iegūts"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Pievienot audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Pievienot audio un augšupielādēt"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Pārvietot uz USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Augšupielādēt"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Augšupielādēt GCS krātuvē"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Lūdzu, piešķiriet atļaujas"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Kļūdas pārskats jau tiek iegūts."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Sākta kļūdas pārskata izveide."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Neizdevās izveidot kļūdas pārskatu."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Neizdevās veikt ekrānuzņēmumu."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Neizdevās iegūt sistēmas datus un statusu."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Kļūdas pārskats tiek veidots."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Kļūdas pārskats ir iegūts"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kļūdas pārskata statusa kanāls"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-mk/strings.xml b/tests/BugReportApp/res/values-mk/strings.xml
new file mode 100644
index 0000000..875c82e
--- /dev/null
+++ b/tests/BugReportApp/res/values-mk/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Извештај за грешка"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Затвори"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Започни извештај за грешка"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Статус:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Испрати"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Откажи"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Прикачи"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Зачувај"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Прикажи извештаи за грешки"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Затвори"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Зборувајте и објаснете го проблемот"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудиопорака за извештај за грешка на %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Снимањето заврши"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Веќе се собира извештај за грешка"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Собран е извештај за грешка"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Додај аудио"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Додај аудио и прикачи"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Премести на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Прикачи"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Прикачи на GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Дајте дозвола"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Веќе се собира извештај за грешка"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Пријавувањето грешка започна"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Извештајот за грешка не успеа"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Снимањето на екранот не успеа"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Состојбата на меморијата не успеа"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Во тек е извештај за грешка"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Извештајот за грешка е собран"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал за статус на извештајот за грешка"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ml/strings.xml b/tests/BugReportApp/res/values-ml/strings.xml
new file mode 100644
index 0000000..f9983cf
--- /dev/null
+++ b/tests/BugReportApp/res/values-ml/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ബഗ് റിപ്പോർട്ട്"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"അടയ്ക്കുക"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ബഗ് റിപ്പോർട്ട് ആരംഭിക്കുക"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"നില:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"സമർപ്പിക്കുക"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"റദ്ദാക്കുക"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"അപ്‌ലോഡ് ചെയ്യുക"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"സംരക്ഷിക്കുക"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ബഗ് റിപ്പോർട്ടുകൾ കാണിക്കുക"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"അടയ്ക്കുക"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"പ്രശ്‌നം പറഞ്ഞ് വിവരിക്കുക"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s-നുള്ള ബഗ് റിപ്പോർട്ടിന്റെ ഓഡിയോ സന്ദേശം"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"റെക്കോർഡ് ചെയ്യൽ പൂർത്തിയായി"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ഒരു ബഗ് റിപ്പോർട്ട് മുമ്പേ ശേഖരിക്കുന്നുണ്ട്"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ഒരു ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചിട്ടുണ്ട്"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ഓഡിയോ ചേർക്കുക"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ഓഡിയോ ചേർത്ത് അപ്‌ലോഡ് ചെയ്യുക"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB-ലേക്ക് നീക്കുക"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"അപ്‌ലോഡ് ചെയ്യുക"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-ലേക്ക് അപ്‌ലോഡ് ചെയ്യുക"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"അനുമതികൾ നൽകുക"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ബഗ് റിപ്പോർട്ട് മുമ്പേ ശേഖരിക്കുന്നുണ്ട്"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ബഗ് റിപ്പോർട്ട് ചെയ്യൽ ആരംഭിച്ചു"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ബഗ് റിപ്പോർട്ട് ചെയ്യാനായില്ല"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"സ്ക്രീനിന്റെ ചിത്രമെടുക്കാനായില്ല"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ഡംപ് സ്റ്റേറ്റ് ചെയ്യാനായില്ല"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ബഗ് റിപ്പോർട്ട് പുരോഗതിയിലാണ്"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ബഗ് റിപ്പോർട്ട് ശേഖരിച്ചു"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ബഗ് റിപ്പോർട്ട് സ്റ്റാറ്റസ് ചാനൽ"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-mn/strings.xml b/tests/BugReportApp/res/values-mn/strings.xml
new file mode 100644
index 0000000..ac58d0a
--- /dev/null
+++ b/tests/BugReportApp/res/values-mn/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Алдааны мэдээ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Хаах"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Алдааны мэдээг эхлүүлэх"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Төлөв:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Илгээх"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Цуцлах"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Байршуулах"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Хадгалах"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Алдааны мэдээг харуулах"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Хаах"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Асуудлыг ярих болон тайлбарлах"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s-н алдааны мэдээний аудио мессеж"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Дуу хурааж дууслаа"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Алдааны мэдээг аль хэдийн цуглуулж байна"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Алдааны мэдээг цуглууллаа"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Аудио нэмэх"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Аудио нэмэх &amp; Байршуулах"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB рүү зөөх"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Байршуулах"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS-д байршуулах"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Зөвшөөрөл олгоно уу"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Алдааны мэдээг аль хэдийн цуглуулж байна"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Алдааны мэдээг эхлүүлсэн"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Алдааны мэдээг цуглуулж чадсангүй"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Дэлгэцийн зургийг авч чадсангүй"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state амжилтгүй боллоо"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Алдааны мэдээг цуглуулж байна"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Алдааны мэдээг цуглуулсан"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Алдааны мэдээний төлөвийн суваг"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-mr/strings.xml b/tests/BugReportApp/res/values-mr/strings.xml
new file mode 100644
index 0000000..50a97e7
--- /dev/null
+++ b/tests/BugReportApp/res/values-mr/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"बग रिपोर्ट"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"बंद करा"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"बग रिपोर्ट तयार करणे सुरू करा"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"स्थिती:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"सबमिट करा"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"रद्द करा"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"अपलोड करा"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"सेव्ह करा"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"बग रिपोर्ट दाखवा"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"बंद करा"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलून समस्येचे वर्णन करा"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"बग रिपोर्टचा ऑडिओ मेसेज %s वाजता आला"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रेकॉर्ड करणे पूर्ण झाले आहे"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"बग रिपोर्ट आधीच गोळा केला गेला आहे"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"बग रिपोर्ट गोळा केला गेला आहे"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ऑडिओ जोडा"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ऑडिओ जोडा आणि अपलोड करा"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB वर हलवत आहे"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"अपलोड करा"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS वर अपलोड करा"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया परवानगी द्या"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट आधीपासून गोळा केला जात आहे"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"बग रिपोर्टिंग सुरू केले आहे"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट तयार करता आला नाही"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रीन कॅप्चर करता आली नाही"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डंप स्थितीवर बदलता आले नाही"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट तयार करणे प्रगतिपथावर आहे"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट गोळा केला"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्ट स्थिती चॅनेल"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ms/strings.xml b/tests/BugReportApp/res/values-ms/strings.xml
new file mode 100644
index 0000000..289b6e5
--- /dev/null
+++ b/tests/BugReportApp/res/values-ms/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Laporan Pepijat"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Tutup"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Mulakan Laporan Pepijat"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Serah"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Batal"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Muat naik"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Simpan"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Tunjukkan Laporan Pepijat"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Tutup"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Sebut &amp; Terangkan Isu Tersebut"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mesej audio untuk pelaporan pepijat pada %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Rakaman selesai"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Laporan pepijat sudah dikumpulkan"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Laporan pepijat telah dikumpulkan"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Tambah Audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Tambah Audio &amp; Muat Naik"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Alihkan ke USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Muat naik"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Muat naik ke GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Sila beri kebenaran"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Laporan pepijat sudah dikumpulkan"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Pelaporan pepijat dimulakan"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Laporan pepijat gagal"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Tangkapan skrin gagal"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Keadaan longgokan gagal"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Laporan pepijat sedang berjalan"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Laporan pepijat dikumpulkan"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Saluran status laporan pepijat"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-my/strings.xml b/tests/BugReportApp/res/values-my/strings.xml
new file mode 100644
index 0000000..08dc4d4
--- /dev/null
+++ b/tests/BugReportApp/res/values-my/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ချွတ်ယွင်းမှု အစီရင်ခံစာ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ပိတ်ရန်"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ချွတ်ယွင်းမှု အစီရင်ခံခြင်းကို စတင်ရန်"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"အခြေအနေ-"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ပေးပို့ရန်"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"မလုပ်တော့"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"အပ်လုဒ်လုပ်ရန်"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"သိမ်းရန်"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ချွတ်ယွင်းမှု အစီရင်ခံချက်များကို ပြရန်"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ပိတ်ရန်"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ပြဿနာကို စကားပြော၍ ဖော်ပြပါ"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ၌ ပြုလုပ်ခဲ့သည့် ချွတ်ယွင်းမှု အစီရင်ခံချက်အတွက် အသံမက်ဆေ့ဂျ်"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"အသံသွင်းပြီးသွားပါပြီ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူနေပါပြီ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူပြီးပါပြီ"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"အသံထည့်ရန်"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"အသံထည့်ပြီး အပ်လုဒ်လုပ်ရန်"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB သို့ ရွှေ့ရန်"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"အပ်လုဒ်လုပ်ရန်"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS သို့ အပ်လုဒ်လုပ်ရန်"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ခွင့်ပြုချက်များ ပေးပါ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူနေပြီး ဖြစ်သည်"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ချွတ်ယွင်းမှု အစီရင်ခံချက်ကို စတင်လိုက်ပါပြီ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ချွတ်ယွင်းမှု အစီရင်ခံ၍မရပါ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"မျက်နှာပြင် ပုံဖမ်း၍ မရပါ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dump state မအောင်မြင်ပါ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို ဆောင်ရွက်နေဆဲဖြစ်သည်"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ချွတ်ယွင်းမှု အစီရင်ခံစာကို လက်ခံရယူပြီးပါပြီ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ချွတ်ယွင်းမှု အစီရင်ခံချက် အခြေအနေ ချန်နယ်"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-nb/strings.xml b/tests/BugReportApp/res/values-nb/strings.xml
new file mode 100644
index 0000000..581426d
--- /dev/null
+++ b/tests/BugReportApp/res/values-nb/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Feilrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Lukk"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Start feilrapport"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Send inn"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Avbryt"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Last opp"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Lagre"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Vis feilrapporter"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Lukk"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Les opp og beskriv problemet"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Lydmelding for feilrapporten klokken %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opptaket er fullført"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"En feilrapport blir allerede samlet inn"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"En feilrapport er samlet inn"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Legg til lyd"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Legg til lyd og last opp"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Flytt til USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Last opp"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Last opp til GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Gi tillatelser"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"En feilrapport blir allerede samlet inn"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Rapporteringen av feil er startet"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Feilrapporten mislyktes"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skjermdumpen mislyktes"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dumptilstand mislyktes"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"En feilrapport pågår"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"En feilrapport samles inn"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Statuskanal for feilrapport"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ne/strings.xml b/tests/BugReportApp/res/values-ne/strings.xml
new file mode 100644
index 0000000..997cea1
--- /dev/null
+++ b/tests/BugReportApp/res/values-ne/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"बग रिपोर्ट"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"बन्द गर्नुहोस्"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"बग रिपोर्ट सङ्कलन गर्ने कार्य सुरु गर्नुहोस्"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"स्थिति:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"पेस गर्नुहोस्"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"रद्द गर्नुहोस्"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"अपलोड गर्नुहोस्"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"सुरक्षित गर्नुहोस्"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"बग रिपोर्टहरू देखाउनुहोस्"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"बन्द गर्नुहोस्"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"बोलेर समस्याको वर्णन गर्नुहोस्"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s बजे बग रिपोर्टसम्बन्धी अडियो सन्देश"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"रेकर्ड गर्ने कार्य पूरा भयो"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"एउटा बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"बग रिपोर्ट सङ्कलन गरिएको छ"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"अडियो थप्नुहोस्"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"अडियो थप्नुहोस् तथा अपलोड गर्नुहोस्"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB मा सार्नुहोस्"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"अपलोड गर्नुहोस्"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS मा अपलोड गर्नुहोस्"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"कृपया अनुमति दिनुहोस्"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"बग रिपोर्ट पहिलेदेखि नै सङ्कलन भइरहेको छ"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"बगबारे रिपोर्ट गर्ने कार्य सुरु भयो"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"बग रिपोर्ट सङ्कलन गर्न सकिएन"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"स्क्रिनको तस्बिर खिच्न सकिएन"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"डम्प स्टेटले काम गर्न सकेन"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"बग रिपोर्ट सङ्कलन गर्ने कार्य जारी छ"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"बग रिपोर्ट सङ्कलन गरियो"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"बग रिपोर्टको स्थिति देखाउने च्यानल"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-nl/strings.xml b/tests/BugReportApp/res/values-nl/strings.xml
new file mode 100644
index 0000000..6d378eb
--- /dev/null
+++ b/tests/BugReportApp/res/values-nl/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Bugrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Sluiten"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Bugrapport starten"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Verzenden"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Annuleren"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Uploaden"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Opslaan"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Bugrapporten bekijken"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Sluiten"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Spreek en beschrijf het probleem"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audiobericht voor bugrapportage om %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Opname gestopt"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Er wordt al een bugrapport verzameld"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Er is een bugrapport verzameld"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audio toevoegen"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audio toevoegen en uploaden"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Naar USB verplaatsen"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Uploaden"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Uploaden naar GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Verleen rechten"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Bugrapport wordt al verzameld"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Bugrapportage is gestart"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Bugrapport is mislukt"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Screenshot maken is mislukt"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Dumpstatus mislukt"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Bugrapport wordt uitgevoerd"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Bugrapport wordt verzameld"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanaal voor bugrapportstatus"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-or/strings.xml b/tests/BugReportApp/res/values-or/strings.xml
new file mode 100644
index 0000000..7b90a1b
--- /dev/null
+++ b/tests/BugReportApp/res/values-or/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ବଗ୍ ରିପୋର୍ଟ୍"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ବଗ୍ ରିପୋର୍ଟ୍ ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ସ୍ଥିତି:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ଦାଖଲ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ଅପ୍‌ଲୋଡ୍"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"ସେଭ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ବଗ୍ ରିପୋର୍ଟ୍‍ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ସମସ୍ୟା କୁହନ୍ତୁ ଏବଂ ବ୍ୟାଖ୍ୟା କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%sରେ ବଗ୍ ରିପୋର୍ଟ ପାଇଁ ଅଡିଓ ମେସେଜ୍"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ରେକର୍ଡିଂ ସମାପ୍ତ ହୋଇଛି"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ଏକ ବଗ୍ ରିପୋର୍ଟ ପୂର୍ବରୁ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ଏକ ବଗ୍ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ଅଡିଓ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ଅଡିଓ ଯୋଗ କରନ୍ତୁ ଓ ଅପ୍‌ଲୋଡ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBକୁ ଘୁଞ୍ଚାନ୍ତୁ"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ଅପ୍‌ଲୋଡ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSରେ ଅପ୍‌ଲୋଡ୍ କରନ୍ତୁ"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ଦୟାକରି ଅନୁମତି ଅନୁମୋଦନ କରନ୍ତୁ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ବଗ୍ ରିପୋର୍ଟ ପୂର୍ବରୁ ସଂଗୃହିତ ହୋଇଛି"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ବଗ୍ ରିପୋର୍ଟିଂ ଆରମ୍ଭ ହୋଇଛି"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ବଗ୍ ରିପୋର୍ଟ ବିଫଳ ହୋଇଛି"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ସ୍କ୍ରିନ୍ କ୍ୟାପ୍‍ଚର୍ ବିଫଳ ହୋଇଛି"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ଡମ୍ପ ଷ୍ଟେଟ୍ ବିଫଳ ହୋଇଛି"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ବଗ୍ ରିପୋର୍ଟ ଜାରି ଅଛି"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ବଗ୍ ରିପୋର୍ଟ ସଂଗ୍ରହ କରାଯାଇଛି"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ବଗ୍ ରିପୋର୍ଟ ସ୍ଥିତି ଚ୍ୟାନେଲ୍"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-pa/strings.xml b/tests/BugReportApp/res/values-pa/strings.xml
new file mode 100644
index 0000000..d6cc684
--- /dev/null
+++ b/tests/BugReportApp/res/values-pa/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"ਬੱਗ ਰਿਪੋਰਟ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ਬੰਦ ਕਰੋ"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"ਸਥਿਤੀ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ਸਪੁਰਦ ਕਰੋ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ਰੱਦ ਕਰੋ"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ਅੱਪਲੋਡ ਕਰੋ"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"ਰੱਖਿਅਤ ਕਰੋ"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ਬੱਗ ਰਿਪੋਰਟਾਂ ਦਿਖਾਓ"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ਬੰਦ ਕਰੋ"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ਬੋਲ ਕੇ ਸਮੱਸਿਆ ਦਾ ਵਰਣਨ ਕਰੋ"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s ’ਤੇ ਬੱਗ ਰਿਪੋਰਟ ਲਈ ਆਡੀਓ ਸੁਨੇਹਾ"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ਰਿਕਾਰਡਿੰਗ ਪੂਰੀ ਹੋ ਗਈ"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"ਬੱਗ ਰਿਪੋਰਟ ਪਹਿਲਾਂ ਹੀ ਇਕੱਤਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ਆਡੀਓ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ਆਡੀਓ ਸ਼ਾਮਲ ਕਰਕੇ ਅੱਪਲੋਡ ਕਰੋ"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB ਵਿੱਚ ਲਿਜਾਓ"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"ਅੱਪਲੋਡ ਕਰੋ"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS \'ਤੇ ਅੱਪਲੋਡ ਕਰੋ"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"ਕਿਰਪਾ ਕਰਕੇ ਇਜਾਜ਼ਤਾਂ ਦਿਓ"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"ਬੱਗ ਰਿਪੋਰਟ ਪਹਿਲਾਂ ਹੀ ਇਕੱਤਰ ਕੀਤੀ ਗਈ ਹੈ"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"ਬੱਗ ਦੀ ਰਿਪੋਰਟਿੰਗ ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"ਸਕ੍ਰੀਨ ਨੂੰ ਕੈਪਚਰ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ਡੰਪ ਸਥਿਤੀ ਅਸਫਲ ਰਹੀ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕਰਨਾ ਜਾਰੀ ਹੈ"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"ਬੱਗ ਰਿਪੋਰਟ ਇਕੱਤਰ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਸਥਿਤੀ ਸੰਬੰਧੀ ਚੈਨਲ"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-pl/strings.xml b/tests/BugReportApp/res/values-pl/strings.xml
new file mode 100644
index 0000000..7401e26
--- /dev/null
+++ b/tests/BugReportApp/res/values-pl/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Raport o błędzie"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zamknij"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Rozpocznij zgłaszanie błędu"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stan:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Prześlij"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Anuluj"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Prześlij"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Zapisz"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Pokaż raporty o błędach"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zamknij"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Opowiedz nam o tym problemie"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Wiadomość głosowa dotycząca zgłoszenia błędu z %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ukończono rejestrowanie"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Dane do raportu o błędzie są już zbierane"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Zebrano dane do raportu o błędzie"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj wiadomość głosową"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj wiadomość głosową i prześlij"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Przenieś na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Prześlij"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Prześlij do GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Przyznaj uprawnienia"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Dane do raportu o błędzie są już zbierane"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Rozpoczęło się zgłaszanie błędu"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Nie udało się zgłosić błędu"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nie udało się przechwycić zawartości ekranu"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nie udało się utworzyć zrzutu stanu"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Trwa zgłaszanie błędu"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Dane do raportu o błędzie zostały zebrane"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanał stanu zgłaszania błędu"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-pt-rPT/strings.xml b/tests/BugReportApp/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..db4cae2
--- /dev/null
+++ b/tests/BugReportApp/res/values-pt-rPT/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Relatório de erro"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fechar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar relatório de erro"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Estado:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Carregar"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Guardar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar relatórios de erro"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fechar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fale e descreva o problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensagem de áudio do relatório de erro à(s) %s."</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Gravação concluída."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Já está a ser recolhido um relatório de erro"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Foi recolhido um relatório de erro"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Adicionar áudio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Adicionar áudio e carregar"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover para USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Carregar"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Carregar para o GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Conceda as autorizações."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Já está a ser recolhido um relatório de erro."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"A criação do relatório de erro foi iniciada."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Falha no relatório de erro."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Falha ao efetuar a captura de ecrã."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Falha do estado de captura."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O relatório de erro está em curso."</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"O relatório de erro foi recolhido"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal do estado do relatório de erro"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-pt/strings.xml b/tests/BugReportApp/res/values-pt/strings.xml
new file mode 100644
index 0000000..9018501
--- /dev/null
+++ b/tests/BugReportApp/res/values-pt/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Relatório do bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Fechar"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Iniciar relatório do bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Enviar"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Cancelar"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Fazer upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Salvar"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Mostrar relatórios de bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Fechar"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fale e descreva o problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mensagem de áudio para o relatório do bug às %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Gravação concluída"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Um relatório do bug já está sendo coletado"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Um relatório do bug foi coletado"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Adicionar áudio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Adicionar áudio e fazer upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mover para USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Fazer upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Fazer upload para o GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Conceda permissões"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"O relatório do bug já sendo coletado"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"A geração do relatório do bug foi iniciada"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Falha no relatório do bug"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Falha ao capturar a tela"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Falha no estado de despejo"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"O relatório do bug está em progresso"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"O relatório do bug foi coletado"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canal de status do relatório do bug"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ro/strings.xml b/tests/BugReportApp/res/values-ro/strings.xml
new file mode 100644
index 0000000..d4748bf
--- /dev/null
+++ b/tests/BugReportApp/res/values-ro/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Raport de eroare"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Închideți"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Începeți raportul de eroare"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stare:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Trimiteți"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Anulați"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Încărcați"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Salvați"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Afișați rapoartele de eroare"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Închideți"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Vorbiți și descrieți problema"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mesaj audio pentru raportul de eroare la %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Înregistrarea s-a încheiat"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Se colectează deja un raport de eroare"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"S-a colectat un raport de eroare"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Adăugați conținut audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Adăugați conținut audio și încărcați"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Mutați pe USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Încărcați"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Încărcați în GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Acordați permisiuni"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Se colectează deja raportul de eroare"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"A fost inițiată raportarea erorilor"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Raportul de eroare nu s-a realizat"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Captura de ecran nu a reușit"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nu s-a preluat starea fișierului dump"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Raportul de eroare este în curs"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Se colectează raportul de eroare"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Canalul de stare a raportului de eroare"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ru/strings.xml b/tests/BugReportApp/res/values-ru/strings.xml
new file mode 100644
index 0000000..1da94d1
--- /dev/null
+++ b/tests/BugReportApp/res/values-ru/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Отчет об ошибке"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Закрыть"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Запустить \"Отчет об ошибке\""</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Статус:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Отправить"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Отмена"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Загрузить"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Сохранить"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Посмотреть отчеты об ошибках"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Закрыть"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Опишите ошибку вслух"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудио для отчета об ошибке (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запись завершена."</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Отчет об ошибке уже загружается"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Отчет об ошибке загружен."</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Добавить аудио"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Добавить и загрузить аудио"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Перенести на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Загрузить"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Загрузить в GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Предоставьте разрешения."</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Отчет об ошибке уже загружается."</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Выполняется загрузка отчета об ошибке."</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Произошла ошибка."</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не удалось сделать скриншот."</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Ошибка дампа состояния."</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Отчет об ошибке загружается…"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Отчет об ошибке загружен"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал статуса отчета об ошибке"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-si/strings.xml b/tests/BugReportApp/res/values-si/strings.xml
new file mode 100644
index 0000000..422d99c
--- /dev/null
+++ b/tests/BugReportApp/res/values-si/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"දෝෂ වාර්තාව"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"වසන්න"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"දෝෂ වාර්තාව ආරම්භ කරන්න"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"තත්ත්‍වය:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ඉදිරිපත් කරන්න"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"අවලංගු කරන්න"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"උඩුගත කරන්න"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"සුරකින්න"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"දෝෂ වාර්තා පෙන්වන්න"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"වසන්න"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"ගැටලුව ගැන කථා කර විස්තර කරන්න"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s හිදී දෝෂ වාර්තාව සඳහා ශ්‍රව්‍ය පණිවිඩය"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"පටිගත කිරීම අවසන් විය"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"දෝෂ වාර්තාවක් දැනටමත් එක් කෙරෙමින් පවතියි"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"දෝෂ වාර්තාවක් එකතු කර ඇත"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ශ්‍රව්‍ය එක් කරන්න"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ශ්‍රව්‍ය එක් කර උඩුගත කරන්න"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB වෙත ගෙන යන්න"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"උඩුගත කරන්න"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS වෙත උඩුගත කරන්න"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"අවසර දෙන්න"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"දෝෂ වාර්තාව දැනටමත් එක් කෙරෙමින් පවතියි"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"දෝෂ වාර්තා කිරීම ඇරඹිණි"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"දෝෂ වාර්තාව අසාර්ථකයි"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"තිර ග්‍රහණය අසාර්ථකයි"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"නික්‍ෂේප තත්ත්‍වය අසාර්ථකයි"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"දෝෂ වාර්තාව ප්‍රගතියේ පවතියි"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"දෝෂ වාර්තාව එක් කෙරේ"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"දෝෂ වාර්තා තත්ත්‍ව නාලිකාව"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-sk/strings.xml b/tests/BugReportApp/res/values-sk/strings.xml
new file mode 100644
index 0000000..92cd91b
--- /dev/null
+++ b/tests/BugReportApp/res/values-sk/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Hlásenie chyby"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zavrieť"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Spustiť hlásenie chyby"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stav:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Odoslať"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Zrušiť"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Nahrať"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Uložiť"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Zobraziť hlásenia chyby"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zavrieť"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Hovorte a opíšte problém"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Zvuková správa pre hlásenie chyby o %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Nahrávanie bolo dokončené"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Hlásenie chyby sa už získava"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Bolo prijaté hlásenie chyby"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Pridať zvuk"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Pridať zvuk a nahrať"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Presunúť na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Nahrať"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Nahrať do GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Udeľte povolenia"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Hlásenie chyby už bolo získané"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Hlásenie chyby bolo spustené"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Hlásenie chyby zlyhalo"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Nepodarilo sa vytvoriť snímku obrazovky"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Nepodarilo sa obnoviť stav zo zálohy"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Prebieha hlásenie chyby"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Prebieha získavanie hlásenia chyby"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanál stavu hlásenia chyby"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-sl/strings.xml b/tests/BugReportApp/res/values-sl/strings.xml
new file mode 100644
index 0000000..9192ba8
--- /dev/null
+++ b/tests/BugReportApp/res/values-sl/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Poročilo o napakah"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Zapri"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Začetek ustvarjanja poročila o napakah"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Stanje:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Pošlji"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Prekliči"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Naloži"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Shrani"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Pokaži poročila o napakah"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Zapri"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Govorite in opišite težavo"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Zvočno sporočilo za poročilo o napakah pri %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Snemanje je dokončano"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Poročilo o napakah se že zbira"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Poročilo o napakah je zbrano"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Dodaj zvok"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Dodaj zvok in naloži"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Premakni na USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Naloži"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Naloži v GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Odobrite dovoljenja"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Poročilo o napakah se že zbira"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Poročanje o napakah se je začelo"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Ustvarjanje poročila o napakah ni uspelo"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Zajemanje zaslona ni uspelo"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Izvoz stanja ni uspel"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Poročilo o napakah se ustvarja"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Poročilo o napakah je zbrano"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanala stanja poročila o napakah"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-sq/strings.xml b/tests/BugReportApp/res/values-sq/strings.xml
new file mode 100644
index 0000000..f4bbb8b
--- /dev/null
+++ b/tests/BugReportApp/res/values-sq/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Raporti i defekteve në kod"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Mbyll"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Nis raportin e defekteve në kod"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Statusi:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Dërgo"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Anulo"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Ngarko"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Ruaj"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Shfaq raportet e defekteve në kod"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Mbyll"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Fol dhe përshkruaj problemin"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Mesazh me audio për defektin në kod në %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Regjistrimi përfundoi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Një raport i defekteve në kod po merret tashmë"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Është marrë një raport i defekteve në kod"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Shto audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Shto audio dhe ngarko"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Zhvendos te njësia USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Ngarko"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Ngarko në GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Jep lejet"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Raporti i defekteve në kod është marrë tashmë"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Filloi raportimi për defektin në kod"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Raporti i defekteve në kod dështoi"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Regjistrimi i ekranit dështoi"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Gjendja e mbledhjes dështoi"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Raporti i defekteve në kod është në vazhdim"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Raporti i defekteve në kod u mor"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanali i statusit të raportit të defekteve në kod"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-sr/strings.xml b/tests/BugReportApp/res/values-sr/strings.xml
new file mode 100644
index 0000000..f774637
--- /dev/null
+++ b/tests/BugReportApp/res/values-sr/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Извештај о грешци"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Затвори"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Покрени прављење извештаја о грешци"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Статус:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Пошаљи"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Откажи"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Отпреми"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Сачувај"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Прикажи извештаје о грешкама"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Затвори"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Изговорите и објасните проблем"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудио порука за извештај о грешци у %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Снимање је завршено"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Извештај о грешци се већ прикупља"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Прикупљен је извештај о грешци"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Додај аудио"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Додај аудио и отпреми"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Премести на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Отпреми"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Отпреми у GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Дајте дозволе"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Извештај о грешци се већ прикупља"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Покренут је извештај о грешци"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Прављење извештаја о грешци није успело"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Снимање екрана није успело"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Снимање стања није успело"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"У току је прављење извештаја о грешци"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Извештај о грешци је прикупљен"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал статуса извештаја о грешци"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-sv/strings.xml b/tests/BugReportApp/res/values-sv/strings.xml
new file mode 100644
index 0000000..18b19ef
--- /dev/null
+++ b/tests/BugReportApp/res/values-sv/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Felrapport"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Stäng"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Starta felrapport"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Skicka"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Avbryt"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Ladda upp"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Spara"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Visa felrapporter"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Stäng"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Beskriv problemet genom att prata"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ljudmeddelande till felrapporten klockan %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Inspelningen är slutförd"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"En felrapport samlas redan in"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"En felrapport har samlats in"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Lägg till ljud"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Lägg till ljud och ladda upp"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Flytta till USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Ladda upp"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Ladda upp till GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Bevilja behörigheter"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Felrapporten samlas redan in"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Felrapportering startas"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Felrapporten misslyckades"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skärmdumpen misslyckades"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Statusdumpen misslyckades"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Felrapporten har påbörjats"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Felrapporten samlas in"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kanal för felrapportstatus"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-sw/strings.xml b/tests/BugReportApp/res/values-sw/strings.xml
new file mode 100644
index 0000000..581b9ac
--- /dev/null
+++ b/tests/BugReportApp/res/values-sw/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Ripoti ya Hitilafu"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Funga"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Anza Kuripoti Hitilafu"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Hali:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Tuma"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Ghairi"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Pakia"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Hifadhi"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Onyesha Ripoti za Hitilafu"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Funga"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Zungumza na Ueleze Tatizo"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Ujumbe wa sauti wa ripoti ya hitilafu wa %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Imemaliza kurekodi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Ripoti ya hitilafu tayari inakusanywa"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Ripoti ya hitilafu imekusanywa"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Weka Ujumbe wa Sauti"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Weka Ujumbe wa Sauti na Upakie"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Hamishia kwenye USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Pakia"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Pakia kwenye GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Tafadhali toa ruhusa"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Ripoti ya hitilafu tayari inakusanywa"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Imeanza kuripoti hitilafu"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Imeshindwa kuripoti hitilafu"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Imeshindwa kupiga picha ya skrini"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Imeshindwa kuhamishia data kwingine"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Inaendelea kuripoti hitilafu"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Ripoti ya hitilafu imekusanywa"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kituo cha hali ya ripoti ya hitilafu"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ta/strings.xml b/tests/BugReportApp/res/values-ta/strings.xml
new file mode 100644
index 0000000..b4454c5
--- /dev/null
+++ b/tests/BugReportApp/res/values-ta/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"பிழை அறிக்கை"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"மூடுக"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"பிழை அறிக்கையைத் தொடங்கு"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"நிலை:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"சமர்ப்பி"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ரத்துசெய்"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"பதிவேற்று"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"சேமி"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"பிழை அறிக்கைகளைக் காட்டு"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"மூடுக"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"பேசுங்கள் &amp; சிக்கலை விளக்குங்கள்"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"பிழை அறிக்கைக்கான ஆடியோ மெசெஜ் %sக்கு"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"ரெக்கார்டிங் முடிந்தது"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"பிழை அறிக்கை ஏற்கனவே சேகரிக்கப்பட்டுவிட்டது"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ஆடியோவைச் சேர்"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ஆடியோவைச் சேர்த்து பதிவேற்றவும்"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBக்கு நகர்த்து"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"பதிவேற்று"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSஸுக்குப் பதிவேற்று"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"அனுமதிகளை வழங்குங்கள்"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"பிழை அறிக்கை ஏற்கனவே சேகரிக்கப்பட்டுவிட்டது"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"பிழை அறிக்கை தொடங்கப்பட்டது"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"பிழை அறிக்கை தோல்வி"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"திரையைப் படமெடுக்க முடியவில்லை"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"டம்ப் நிலை தோல்வி"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"பிழை அறிக்கை செயல்பாட்டிலுள்ளது"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"பிழை அறிக்கை சேகரிக்கப்பட்டது"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"பிழை அறிக்கை நிலை தொடர்பான சேனல்"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-te/strings.xml b/tests/BugReportApp/res/values-te/strings.xml
new file mode 100644
index 0000000..7857105
--- /dev/null
+++ b/tests/BugReportApp/res/values-te/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"బగ్ నివేదిక"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"మూసివేయి"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"బగ్ నివేదికను ప్రారంభించండి"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"స్థితి:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"సమర్పించండి"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"రద్దు చేయండి"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"అప్‌లోడ్ చేయి"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"సేవ్ చేయి"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"బగ్ నివేదికలను చూపండి"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"మూసివేయి"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"మాట్లాడండి &amp; సమస్యను వివరించండి"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"బగ్ నివేదిక కోసం %s వద్ద ఆడియో సందేశం"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"రికార్డ్ చేయడం పూర్తయింది"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"బగ్ నివేదిక ఇప్పటికే సేకరించబడుతోంది"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"బగ్ నివేదిక సేకరించబడింది"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"ఆడియోను జోడించు"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"ఆడియోను జోడించు &amp; అప్‌లోడ్ చేయి"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USBకి తరలించు"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"అప్‌లోడ్ చేయండి"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCSకు అప్‌లోడ్ చేయండి"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"దయచేసి అనుమతులను మంజూరు చేయండి"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"బగ్ నివేదిక ఇప్పటికే సేకరించబడుతోంది"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"బగ్‌ను నివేదించడం మొదలైంది"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"బగ్ నివేదిక విఫలమైంది"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"స్క్రీన్ క్యాప్చర్ విఫలమైంది"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"డంప్ స్థితి విఫలమైంది"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"బగ్ నివేదిక ప్రోగ్రెస్‌లో ఉంది"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"బగ్ నివేదిక సేకరించబడింది"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"బగ్ నివేదిక స్థితి ఛానెల్"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-th/strings.xml b/tests/BugReportApp/res/values-th/strings.xml
new file mode 100644
index 0000000..ffbd683
--- /dev/null
+++ b/tests/BugReportApp/res/values-th/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"รายงานข้อบกพร่อง"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"ปิด"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"เริ่มรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"สถานะ:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ส่ง"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ยกเลิก"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"อัปโหลด"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"บันทึก"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"แสดงรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"ปิด"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"พูดอธิบายปัญหา"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"ข้อความเสียงสำหรับรายงานข้อบกพร่องเมื่อ %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"บันทึกเสียงเสร็จแล้ว"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"กำลังรวบรวมรายงานข้อบกพร่อง"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"เพิ่มเสียง"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"เพิ่มเสียงและอัปโหลด"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"เปลี่ยนไปใช้ USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"อัปโหลด"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"อัปโหลดไปยัง GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"โปรดให้สิทธิ์"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"กำลังรวบรวมรายงานข้อบกพร่อง"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"เริ่มการรายงานข้อบกพร่องแล้ว"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"รายงานข้อบกพร่องไม่สำเร็จ"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"จับภาพหน้าจอไม่สำเร็จ"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ดัมพ์สเตทไม่สำเร็จ"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"อยู่ระหว่างรายงานข้อบกพร่อง"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"รวบรวมรายงานข้อบกพร่องแล้ว"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"ช่องทางของสถานะรายงานข้อบกพร่อง"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-tl/strings.xml b/tests/BugReportApp/res/values-tl/strings.xml
new file mode 100644
index 0000000..5e0fe03
--- /dev/null
+++ b/tests/BugReportApp/res/values-tl/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Ulat ng Bug"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Isara"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Simulan ang Ulat ng Bug"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Status:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Isumite"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Kanselahin"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"I-upload"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"I-save"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Ipakita ang Mga Ulat ng Bug"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Isara"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Magsalita at Ilarawan Ang Isyu"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Audio message para sa ulat ng bug noong %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Tapos na ang pag-record"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"May kinukuha nang ulat ng bug"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"May nakuhang ulat ng bug"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Magdagdag ng Audio"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Magdagdag ng Audio at I-upload"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Ilipat sa USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"I-upload"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"I-upload sa GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Pakibigay ang mga pahintulot"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Kinukuha na ang ulat ng bug"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Sinimulan ang pag-uulat ng bug"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Hindi naisagawa ang ulat ng bug"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Hindi na-capture ang screen"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Hindi naisagawa ang dump state"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Isinasagawa ang ulat ng bug"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Nakuha ang ulat ng bug"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Channel ng status ng ulat ng bug"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-tr/strings.xml b/tests/BugReportApp/res/values-tr/strings.xml
new file mode 100644
index 0000000..f6ce461
--- /dev/null
+++ b/tests/BugReportApp/res/values-tr/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Hata Raporu"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Kapat"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Hata Raporunu Başlat"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Durum:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Gönder"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"İptal"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Yükle"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Kaydet"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Hata Raporlarını Göster"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Kapat"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Konuşun ve Sorunu Açıklayın"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s hata raporu için sesli mesaj"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Kayıt tamamlandı"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Şu anda zaten bir hata raporu alınıyor"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Hata raporu alındı"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Ses Ekle"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Ses Ekle ve Yükle"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB\'ye taşı"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Yükle"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS\'ye yükle"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Lütfen izinleri verin"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Hata raporu zaten alınmış"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Hata raporlama işlemi başladı"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Hata raporu başarısız"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ekran görüntüsü alınamadı"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Döküm durumu başarısız"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Hata raporu devam ediyor"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Hata raporu alındı"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Hata raporu durum kanalı"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-uk/strings.xml b/tests/BugReportApp/res/values-uk/strings.xml
new file mode 100644
index 0000000..75f2c45
--- /dev/null
+++ b/tests/BugReportApp/res/values-uk/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Звіт про помилку"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Закрити"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Запустити звіт про помилку"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Стан:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Надіслати"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Скасувати"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Завантажити"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Зберегти"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Показати повідомлення про помилки"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Закрити"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Говоріть і опишіть проблему"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Аудіо для звіту про помилку о %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Запис завершено"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Звіт про помилку вже завантажується"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Звіт про помилку отримано"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Додати аудіоповідомлення"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Додати аудіоповідомлення й завантажити"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Перемістити на USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Завантажити"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Завантажити в GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Надайте дозволи"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Звіт про помилку вже завантажується"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Повідомлення про помилку розпочато"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Не вдалося надіслати звіт про помилку"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Не вдалося зробити знімок екрана"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Помилка запису стану"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Звіт про помилку створюється"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Звіт про помилку отримано"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Канал стану звіту про помилку"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-ur/strings.xml b/tests/BugReportApp/res/values-ur/strings.xml
new file mode 100644
index 0000000..6fe4566
--- /dev/null
+++ b/tests/BugReportApp/res/values-ur/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"بگ رپورٹ"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"بند کریں"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"بگ رپورٹ شروع کریں"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"صورتحال:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"جمع کرائیں"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"منسوخ کریں"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"اپ لوڈ کریں"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"محفوظ کریں"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"بگ رپورٹس دکھائیں"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"بند کریں"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"بولیں اور مسئلہ بیان کریں"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"‎%s پر بگ رپورٹ کے لیے آڈیو پیغام"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"رکارڈنگ مکمل ہو گئی"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"بگ رپورٹ پہلے سے ہی جمع کی جارہی ہے"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"بگ رپورٹ جمع کر لی گئی ہے"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"آڈیو شامل کریں"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"آڈیو شامل اور اپ لوڈ کریں"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB میں منتقل کریں"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"اپ لوڈ کریں"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS پر اپ لوڈ کریں"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"براہ کرم اجازتوں کی منظوری دیں"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"بگ رپورٹ پہلے سے ہی جمع کی جا رہی ہے"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"بگ رپورٹنگ شروع کر دی گئی ہے"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"بگ رپورٹ ناکام ہو گئی"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"اسکرین کیپچر ناکام ہو گیا"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"ڈمپ اسٹیٹ ناکام ہو گیا"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"بگ رپورٹ پیشرفت میں ہے"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"بگ رپورٹ جمع کی گئی ہے"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"بگ رپورٹ کی صورتحال کا چینل"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-uz/strings.xml b/tests/BugReportApp/res/values-uz/strings.xml
new file mode 100644
index 0000000..fd83c14
--- /dev/null
+++ b/tests/BugReportApp/res/values-uz/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Xatoliklar hisoboti"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Yopish"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Xatoliklar hisobotini yuklashni boshlash"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Holati:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Yuborish"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Bekor qilish"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Yuklash"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Saqlash"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Xatoliklar hisobotini koʻrsatish"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Yopish"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Muammoni ovoz yordamida tasvirlang"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Xatolik hisoboti uchun audio xabar (%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Yozib olish tugadi"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Xatoliklar hisoboti jamlangan"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Audio kiritish"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Audio kiritish va yuklash"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"USB qurilmaga olish"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Yuklash"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"GCS serverlariga yuklash"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Ruxsat bering"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Xato haqida hisobot berish boshlandi"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Xatoliklar hisoboti yuborilmadi"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Skrinshot olinmadi"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Damp holatida xatolik"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Xatoliklar hisoboti yuklanmoqda"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Xatoliklar hisoboti yuklandi"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Xatoliklar hisoboti holati kanali"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-vi/strings.xml b/tests/BugReportApp/res/values-vi/strings.xml
new file mode 100644
index 0000000..3831d64
--- /dev/null
+++ b/tests/BugReportApp/res/values-vi/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Báo cáo lỗi"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Đóng"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Bắt đầu báo cáo lỗi"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Trạng thái:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Gửi"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Hủy"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Tải lên"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Lưu"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Hiển thị các báo cáo lỗi"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Đóng"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Hãy nói để mô tả vấn đề"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Thông báo bằng âm thanh cho báo cáo lỗi lúc %s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Đã ghi xong"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Đang thu thập báo cáo lỗi"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Đã thu thập báo cáo lỗi"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Thêm âm thanh"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Thêm âm thanh và tải lên"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Chuyển sang USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Tải lên"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Tải lên GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Vui lòng cấp quyền"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Đang thu thập báo cáo lỗi"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Đã bắt đầu báo cáo lỗi"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Không báo cáo được lỗi"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Không chụp được màn hình"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Không thu thập được nhật ký hệ thống"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Đang báo cáo lỗi"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Đã thu thập báo cáo lỗi"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Kênh trạng thái báo cáo lỗi"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-zh-rCN/strings.xml b/tests/BugReportApp/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..fbf3672
--- /dev/null
+++ b/tests/BugReportApp/res/values-zh-rCN/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"错误报告"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"关闭"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"开始收集错误报告"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"状态："</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"提交"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"取消"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"上传"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"保存"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"显示错误报告"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"关闭"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"读出并说明问题"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"%s的错误报告的语音消息"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"录制完成"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"已在收集错误报告"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"已收集错误报告"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"添加语音消息"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"添加语音消息并上传"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"移至 USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"上传"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"上传到 GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"请授予权限"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"已在收集错误报告"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"错误报告流程已启动"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"无法收集错误报告"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"无法截取屏幕截图"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"无法转储状态"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在收集错误报告"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"已收集错误报告"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"错误报告状态渠道"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-zh-rHK/strings.xml b/tests/BugReportApp/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..e2520c5
--- /dev/null
+++ b/tests/BugReportApp/res/values-zh-rHK/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"錯誤報告"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"關閉"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"開始產生錯誤報告"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"狀態："</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"提交"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"取消"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"上載"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"儲存"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"顯示錯誤報告"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"關閉"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"朗讀和說明問題"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"錯誤報告語音訊息時間為：%s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"已完成記錄"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"已收集錯誤報告"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"已收集到錯誤報告"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"新增語音訊息"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"新增語音訊息並上載"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"移至 USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"上載"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"上載至 GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"請授予權限"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"已收集錯誤報告"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"已開始錯誤報告程序"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"無法產生錯誤報告"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"無法擷取螢幕"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"無法傾印狀態"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在產生錯誤報告"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"已收集錯誤報告"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"錯誤報告狀態頻道"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-zh-rTW/strings.xml b/tests/BugReportApp/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..e940dde
--- /dev/null
+++ b/tests/BugReportApp/res/values-zh-rTW/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"錯誤報告"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"關閉"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"開始收集錯誤報告"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"狀態："</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"提交"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"取消"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"上傳"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"儲存"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"顯示錯誤報告"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"關閉"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"朗讀並說明問題"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"錯誤報告的語音訊息 (時間：%s)"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"錄製結束"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"正在收集錯誤報告"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"錯誤報告收集完畢"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"新增語音訊息"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"新增語音訊息並上傳"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"移至 USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"上傳"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"上傳到 GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"請授予權限"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"正在收集錯誤報告"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"已啟動錯誤回報程序"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"錯誤報告發生問題"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"無法擷取螢幕畫面"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"傾印狀態發生問題"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"正在收集錯誤報告"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"錯誤報告收集完畢"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"錯誤報告狀態頻道"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values-zu/strings.xml b/tests/BugReportApp/res/values-zu/strings.xml
new file mode 100644
index 0000000..6fe7fb3
--- /dev/null
+++ b/tests/BugReportApp/res/values-zu/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="2596316479611335185">"Umbiko wesiphazamisi"</string>
+    <string name="bugreport_info_quit" msgid="5590138890181142473">"Vala"</string>
+    <string name="bugreport_info_start" msgid="667324824650830832">"Qala umbiko wesiphazamisi"</string>
+    <string name="bugreport_info_status" msgid="7211044508792815451">"Isimo:"</string>
+    <string name="bugreport_dialog_submit" msgid="2789636252713280633">"Hambisa"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"Khansela"</string>
+    <string name="bugreport_dialog_upload" msgid="2517386929450370781">"Layisha"</string>
+    <string name="bugreport_dialog_save" msgid="3291363266190644226">"Londoloza"</string>
+    <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"Bonisa imibiko yesiphazamisi"</string>
+    <string name="bugreport_dialog_close" msgid="289925437277364266">"Vala"</string>
+    <string name="bugreport_dialog_title" msgid="3315160684205929910">"Khuluma uphinde uchaze inkinga"</string>
+    <string name="bugreport_dialog_add_audio_to_existing" msgid="4958460267276935700">"Umlayezo womsindo wokubika kwesiphazamiso ku-%s"</string>
+    <string name="bugreport_dialog_recording_finished" msgid="3982335902169398758">"Ukurekhoda kuqediwe"</string>
+    <string name="bugreport_dialog_in_progress_title" msgid="3782308141532622394">"Umbiko wesiphazamisi usuvele ulandiwe"</string>
+    <string name="bugreport_dialog_in_progress_title_finished" msgid="1610236990020413471">"Kuqoqwe umbiko wesiphazamisi"</string>
+    <string name="bugreport_add_audio_button_text" msgid="8606400151705699144">"Engeza umsindo"</string>
+    <string name="bugreport_add_audio_upload_button_text" msgid="3830917832551764694">"Engeza umsindo nokulayisha"</string>
+    <string name="bugreport_move_button_text" msgid="1245698439228323880">"Hambisa ku-USB"</string>
+    <string name="bugreport_upload_button_text" msgid="4136749466634820848">"Layisha"</string>
+    <string name="bugreport_upload_gcs_button_text" msgid="5844929656507607424">"Layisha ku-GCS"</string>
+    <string name="toast_permissions_denied" msgid="7054832711916992770">"Sicela unikeze izimvume"</string>
+    <string name="toast_bug_report_in_progress" msgid="8319601113129121579">"Umbiko wesiphazamisi usuvele uqoqiwe"</string>
+    <string name="toast_bug_report_started" msgid="7154589593986557754">"Ukubikwa kwesiphazamiso kuqalile"</string>
+    <string name="toast_status_failed" msgid="6365384202315043395">"Umbiko wesiphazamisi uhlulekile"</string>
+    <string name="toast_status_screencap_failed" msgid="2187083897594745149">"Ukuthathwa kwesikrini kuhlulekile"</string>
+    <string name="toast_status_dump_state_failed" msgid="8072469535227541761">"Isimo sokulahla sihlulekile"</string>
+    <string name="notification_bugreport_in_progress" msgid="8486454116357963238">"Umbiko wesiphazamisi uyaqhubeka"</string>
+    <string name="notification_bugreport_finished_title" msgid="3970195939909624320">"Umbiko wesiphazamisi uyaqoqwa"</string>
+    <string name="notification_bugreport_channel_name" msgid="776902295433824255">"Isiteshi sesimo sombiko wesiphazamisi"</string>
+</resources>
diff --git a/tests/BugReportApp/res/values/dimens.xml b/tests/BugReportApp/res/values/dimens.xml
index 4a5f270..7f7967f 100644
--- a/tests/BugReportApp/res/values/dimens.xml
+++ b/tests/BugReportApp/res/values/dimens.xml
@@ -19,6 +19,8 @@
     <!-- Margin between edge of BugReportActivity dialog and content -->
     <dimen name="bug_report_padding">30dp</dimen>
 
+    <dimen name="bug_report_default_text_size">28dp</dimen>
+
     <!-- VoiceRecordingView dimensions -->
     <dimen name="bug_report_voice_recording_margin_top">20dp</dimen>
     <dimen name="bug_report_voice_recording_height">40dp</dimen>
@@ -34,4 +36,6 @@
     <!-- ProgressBar dimensions -->
     <dimen name="bug_report_progress_bar_margin_top">32dp</dimen>
 
+    <!-- Horizontal layout children margins. -->
+    <dimen name="bug_report_horizontal_layout_children_margin">12dp</dimen>
 </resources>
diff --git a/tests/BugReportApp/res/values/strings.xml b/tests/BugReportApp/res/values/strings.xml
index bca00fa..b3b125a 100644
--- a/tests/BugReportApp/res/values/strings.xml
+++ b/tests/BugReportApp/res/values/strings.xml
@@ -15,35 +15,43 @@
      limitations under the License.
 -->
 <resources>
-    <string name="app_name" translatable="false">Bug Report</string>
+    <string name="app_name">Bug Report</string>
 
-    <string name="bugreport_info_quit" translatable="false">Close</string>
-    <string name="bugreport_info_start" translatable="false">Start Bug Report</string>
+    <string name="bugreport_info_quit">Close</string>
+    <string name="bugreport_info_start">Start Bug Report</string>
+    <string name="bugreport_info_status">Status:</string>
 
-    <string name="bugreport_dialog_submit" translatable="false">Submit</string>
-    <string name="bugreport_dialog_cancel" translatable="false">Cancel</string>
-    <string name="bugreport_dialog_show_bugreports" translatable="false">Show Bug Reports</string>
-    <string name="bugreport_dialog_close" translatable="false">Close</string>
-    <string name="bugreport_dialog_title" translatable="false">Speak &amp; Describe The Issue</string>
-    <string name="bugreport_dialog_recording_finished" translatable="false">Recording finished</string>
-    <string name="bugreport_dialog_in_progress_title" translatable="false">A bug report is already being collected</string>
-    <string name="bugreport_dialog_in_progress_title_finished" translatable="false">A bug report has been collected</string>
-    <string name="bugreport_move_button_text" translatable="false">Move</string>
-    <string name="bugreport_upload_button_text" translatable="false">Upload</string>
+    <string name="bugreport_dialog_submit">Submit</string>
+    <string name="bugreport_dialog_cancel">Cancel</string>
+    <!-- A button: uploads bugreport with recorded audio message. -->
+    <string name="bugreport_dialog_upload">Upload</string>
+    <!-- A button: saves recorded audio message. -->
+    <string name="bugreport_dialog_save">Save</string>
+    <string name="bugreport_dialog_show_bugreports">Show Bug Reports</string>
+    <string name="bugreport_dialog_close">Close</string>
+    <string name="bugreport_dialog_title">Speak &amp; Describe The Issue</string>
+    <!-- %s is the timestamp of a bugreport. -->
+    <string name="bugreport_dialog_add_audio_to_existing">Audio message for bug report at %s</string>
+    <string name="bugreport_dialog_recording_finished">Recording finished</string>
+    <string name="bugreport_dialog_in_progress_title">A bug report is already being collected</string>
+    <string name="bugreport_dialog_in_progress_title_finished">A bug report has been collected</string>
+    <!-- A button to add audio message to the bugreport. It will show Save button on the dialog. -->
+    <string name="bugreport_add_audio_button_text">Add Audio</string>
+    <!-- A button to add audio message to the bugreport; it will show Upload button on the dialog. -->
+    <string name="bugreport_add_audio_upload_button_text">Add Audio &amp; Upload</string>
+    <string name="bugreport_move_button_text">Move to USB</string>
+    <string name="bugreport_upload_button_text">Upload</string>
+    <string name="bugreport_upload_gcs_button_text">Upload to GCS</string>
 
-    <string name="toast_permissions_denied" translatable="false">Please grant permissions</string>
-    <string name="toast_bug_report_in_progress" translatable="false">Bug report already being collected</string>
-    <string name="toast_timed_out" translatable="false">Timed out, cancelling</string>
-    <string name="toast_status_failed" translatable="false">Bug report failed</string>
-    <string name="toast_status_finished" translatable="false">Bug report finished</string>
-    <string name="toast_status_pending_upload" translatable="false">Bug report ready for upload</string>
-    <string name="toast_status_screencap_failed" translatable="false">Screen capture failed</string>
-    <string name="toast_status_dump_state_failed" translatable="false">Dump state failed</string>
+    <string name="toast_permissions_denied">Please grant permissions</string>
+    <string name="toast_bug_report_in_progress">Bug report already being collected</string>
+    <string name="toast_bug_report_started">Bug reporting is started</string>
+    <string name="toast_status_failed">Bug report failed</string>
+    <string name="toast_status_screencap_failed">Screen capture failed</string>
+    <string name="toast_status_dump_state_failed">Dump state failed</string>
 
     <!-- Notification strings -->
-    <string name="notification_bugreport_in_progress" translatable="false">Bug report is in progress</string>
-    <string name="notification_bugreport_finished_title" translatable="false">Bug report is collected</string>
-    <string name="notification_bugreport_manual_upload_finished_text" translatable="false">Please upload it when the car is parked</string>
-    <string name="notification_bugreport_auto_upload_finished_text" translatable="false">The report will be upload automatically</string>
-    <string name="notification_bugreport_channel_name" translatable="false">Bug report status channel</string>
+    <string name="notification_bugreport_in_progress">Bug report is in progress</string>
+    <string name="notification_bugreport_finished_title">Bug report is collected</string>
+    <string name="notification_bugreport_channel_name">Bug report status channel</string>
 </resources>
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java
index ad2e38f..3d01729 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugInfoAdapter.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.car.bugreport;
 
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,63 +24,77 @@
 
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Shows bugreport title, status, status message and user action buttons. "Upload to Google" button
+ * is enabled when the status is {@link Status#STATUS_PENDING_USER_ACTION}, "Move to USB" button is
+ * enabled only when status is  {@link Status#STATUS_PENDING_USER_ACTION} and USB device is plugged
+ * in.
+ */
 public class BugInfoAdapter extends RecyclerView.Adapter<BugInfoAdapter.BugInfoViewHolder> {
-
     static final int BUTTON_TYPE_UPLOAD = 0;
     static final int BUTTON_TYPE_MOVE = 1;
+    static final int BUTTON_TYPE_ADD_AUDIO = 2;
 
     /** Provides a handler for click events*/
     interface ItemClickedListener {
-        /** onItemClicked handles click events differently depending on provided buttonType and
-         * uses additional information provided in metaBugReport. */
-        void onItemClicked(int buttonType, MetaBugReport metaBugReport);
+        /**
+         * Handles click events differently depending on provided buttonType and
+         * uses additional information provided in metaBugReport.
+         *
+         * @param buttonType One of {@link #BUTTON_TYPE_UPLOAD}, {@link #BUTTON_TYPE_MOVE} or
+         *                   {@link #BUTTON_TYPE_ADD_AUDIO}.
+         * @param metaBugReport Selected bugreport.
+         * @param holder ViewHolder of the clicked item.
+         */
+        void onItemClicked(int buttonType, MetaBugReport metaBugReport, BugInfoViewHolder holder);
     }
 
     /**
      * Reference to each bug report info views.
      */
-    public static class BugInfoViewHolder extends RecyclerView.ViewHolder {
+    static class BugInfoViewHolder extends RecyclerView.ViewHolder {
         /** Title view */
-        public TextView titleView;
-
-        /** User view */
-        public TextView userView;
-
-        /** TimeStamp View */
-        public TextView timestampView;
+        TextView mTitleView;
 
         /** Status View */
-        public TextView statusView;
+        TextView mStatusView;
 
         /** Message View */
-        public TextView messageView;
+        TextView mMessageView;
 
         /** Move Button */
-        public Button moveButton;
+        Button mMoveButton;
 
         /** Upload Button */
-        public Button uploadButton;
+        Button mUploadButton;
+
+        /** Add Audio Button */
+        Button mAddAudioButton;
 
         BugInfoViewHolder(View v) {
             super(v);
-            titleView = itemView.findViewById(R.id.bug_info_row_title);
-            userView = itemView.findViewById(R.id.bug_info_row_user);
-            timestampView = itemView.findViewById(R.id.bug_info_row_timestamp);
-            statusView = itemView.findViewById(R.id.bug_info_row_status);
-            messageView = itemView.findViewById(R.id.bug_info_row_message);
-            moveButton = itemView.findViewById(R.id.bug_info_move_button);
-            uploadButton = itemView.findViewById(R.id.bug_info_upload_button);
+            mTitleView = itemView.findViewById(R.id.bug_info_row_title);
+            mStatusView = itemView.findViewById(R.id.bug_info_row_status);
+            mMessageView = itemView.findViewById(R.id.bug_info_row_message);
+            mMoveButton = itemView.findViewById(R.id.bug_info_move_button);
+            mUploadButton = itemView.findViewById(R.id.bug_info_upload_button);
+            mAddAudioButton = itemView.findViewById(R.id.bug_info_add_audio_button);
         }
     }
 
-    private final List<MetaBugReport> mDataset;
+    private List<MetaBugReport> mDataset;
     private final ItemClickedListener mItemClickedListener;
+    private final Config mConfig;
 
-    BugInfoAdapter(List<MetaBugReport> dataSet, ItemClickedListener itemClickedListener) {
-        mDataset = dataSet;
+    BugInfoAdapter(ItemClickedListener itemClickedListener, Config config) {
         mItemClickedListener = itemClickedListener;
+        mDataset = new ArrayList<>();
+        mConfig = config;
+        // Allow RecyclerView to efficiently update UI; getItemId() is implemented below.
+        setHasStableIds(true);
     }
 
     @Override
@@ -93,22 +108,73 @@
     @Override
     public void onBindViewHolder(BugInfoViewHolder holder, int position) {
         MetaBugReport bugreport = mDataset.get(position);
-        holder.titleView.setText(mDataset.get(position).getTitle());
-        holder.userView.setText(mDataset.get(position).getUsername());
-        holder.timestampView.setText(mDataset.get(position).getTimestamp());
-        holder.statusView.setText(Status.toString(mDataset.get(position).getStatus()));
-        holder.messageView.setText(mDataset.get(position).getStatusMessage());
-        if (bugreport.getStatus() == Status.STATUS_PENDING_USER_ACTION.getValue()
-                || bugreport.getStatus() == Status.STATUS_MOVE_FAILED.getValue()
-                || bugreport.getStatus() == Status.STATUS_UPLOAD_FAILED.getValue()) {
-            holder.moveButton.setOnClickListener(
-                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_MOVE, bugreport));
-            holder.uploadButton.setOnClickListener(
-                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_UPLOAD, bugreport));
+        holder.mTitleView.setText(bugreport.getTitle());
+        holder.mStatusView.setText(Status.toString(bugreport.getStatus()));
+        holder.mMessageView.setText(bugreport.getStatusMessage());
+        if (bugreport.getStatusMessage().isEmpty()) {
+            holder.mMessageView.setVisibility(View.GONE);
         } else {
-            holder.moveButton.setEnabled(false);
-            holder.uploadButton.setEnabled(false);
+            holder.mMessageView.setVisibility(View.VISIBLE);
         }
+        boolean enableUserActionButtons =
+                bugreport.getStatus() == Status.STATUS_PENDING_USER_ACTION.getValue()
+                        || bugreport.getStatus() == Status.STATUS_MOVE_FAILED.getValue()
+                        || bugreport.getStatus() == Status.STATUS_UPLOAD_FAILED.getValue();
+        if (enableUserActionButtons) {
+            holder.mMoveButton.setEnabled(true);
+            holder.mMoveButton.setVisibility(View.VISIBLE);
+            holder.mMoveButton.setOnClickListener(
+                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_MOVE, bugreport,
+                            holder));
+        } else {
+            holder.mMoveButton.setEnabled(false);
+            holder.mMoveButton.setVisibility(View.GONE);
+        }
+        // Enable the upload button only for userdebug/eng builds.
+        if (enableUserActionButtons && Build.IS_DEBUGGABLE) {
+            holder.mUploadButton.setText(R.string.bugreport_upload_gcs_button_text);
+            holder.mUploadButton.setEnabled(true);
+            holder.mUploadButton.setVisibility(View.VISIBLE);
+            holder.mUploadButton.setOnClickListener(
+                    view -> mItemClickedListener.onItemClicked(BUTTON_TYPE_UPLOAD, bugreport,
+                            holder));
+        } else {
+            holder.mUploadButton.setVisibility(View.GONE);
+            holder.mUploadButton.setEnabled(false);
+        }
+        if (bugreport.getStatus() == Status.STATUS_AUDIO_PENDING.getValue()) {
+            if (mConfig.getAutoUpload()) {
+                holder.mAddAudioButton.setText(R.string.bugreport_add_audio_upload_button_text);
+            } else {
+                holder.mAddAudioButton.setText(R.string.bugreport_add_audio_button_text);
+            }
+            holder.mAddAudioButton.setEnabled(true);
+            holder.mAddAudioButton.setVisibility(View.VISIBLE);
+            holder.mAddAudioButton.setOnClickListener(view ->
+                    mItemClickedListener.onItemClicked(BUTTON_TYPE_ADD_AUDIO, bugreport, holder));
+        } else {
+            holder.mAddAudioButton.setEnabled(false);
+            holder.mAddAudioButton.setVisibility(View.GONE);
+        }
+    }
+
+    /** Sets dataSet; it copies the list, because it modifies it in this adapter. */
+    void setDataset(List<MetaBugReport> bugReports) {
+        mDataset = new ArrayList<>(bugReports);
+        notifyDataSetChanged();
+    }
+
+    /** Update a bug report in the data set. */
+    void updateBugReportInDataSet(MetaBugReport bugReport, int position) {
+        if (position != RecyclerView.NO_POSITION) {
+            mDataset.set(position, bugReport);
+            notifyItemChanged(position);
+        }
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mDataset.get(position).getId();
     }
 
     @Override
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
index df48489..20fe5f9 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.car.bugreport;
 
-import static com.google.android.car.bugreport.BugReportService.EXTRA_META_BUG_REPORT;
 import static com.google.android.car.bugreport.BugReportService.MAX_PROGRESS_VALUE;
 
 import android.Manifest;
@@ -25,9 +24,13 @@
 import android.car.drivingstate.CarDrivingStateEvent;
 import android.car.drivingstate.CarDrivingStateManager;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
+import android.media.AudioManager;
 import android.media.MediaRecorder;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -38,14 +41,19 @@
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
+import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.common.base.Preconditions;
+import com.google.common.io.ByteStreams;
+
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Random;
@@ -62,31 +70,55 @@
 public class BugReportActivity extends Activity {
     private static final String TAG = BugReportActivity.class.getSimpleName();
 
+    /** Starts silent (no audio message recording) bugreporting. */
+    private static final String ACTION_START_SILENT =
+            "com.google.android.car.bugreport.action.START_SILENT";
+
+    /** This is deprecated action. Please start SILENT bugreport using {@link BugReportService}. */
+    private static final String ACTION_ADD_AUDIO =
+            "com.google.android.car.bugreport.action.ADD_AUDIO";
+
     private static final int VOICE_MESSAGE_MAX_DURATION_MILLIS = 60 * 1000;
     private static final int AUDIO_PERMISSIONS_REQUEST_ID = 1;
 
-    private static final DateFormat BUG_REPORT_TIMESTAMP_DATE_FORMAT =
-            new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
+    private static final String EXTRA_BUGREPORT_ID = "bugreport-id";
 
+    /**
+     * NOTE: mRecorder related messages are cleared when the activity finishes.
+     */
     private final Handler mHandler = new Handler(Looper.getMainLooper());
 
+    /** Look up string length, e.g. [ABCDEF]. */
+    static final int LOOKUP_STRING_LENGTH = 6;
+
     private TextView mInProgressTitleText;
     private ProgressBar mProgressBar;
     private TextView mProgressText;
+    private TextView mAddAudioText;
     private VoiceRecordingView mVoiceRecordingView;
     private View mVoiceRecordingFinishedView;
     private View mSubmitBugReportLayout;
     private View mInProgressLayout;
     private View mShowBugReportsButton;
+    private Button mSubmitButton;
 
     private boolean mBound;
+    /** Audio message recording process started (including waiting for permission). */
     private boolean mAudioRecordingStarted;
-    private boolean mBugReportServiceStarted;
+    /** Audio recording using MIC is running (permission given). */
+    private boolean mAudioRecordingIsRunning;
+    private boolean mIsNewBugReport;
+    private boolean mIsOnActivityStartedWithBugReportServiceBoundCalled;
+    private boolean mIsSubmitButtonClicked;
     private BugReportService mService;
     private MediaRecorder mRecorder;
     private MetaBugReport mMetaBugReport;
+    private File mAudioFile;
     private Car mCar;
     private CarDrivingStateManager mDrivingStateManager;
+    private AudioManager mAudioManager;
+    private AudioFocusRequest mLastAudioFocusRequest;
+    private Config mConfig;
 
     /** Defines callbacks for service binding, passed to bindService() */
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -95,7 +127,7 @@
             BugReportService.ServiceBinder binder = (BugReportService.ServiceBinder) service;
             mService = binder.getService();
             mBound = true;
-            startAudioMessageRecording();
+            onActivityStartedWithBugReportServiceBound();
         }
 
         @Override
@@ -105,47 +137,24 @@
         }
     };
 
-    private final ServiceConnection mServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            try {
-                mDrivingStateManager = (CarDrivingStateManager) mCar.getCarManager(
-                        Car.CAR_DRIVING_STATE_SERVICE);
-                mDrivingStateManager.registerListener(
-                        BugReportActivity.this::onCarDrivingStateChanged);
-            } catch (CarNotConnectedException e) {
-                Log.w(TAG, "Failed to get CarDrivingStateManager.", e);
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-        }
-    };
+    /**
+     * Builds an intent that starts {@link BugReportActivity} to add audio message to the existing
+     * bug report.
+     */
+    static Intent buildAddAudioIntent(Context context, MetaBugReport bug) {
+        Intent addAudioIntent = new Intent(context, BugReportActivity.class);
+        addAudioIntent.setAction(ACTION_ADD_AUDIO);
+        addAudioIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        addAudioIntent.putExtra(EXTRA_BUGREPORT_ID, bug.getId());
+        return addAudioIntent;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        Preconditions.checkState(Config.isBugReportEnabled(), "BugReport is disabled.");
+
         super.onCreate(savedInstanceState);
-
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.bug_report_activity);
-
-        mInProgressTitleText = findViewById(R.id.in_progress_title_text);
-        mProgressBar = findViewById(R.id.progress_bar);
-        mProgressText = findViewById(R.id.progress_text);
-        mVoiceRecordingView = findViewById(R.id.voice_recording_view);
-        mVoiceRecordingFinishedView = findViewById(R.id.voice_recording_finished_text_view);
-        mSubmitBugReportLayout = findViewById(R.id.submit_bug_report_layout);
-        mInProgressLayout = findViewById(R.id.in_progress_layout);
-        mShowBugReportsButton = findViewById(R.id.button_show_bugreports);
-
-        mShowBugReportsButton.setOnClickListener(this::buttonShowBugReportsClick);
-        findViewById(R.id.button_submit).setOnClickListener(this::buttonSubmitClick);
-        findViewById(R.id.button_cancel).setOnClickListener(this::buttonCancelClick);
-        findViewById(R.id.button_close).setOnClickListener(this::buttonCancelClick);
-
-        mCar = Car.createCar(this, mServiceConnection);
-        mCar.connect();
 
         // Bind to BugReportService.
         Intent intent = new Intent(this, BugReportService.class);
@@ -157,26 +166,36 @@
         super.onStart();
 
         if (mBound) {
-            startAudioMessageRecording();
+            onActivityStartedWithBugReportServiceBound();
         }
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        if (!mBugReportServiceStarted && mAudioRecordingStarted) {
+        // If SUBMIT button is clicked, cancelling audio has been taken care of.
+        if (!mIsSubmitButtonClicked) {
             cancelAudioMessageRecording();
         }
         if (mBound) {
             mService.removeBugReportProgressListener();
         }
+        // Reset variables for the next onStart().
+        mAudioRecordingStarted = false;
+        mAudioRecordingIsRunning = false;
+        mIsSubmitButtonClicked = false;
+        mIsOnActivityStartedWithBugReportServiceBoundCalled = false;
+        mMetaBugReport = null;
+        mAudioFile = null;
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
 
-        mHandler.removeCallbacksAndMessages(null);
+        if (mRecorder != null) {
+            mHandler.removeCallbacksAndMessages(/* token= */ mRecorder);
+        }
         if (mBound) {
             unbindService(mConnection);
             mBound = false;
@@ -188,7 +207,18 @@
     }
 
     private void onCarDrivingStateChanged(CarDrivingStateEvent event) {
-        if (event.eventValue == CarDrivingStateEvent.DRIVING_STATE_PARKED) {
+        if (mShowBugReportsButton == null) {
+            Log.w(TAG, "Cannot handle driving state change, UI is not ready");
+            return;
+        }
+        // When adding audio message to the existing bugreport, do not show "Show Bug Reports"
+        // button, users either should explicitly Submit or Cancel.
+        if (mAudioRecordingStarted && !mIsNewBugReport) {
+            mShowBugReportsButton.setVisibility(View.GONE);
+            return;
+        }
+        if (event.eventValue == CarDrivingStateEvent.DRIVING_STATE_PARKED
+                || event.eventValue == CarDrivingStateEvent.DRIVING_STATE_IDLING) {
             mShowBugReportsButton.setVisibility(View.VISIBLE);
         } else {
             mShowBugReportsButton.setVisibility(View.GONE);
@@ -204,6 +234,64 @@
         }
     }
 
+    private void prepareUi() {
+        if (mSubmitBugReportLayout != null) {
+            return;
+        }
+        setContentView(R.layout.bug_report_activity);
+
+        // Connect to the services here, because they are used only when showing the dialog.
+        // We need to minimize system state change when performing SILENT bug report.
+        mConfig = new Config();
+        mConfig.start();
+        mCar = Car.createCar(this, /* handler= */ null,
+                Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT, this::onCarLifecycleChanged);
+
+        mInProgressTitleText = findViewById(R.id.in_progress_title_text);
+        mProgressBar = findViewById(R.id.progress_bar);
+        mProgressText = findViewById(R.id.progress_text);
+        mAddAudioText = findViewById(R.id.bug_report_add_audio_to_existing);
+        mVoiceRecordingView = findViewById(R.id.voice_recording_view);
+        mVoiceRecordingFinishedView = findViewById(R.id.voice_recording_finished_text_view);
+        mSubmitBugReportLayout = findViewById(R.id.submit_bug_report_layout);
+        mInProgressLayout = findViewById(R.id.in_progress_layout);
+        mShowBugReportsButton = findViewById(R.id.button_show_bugreports);
+        mSubmitButton = findViewById(R.id.button_submit);
+
+        mShowBugReportsButton.setOnClickListener(this::buttonShowBugReportsClick);
+        mSubmitButton.setOnClickListener(this::buttonSubmitClick);
+        findViewById(R.id.button_cancel).setOnClickListener(this::buttonCancelClick);
+        findViewById(R.id.button_close).setOnClickListener(this::buttonCancelClick);
+
+        if (mIsNewBugReport) {
+            mSubmitButton.setText(R.string.bugreport_dialog_submit);
+        } else {
+            mSubmitButton.setText(mConfig.getAutoUpload()
+                    ? R.string.bugreport_dialog_upload : R.string.bugreport_dialog_save);
+        }
+    }
+
+    private void onCarLifecycleChanged(Car car, boolean ready) {
+        if (!ready) {
+            mDrivingStateManager = null;
+            mCar = null;
+            Log.d(TAG, "Car service is not ready, ignoring");
+            // If car service is not ready for this activity, just ignore it - as it's only
+            // used to control UX restrictions.
+            return;
+        }
+        try {
+            mDrivingStateManager = (CarDrivingStateManager) car.getCarManager(
+                    Car.CAR_DRIVING_STATE_SERVICE);
+            mDrivingStateManager.registerListener(
+                    BugReportActivity.this::onCarDrivingStateChanged);
+            // Call onCarDrivingStateChanged(), because it's not called when Car is connected.
+            onCarDrivingStateChanged(mDrivingStateManager.getCurrentCarDrivingState());
+        } catch (CarNotConnectedException e) {
+            Log.w(TAG, "Failed to get CarDrivingStateManager", e);
+        }
+    }
+
     private void showInProgressUi() {
         mSubmitBugReportLayout.setVisibility(View.GONE);
         mInProgressLayout.setVisibility(View.VISIBLE);
@@ -225,7 +313,6 @@
         mShowBugReportsButton.setVisibility(View.GONE);
         if (mDrivingStateManager != null) {
             try {
-                // Call onCarDrivingStateChanged(), because it's not called when Car is connected.
                 onCarDrivingStateChanged(mDrivingStateManager.getCurrentCarDrivingState());
             } catch (CarNotConnectedException e) {
                 Log.e(TAG, "Failed to get current driving state.", e);
@@ -238,28 +325,89 @@
      *
      * <p>This method expected to be called when the activity is started and bound to the service.
      */
-    private void startAudioMessageRecording() {
-        mService.setBugReportProgressListener(this::onProgressChanged);
+    private void onActivityStartedWithBugReportServiceBound() {
+        if (mIsOnActivityStartedWithBugReportServiceBoundCalled) {
+            return;
+        }
+        mIsOnActivityStartedWithBugReportServiceBoundCalled = true;
 
         if (mService.isCollectingBugReport()) {
             Log.i(TAG, "Bug report is already being collected.");
+            mService.setBugReportProgressListener(this::onProgressChanged);
+            prepareUi();
             showInProgressUi();
             return;
         }
 
+        if (ACTION_START_SILENT.equals(getIntent().getAction())) {
+            Log.i(TAG, "Starting a silent bugreport.");
+            MetaBugReport bugReport = createBugReport(this, MetaBugReport.TYPE_SILENT);
+            startBugReportCollection(bugReport);
+            finish();
+            return;
+        }
+
+        // Close the notification shade and other dialogs when showing BugReportActivity dialog.
+        sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+
+        if (ACTION_ADD_AUDIO.equals(getIntent().getAction())) {
+            addAudioToExistingBugReport(
+                    getIntent().getIntExtra(EXTRA_BUGREPORT_ID, /* defaultValue= */ -1));
+            return;
+        }
+
+        Log.i(TAG, "Starting an interactive bugreport.");
+        createNewBugReportWithAudioMessage();
+    }
+
+    private void addAudioToExistingBugReport(int bugreportId) {
+        MetaBugReport bug = BugStorageUtils.findBugReport(this, bugreportId).orElseThrow(
+                () -> new RuntimeException("Failed to find bug report with id " + bugreportId));
+        Log.i(TAG, "Adding audio to the existing bugreport " + bug.getTimestamp());
+        if (bug.getStatus() != Status.STATUS_AUDIO_PENDING.getValue()) {
+            Log.e(TAG, "Failed to add audio, bad status, expected "
+                    + Status.STATUS_AUDIO_PENDING.getValue() + ", got " + bug.getStatus());
+            finish();
+        }
+        File audioFile;
+        try {
+            audioFile = File.createTempFile("audio", "mp3", getCacheDir());
+        } catch (IOException e) {
+            throw new RuntimeException("failed to create temp audio file");
+        }
+        startAudioMessageRecording(/* isNewBugReport= */ false, bug, audioFile);
+    }
+
+    private void createNewBugReportWithAudioMessage() {
+        MetaBugReport bug = createBugReport(this, MetaBugReport.TYPE_INTERACTIVE);
+        startAudioMessageRecording(
+                /* isNewBugReport= */ true,
+                bug,
+                FileUtils.getFileWithSuffix(this, bug.getTimestamp(), "-message.3gp"));
+    }
+
+    /** Shows a dialog UI and starts recording audio message. */
+    private void startAudioMessageRecording(
+            boolean isNewBugReport, MetaBugReport bug, File audioFile) {
         if (mAudioRecordingStarted) {
             Log.i(TAG, "Audio message recording is already started.");
             return;
         }
-
         mAudioRecordingStarted = true;
+        mAudioManager = getSystemService(AudioManager.class);
+        mIsNewBugReport = isNewBugReport;
+        mMetaBugReport = bug;
+        mAudioFile = audioFile;
+        prepareUi();
         showSubmitBugReportUi(/* isRecording= */ true);
-
-        Date initiatedAt = new Date();
-        String timestamp = BUG_REPORT_TIMESTAMP_DATE_FORMAT.format(initiatedAt);
-        String username = getCurrentUserName();
-        String title = BugReportTitleGenerator.generateBugReportTitle(initiatedAt, username);
-        mMetaBugReport = BugStorageUtils.createBugReport(this, title, timestamp, username);
+        if (isNewBugReport) {
+            mAddAudioText.setVisibility(View.GONE);
+        } else {
+            mAddAudioText.setVisibility(View.VISIBLE);
+            mAddAudioText.setText(String.format(
+                    getString(R.string.bugreport_dialog_add_audio_to_existing),
+                    mMetaBugReport.getTimestamp()));
+        }
 
         if (!hasRecordPermissions()) {
             requestRecordPermissions();
@@ -272,15 +420,26 @@
      * Cancels bugreporting by stopping audio recording and deleting temp files.
      */
     private void cancelAudioMessageRecording() {
-        if (!mAudioRecordingStarted) {
+        // If audio recording is not running, most likely there were permission issues,
+        // so leave the bugreport as is without cancelling it.
+        if (!mAudioRecordingIsRunning) {
+            Log.w(TAG, "Cannot cancel, audio recording is not running.");
             return;
         }
         stopAudioRecording();
-        File tempDir = FileUtils.getTempDir(this, mMetaBugReport.getTimestamp());
-        new DeleteDirectoryAsyncTask().execute(tempDir);
-        BugStorageUtils.setBugReportStatus(this, mMetaBugReport, Status.STATUS_USER_CANCELLED, "");
-        Log.i(TAG, "Bug report is cancelled");
+        if (mIsNewBugReport) {
+            // The app creates a temp dir only for new INTERACTIVE bugreports.
+            File tempDir = FileUtils.getTempDir(this, mMetaBugReport.getTimestamp());
+            new DeleteFilesAndDirectoriesAsyncTask().execute(tempDir);
+        } else {
+            BugStorageUtils.deleteBugReportFiles(this, mMetaBugReport.getId());
+            new DeleteFilesAndDirectoriesAsyncTask().execute(mAudioFile);
+        }
+        BugStorageUtils.setBugReportStatus(
+                this, mMetaBugReport, Status.STATUS_USER_CANCELLED, "");
+        Log.i(TAG, "Bug report " + mMetaBugReport.getTimestamp() + " is cancelled");
         mAudioRecordingStarted = false;
+        mAudioRecordingIsRunning = false;
     }
 
     private void buttonCancelClick(View view) {
@@ -288,36 +447,46 @@
     }
 
     private void buttonSubmitClick(View view) {
-        startBugReportingInService();
+        stopAudioRecording();
+        mIsSubmitButtonClicked = true;
+        if (mIsNewBugReport) {
+            Log.i(TAG, "Starting bugreport service.");
+            startBugReportCollection(mMetaBugReport);
+        } else {
+            Log.i(TAG, "Adding audio file to the bugreport " + mMetaBugReport.getTimestamp());
+            new AddAudioToBugReportAsyncTask(this, mConfig, mMetaBugReport, mAudioFile).execute();
+        }
+        setResult(Activity.RESULT_OK);
         finish();
     }
 
+    /** Starts the {@link BugReportService} to collect bug report. */
+    private void startBugReportCollection(MetaBugReport bug) {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(BugReportService.EXTRA_META_BUG_REPORT, bug);
+        Intent intent = new Intent(this, BugReportService.class);
+        intent.putExtras(bundle);
+        startForegroundService(intent);
+    }
+
     /**
      * Starts {@link BugReportInfoActivity} and finishes current activity, so it won't be running
-     * in the background and closing {@link BugReportInfoActivity} will not open it again.
+     * in the background and closing {@link BugReportInfoActivity} will not open the current
+     * activity again.
      */
     private void buttonShowBugReportsClick(View view) {
+        // First cancel the audio recording, then delete the bug report from database.
         cancelAudioMessageRecording();
         // Delete the bugreport from database, otherwise pressing "Show Bugreports" button will
         // create unnecessary cancelled bugreports.
         if (mMetaBugReport != null) {
-            BugStorageUtils.deleteBugReport(this, mMetaBugReport.getId());
+            BugStorageUtils.completeDeleteBugReport(this, mMetaBugReport.getId());
         }
         Intent intent = new Intent(this, BugReportInfoActivity.class);
         startActivity(intent);
         finish();
     }
 
-    private void startBugReportingInService() {
-        stopAudioRecording();
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(EXTRA_META_BUG_REPORT, mMetaBugReport);
-        Intent intent = new Intent(this, BugReportService.class);
-        intent.putExtras(bundle);
-        startService(intent);
-        mBugReportServiceStarted = true;
-    }
-
     private void requestRecordPermissions() {
         requestPermissions(
                 new String[]{Manifest.permission.RECORD_AUDIO}, AUDIO_PERMISSIONS_REQUEST_ID);
@@ -337,7 +506,9 @@
         for (int i = 0; i < grantResults.length; i++) {
             if (Manifest.permission.RECORD_AUDIO.equals(permissions[i])
                     && grantResults[i] == PackageManager.PERMISSION_GRANTED) {
-                startRecordingWithPermission();
+                // Start recording from UI thread, otherwise when MediaRecord#start() fails,
+                // stack trace gets confusing.
+                mHandler.post(this::startRecordingWithPermission);
                 return;
             }
         }
@@ -349,55 +520,105 @@
                 + Arrays.toString(permissions);
         Log.w(TAG, text);
         Toast.makeText(this, text, Toast.LENGTH_LONG).show();
-        BugStorageUtils.setBugReportStatus(this, mMetaBugReport,
-                Status.STATUS_USER_CANCELLED, text);
+        if (mIsNewBugReport) {
+            BugStorageUtils.setBugReportStatus(this, mMetaBugReport,
+                    Status.STATUS_USER_CANCELLED, text);
+        } else {
+            BugStorageUtils.setBugReportStatus(this, mMetaBugReport,
+                    Status.STATUS_AUDIO_PENDING, text);
+        }
         finish();
     }
 
     private void startRecordingWithPermission() {
-        File recordingFile = FileUtils.getFileWithSuffix(this, mMetaBugReport.getTimestamp(),
-                "-message.3gp");
-        Log.i(TAG, "Started voice recording, and saving audio to " + recordingFile);
+        Log.i(TAG, "Started voice recording, and saving audio to " + mAudioFile);
+
+        mLastAudioFocusRequest = new AudioFocusRequest.Builder(
+                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+                .setOnAudioFocusChangeListener(focusChange ->
+                        Log.d(TAG, "AudioManager focus change " + focusChange))
+                .setAudioAttributes(new AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                        .build())
+                .setAcceptsDelayedFocusGain(true)
+                .build();
+        int focusGranted = mAudioManager.requestAudioFocus(mLastAudioFocusRequest);
+        // NOTE: We will record even if the audio focus was not granted.
+        Log.d(TAG,
+                "AudioFocus granted " + (focusGranted == AudioManager.AUDIOFOCUS_REQUEST_GRANTED));
 
         mRecorder = new MediaRecorder();
         mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
         mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
         mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
-        mRecorder.setOutputFile(recordingFile);
+        mRecorder.setOnInfoListener((MediaRecorder recorder, int what, int extra) ->
+                Log.i(TAG, "OnMediaRecorderInfo: what=" + what + ", extra=" + extra));
+        mRecorder.setOnErrorListener((MediaRecorder recorder, int what, int extra) ->
+                Log.i(TAG, "OnMediaRecorderError: what=" + what + ", extra=" + extra));
+        mRecorder.setOutputFile(mAudioFile);
 
         try {
             mRecorder.prepare();
         } catch (IOException e) {
-            Log.e(TAG, "Failed on MediaRecorder#prepare(), filename: " + recordingFile, e);
+            Log.e(TAG, "Failed on MediaRecorder#prepare(), filename: " + mAudioFile, e);
             finish();
             return;
         }
 
         mRecorder.start();
         mVoiceRecordingView.setRecorder(mRecorder);
+        mAudioRecordingIsRunning = true;
 
+        // Messages with token mRecorder are cleared when the activity finishes or recording stops.
         mHandler.postDelayed(() -> {
             Log.i(TAG, "Timed out while recording voice message, cancelling.");
             stopAudioRecording();
             showSubmitBugReportUi(/* isRecording= */ false);
-        }, VOICE_MESSAGE_MAX_DURATION_MILLIS);
+        }, /* token= */ mRecorder, VOICE_MESSAGE_MAX_DURATION_MILLIS);
     }
 
     private void stopAudioRecording() {
         if (mRecorder != null) {
             Log.i(TAG, "Recording ended, stopping the MediaRecorder.");
-            mRecorder.stop();
+            mHandler.removeCallbacksAndMessages(/* token= */ mRecorder);
+            try {
+                mRecorder.stop();
+            } catch (RuntimeException e) {
+                // Sometimes MediaRecorder doesn't start and stopping it throws an error.
+                // We just log these cases, no need to crash the app.
+                Log.w(TAG, "Couldn't stop media recorder", e);
+            }
             mRecorder.release();
             mRecorder = null;
         }
+        if (mLastAudioFocusRequest != null) {
+            int focusAbandoned = mAudioManager.abandonAudioFocusRequest(mLastAudioFocusRequest);
+            Log.d(TAG, "Audio focus abandoned "
+                    + (focusAbandoned == AudioManager.AUDIOFOCUS_REQUEST_GRANTED));
+            mLastAudioFocusRequest = null;
+        }
         mVoiceRecordingView.setRecorder(null);
     }
 
-    private String getCurrentUserName() {
-        UserManager um = UserManager.get(this);
+    private static String getCurrentUserName(Context context) {
+        UserManager um = UserManager.get(context);
         return um.getUserName();
     }
 
+    /**
+     * Creates a {@link MetaBugReport} and saves it in a local sqlite database.
+     *
+     * @param context an Android context.
+     * @param type bug report type, {@link MetaBugReport.BugReportType}.
+     */
+    static MetaBugReport createBugReport(Context context, int type) {
+        String timestamp = MetaBugReport.toBugReportTimestamp(new Date());
+        String username = getCurrentUserName(context);
+        String title = BugReportTitleGenerator.generateBugReportTitle(timestamp, username);
+        return BugStorageUtils.createBugReport(context, title, timestamp, username, type);
+    }
+
     /** A helper class to generate bugreport title. */
     private static final class BugReportTitleGenerator {
         /** Contains easily readable characters. */
@@ -405,17 +626,14 @@
                 new char[]{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P',
                         'R', 'S', 'T', 'U', 'W', 'X', 'Y', 'Z'};
 
-        private static final int LOOKUP_STRING_LENGTH = 6;
-
         /**
          * Generates a bugreport title from given timestamp and username.
          *
          * <p>Example: "[A45E8] Feedback from user Driver at 2019-09-21_12:00:00"
          */
-        static String generateBugReportTitle(Date initiatedAt, String username) {
+        static String generateBugReportTitle(String timestamp, String username) {
             // Lookup string is used to search a bug in Buganizer (see b/130915969).
             String lookupString = generateRandomString(LOOKUP_STRING_LENGTH);
-            String timestamp = BUG_REPORT_TIMESTAMP_DATE_FORMAT.format(initiatedAt);
             return "[" + lookupString + "] Feedback from user " + username + " at " + timestamp;
         }
 
@@ -430,15 +648,66 @@
         }
     }
 
-    /** AsyncTask that recursively deletes directories. */
-    private static class DeleteDirectoryAsyncTask extends AsyncTask<File, Void, Void> {
+    /** AsyncTask that recursively deletes files and directories. */
+    private static class DeleteFilesAndDirectoriesAsyncTask extends AsyncTask<File, Void, Void> {
         @Override
         protected Void doInBackground(File... files) {
             for (File file : files) {
                 Log.i(TAG, "Deleting " + file.getAbsolutePath());
-                FileUtils.deleteDirectory(file);
+                if (file.isFile()) {
+                    file.delete();
+                } else {
+                    FileUtils.deleteDirectory(file);
+                }
             }
             return null;
         }
     }
+
+    /**
+     * AsyncTask that moves audio file to the system user's {@link FileUtils#getPendingDir} and
+     * sets status to either STATUS_UPLOAD_PENDING or STATUS_PENDING_USER_ACTION.
+     */
+    private static class AddAudioToBugReportAsyncTask extends AsyncTask<Void, Void, Void> {
+        private final Context mContext;
+        private final Config mConfig;
+        private final File mAudioFile;
+        private final MetaBugReport mOriginalBug;
+
+        AddAudioToBugReportAsyncTask(
+                Context context, Config config, MetaBugReport bug, File audioFile) {
+            mContext = context;
+            mConfig = config;
+            mOriginalBug = bug;
+            mAudioFile = audioFile;
+        }
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            String audioFileName = FileUtils.getAudioFileName(
+                    MetaBugReport.toBugReportTimestamp(new Date()), mOriginalBug);
+            MetaBugReport bug = BugStorageUtils.update(mContext,
+                    mOriginalBug.toBuilder().setAudioFileName(audioFileName).build());
+            try (OutputStream out = BugStorageUtils.openAudioMessageFileToWrite(mContext, bug);
+                 InputStream input = new FileInputStream(mAudioFile)) {
+                ByteStreams.copy(input, out);
+            } catch (IOException e) {
+                BugStorageUtils.setBugReportStatus(mContext, bug,
+                        com.google.android.car.bugreport.Status.STATUS_WRITE_FAILED,
+                        "Failed to write audio to bug report");
+                Log.e(TAG, "Failed to write audio to bug report", e);
+                return null;
+            }
+            if (mConfig.getAutoUpload()) {
+                BugStorageUtils.setBugReportStatus(mContext, bug,
+                        com.google.android.car.bugreport.Status.STATUS_UPLOAD_PENDING, "");
+            } else {
+                BugStorageUtils.setBugReportStatus(mContext, bug,
+                        com.google.android.car.bugreport.Status.STATUS_PENDING_USER_ACTION, "");
+                BugReportService.showBugReportFinishedNotification(mContext, bug);
+            }
+            mAudioFile.delete();
+            return null;
+        }
+    }
 }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
index 0469bb1..5503706 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
@@ -21,9 +21,13 @@
 import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
+import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
 import android.provider.DocumentsContract;
 import android.util.Log;
 import android.view.View;
@@ -33,13 +37,23 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.io.ByteStreams;
+
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 
 /**
  * Provides an activity that provides information on the bugreports that are filed.
@@ -47,105 +61,26 @@
 public class BugReportInfoActivity extends Activity {
     public static final String TAG = BugReportInfoActivity.class.getSimpleName();
 
+    /** Used for moving bug reports to a new location (e.g. USB drive). */
     private static final int SELECT_DIRECTORY_REQUEST_CODE = 1;
 
+    /** Used to start {@link BugReportActivity} to add audio message. */
+    private static final int ADD_AUDIO_MESSAGE_REQUEST_CODE = 2;
+
     private RecyclerView mRecyclerView;
-    private RecyclerView.Adapter mAdapter;
+    private BugInfoAdapter mBugInfoAdapter;
     private RecyclerView.LayoutManager mLayoutManager;
     private NotificationManager mNotificationManager;
     private MetaBugReport mLastSelectedBugReport;
-
-    private static final class AsyncMoveFilesTask extends AsyncTask<Void, Void, Boolean> {
-        private final BugReportInfoActivity mActivity;
-        private final MetaBugReport mBugReport;
-        private final Uri mDestinationDirUri;
-
-        AsyncMoveFilesTask(BugReportInfoActivity activity, MetaBugReport bugReport,
-                Uri destinationDir) {
-            mActivity = activity;
-            mBugReport = bugReport;
-            mDestinationDirUri = destinationDir;
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            Uri sourceUri = BugStorageProvider.buildUriWithBugId(mBugReport.getId());
-            ContentResolver resolver = mActivity.getContentResolver();
-            String documentId = DocumentsContract.getTreeDocumentId(mDestinationDirUri);
-            Uri parentDocumentUri =
-                    DocumentsContract.buildDocumentUriUsingTree(mDestinationDirUri, documentId);
-            String mimeType = resolver.getType(sourceUri);
-            try {
-                Uri newFileUri = DocumentsContract.createDocument(resolver, parentDocumentUri,
-                        mimeType,
-                        new File(mBugReport.getFilePath()).toPath().getFileName().toString());
-                if (newFileUri == null) {
-                    Log.e(TAG, "Unable to create a new file.");
-                    return false;
-                }
-                try (InputStream input = resolver.openInputStream(sourceUri);
-                     OutputStream output = resolver.openOutputStream(newFileUri)) {
-                    byte[] buffer = new byte[4096];
-                    int len;
-                    while ((len = input.read(buffer)) > 0) {
-                        output.write(buffer, 0, len);
-                    }
-                }
-                BugStorageUtils.setBugReportStatus(
-                        mActivity, mBugReport,
-                        com.google.android.car.bugreport.Status.STATUS_MOVE_SUCCESSFUL, "");
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to create the bug report in the location.", e);
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean moveSuccessful) {
-            if (!moveSuccessful) {
-                BugStorageUtils.setBugReportStatus(
-                        mActivity, mBugReport,
-                        com.google.android.car.bugreport.Status.STATUS_MOVE_FAILED, "");
-            }
-            // Refresh the UI to reflect the new status.
-            new BugReportInfoTask(mActivity).execute();
-        }
-    }
-
-    private static final class BugReportInfoTask extends
-            AsyncTask<Void, Void, List<MetaBugReport>> {
-        private final WeakReference<BugReportInfoActivity> mBugReportInfoActivityWeakReference;
-
-        BugReportInfoTask(BugReportInfoActivity activity) {
-            mBugReportInfoActivityWeakReference = new WeakReference<>(activity);
-        }
-
-        @Override
-        protected List<MetaBugReport> doInBackground(Void... voids) {
-            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
-            if (activity == null) {
-                Log.w(TAG, "Activity is gone, cancelling BugReportInfoTask.");
-                return new ArrayList<>();
-            }
-            return BugStorageUtils.getAllBugReportsDescending(activity);
-        }
-
-        @Override
-        protected void onPostExecute(List<MetaBugReport> result) {
-            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
-            if (activity == null) {
-                Log.w(TAG, "Activity is gone, cancelling onPostExecute.");
-                return;
-            }
-            activity.mAdapter = new BugInfoAdapter(result, activity::onBugReportItemClicked);
-            activity.mRecyclerView.setAdapter(activity.mAdapter);
-            activity.mRecyclerView.getAdapter().notifyDataSetChanged();
-        }
-    }
+    private BugInfoAdapter.BugInfoViewHolder mLastSelectedBugInfoViewHolder;
+    private BugStorageObserver mBugStorageObserver;
+    private Config mConfig;
+    private boolean mAudioRecordingStarted;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Preconditions.checkState(Config.isBugReportEnabled(), "BugReport is disabled.");
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.bug_report_info_activity);
 
@@ -159,9 +94,13 @@
         mRecyclerView.addItemDecoration(new DividerItemDecoration(mRecyclerView.getContext(),
                 DividerItemDecoration.VERTICAL));
 
-        // specify an adapter (see also next example)
-        mAdapter = new BugInfoAdapter(new ArrayList<>(), this::onBugReportItemClicked);
-        mRecyclerView.setAdapter(mAdapter);
+        mConfig = new Config();
+        mConfig.start();
+
+        mBugInfoAdapter = new BugInfoAdapter(this::onBugReportItemClicked, mConfig);
+        mRecyclerView.setAdapter(mBugInfoAdapter);
+
+        mBugStorageObserver = new BugStorageObserver(this, new Handler());
 
         findViewById(R.id.quit_button).setOnClickListener(this::onQuitButtonClick);
         findViewById(R.id.start_bug_report_button).setOnClickListener(
@@ -175,7 +114,16 @@
     @Override
     protected void onStart() {
         super.onStart();
-        new BugReportInfoTask(this).execute();
+        new BugReportsLoaderAsyncTask(this).execute();
+        // As BugStorageProvider is running under user0, we register using USER_ALL.
+        getContentResolver().registerContentObserver(BugStorageProvider.BUGREPORT_CONTENT_URI, true,
+                mBugStorageObserver, UserHandle.USER_ALL);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        getContentResolver().unregisterContentObserver(mBugStorageObserver);
     }
 
     /**
@@ -186,17 +134,26 @@
         mNotificationManager.cancel(BugReportService.BUGREPORT_FINISHED_NOTIF_ID);
     }
 
-    private void onBugReportItemClicked(int buttonType, MetaBugReport bugReport) {
+    private void onBugReportItemClicked(
+            int buttonType, MetaBugReport bugReport, BugInfoAdapter.BugInfoViewHolder holder) {
         if (buttonType == BugInfoAdapter.BUTTON_TYPE_UPLOAD) {
-            Log.i(TAG, "Uploading " + bugReport.getFilePath());
+            Log.i(TAG, "Uploading " + bugReport.getTimestamp());
             BugStorageUtils.setBugReportStatus(this, bugReport, Status.STATUS_UPLOAD_PENDING, "");
             // Refresh the UI to reflect the new status.
-            new BugReportInfoTask(this).execute();
+            new BugReportsLoaderAsyncTask(this).execute();
         } else if (buttonType == BugInfoAdapter.BUTTON_TYPE_MOVE) {
-            Log.i(TAG, "Moving " + bugReport.getFilePath());
+            Log.i(TAG, "Moving " + bugReport.getTimestamp());
             mLastSelectedBugReport = bugReport;
+            mLastSelectedBugInfoViewHolder = holder;
             startActivityForResult(new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE),
                     SELECT_DIRECTORY_REQUEST_CODE);
+        } else if (buttonType == BugInfoAdapter.BUTTON_TYPE_ADD_AUDIO) {
+            // Check mAudioRecordingStarted to prevent double click to BUTTON_TYPE_ADD_AUDIO.
+            if (!mAudioRecordingStarted) {
+                mAudioRecordingStarted = true;
+                startActivityForResult(BugReportActivity.buildAddAudioIntent(this, bugReport),
+                        ADD_AUDIO_MESSAGE_REQUEST_CODE);
+            }
         } else {
             throw new IllegalStateException("unreachable");
         }
@@ -211,11 +168,20 @@
                             | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             Uri destDirUri = data.getData();
             getContentResolver().takePersistableUriPermission(destDirUri, takeFlags);
-            if (mLastSelectedBugReport == null) {
+            if (mLastSelectedBugReport == null || mLastSelectedBugInfoViewHolder == null) {
                 Log.w(TAG, "No bug report is selected.");
                 return;
             }
-            new AsyncMoveFilesTask(this, mLastSelectedBugReport, destDirUri).execute();
+            MetaBugReport updatedBugReport = BugStorageUtils.setBugReportStatus(this,
+                    mLastSelectedBugReport, Status.STATUS_MOVE_IN_PROGRESS, "");
+            mBugInfoAdapter.updateBugReportInDataSet(
+                    updatedBugReport, mLastSelectedBugInfoViewHolder.getAdapterPosition());
+            new AsyncMoveFilesTask(
+                this,
+                    mBugInfoAdapter,
+                    updatedBugReport,
+                    mLastSelectedBugInfoViewHolder,
+                    destDirUri).execute();
         }
     }
 
@@ -230,4 +196,194 @@
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
     }
+
+    /**
+     * Print the Provider's state into the given stream. This gets invoked if
+     * you run "adb shell dumpsys activity BugReportInfoActivity".
+     *
+     * @param prefix Desired prefix to prepend at each line of output.
+     * @param fd The raw file descriptor that the dump is being sent to.
+     * @param writer The PrintWriter to which you should dump your state.  This will be
+     * closed for you after you return.
+     * @param args additional arguments to the dump request.
+     */
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        super.dump(prefix, fd, writer, args);
+        mConfig.dump(prefix, writer);
+    }
+
+    /**
+     * Moves bugreport zip to USB drive and updates RecyclerView.
+     *
+     * <p>It merges bugreport zip file and audio file into one final zip file and moves it.
+     */
+    private static final class AsyncMoveFilesTask extends AsyncTask<Void, Void, MetaBugReport> {
+        private final BugReportInfoActivity mActivity;
+        private final MetaBugReport mBugReport;
+        private final Uri mDestinationDirUri;
+        /** RecyclerView.Adapter that contains all the bug reports. */
+        private final BugInfoAdapter mBugInfoAdapter;
+        /** ViewHolder for {@link #mBugReport}. */
+        private final BugInfoAdapter.BugInfoViewHolder mBugViewHolder;
+        private final ContentResolver mResolver;
+
+        AsyncMoveFilesTask(BugReportInfoActivity activity, BugInfoAdapter bugInfoAdapter,
+                MetaBugReport bugReport, BugInfoAdapter.BugInfoViewHolder holder,
+                Uri destinationDir) {
+            mActivity = activity;
+            mBugInfoAdapter = bugInfoAdapter;
+            mBugReport = bugReport;
+            mBugViewHolder = holder;
+            mDestinationDirUri = destinationDir;
+            mResolver = mActivity.getContentResolver();
+        }
+
+        /** Moves the bugreport to the USB drive and returns the updated {@link MetaBugReport}. */
+        @Override
+        protected MetaBugReport doInBackground(Void... params) {
+            try {
+                return copyFilesToUsb();
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to copy bugreport "
+                        + mBugReport.getTimestamp() + " to USB", e);
+                return BugStorageUtils.setBugReportStatus(
+                    mActivity, mBugReport,
+                    com.google.android.car.bugreport.Status.STATUS_MOVE_FAILED, e);
+            }
+        }
+
+        private MetaBugReport copyFilesToUsb() throws IOException {
+            String documentId = DocumentsContract.getTreeDocumentId(mDestinationDirUri);
+            Uri parentDocumentUri =
+                    DocumentsContract.buildDocumentUriUsingTree(mDestinationDirUri, documentId);
+            if (!Strings.isNullOrEmpty(mBugReport.getFilePath())) {
+                // There are still old bugreports with deprecated filePath.
+                Uri sourceUri = BugStorageProvider.buildUriWithSegment(
+                        mBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_FILE);
+                copyFileToUsb(
+                        new File(mBugReport.getFilePath()).getName(), sourceUri, parentDocumentUri);
+            } else {
+                mergeFilesAndCopyToUsb(parentDocumentUri);
+            }
+            Log.d(TAG, "Deleting local bug report files.");
+            BugStorageUtils.deleteBugReportFiles(mActivity, mBugReport.getId());
+            return BugStorageUtils.setBugReportStatus(mActivity, mBugReport,
+                    com.google.android.car.bugreport.Status.STATUS_MOVE_SUCCESSFUL,
+                    "Moved to: " + mDestinationDirUri.getPath());
+        }
+
+        private void mergeFilesAndCopyToUsb(Uri parentDocumentUri) throws IOException {
+            Uri sourceBugReport = BugStorageProvider.buildUriWithSegment(
+                    mBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_BUGREPORT_FILE);
+            Uri sourceAudio = BugStorageProvider.buildUriWithSegment(
+                    mBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_AUDIO_FILE);
+            String mimeType = mResolver.getType(sourceBugReport); // It's a zip file.
+            Uri newFileUri = DocumentsContract.createDocument(
+                    mResolver, parentDocumentUri, mimeType, mBugReport.getBugReportFileName());
+            if (newFileUri == null) {
+                throw new IOException(
+                        "Unable to create a file " + mBugReport.getBugReportFileName() + " in USB");
+            }
+            try (InputStream bugReportInput = mResolver.openInputStream(sourceBugReport);
+                 AssetFileDescriptor fd = mResolver.openAssetFileDescriptor(newFileUri, "w");
+                 OutputStream outputStream = fd.createOutputStream();
+                 ZipOutputStream zipOutStream =
+                         new ZipOutputStream(new BufferedOutputStream(outputStream))) {
+                // Extract bugreport zip file to the final zip file in USB drive.
+                ZipInputStream zipInStream = new ZipInputStream(bugReportInput);
+                ZipEntry entry;
+                while ((entry = zipInStream.getNextEntry()) != null) {
+                    ZipUtils.writeInputStreamToZipStream(
+                            entry.getName(), zipInStream, zipOutStream);
+                }
+                // Add audio file to the final zip file.
+                if (!Strings.isNullOrEmpty(mBugReport.getAudioFileName())) {
+                    try (InputStream audioInput = mResolver.openInputStream(sourceAudio)) {
+                        ZipUtils.writeInputStreamToZipStream(
+                                mBugReport.getAudioFileName(), audioInput, zipOutStream);
+                    }
+                }
+            }
+            try (AssetFileDescriptor fd = mResolver.openAssetFileDescriptor(newFileUri, "w")) {
+                // Force sync the written data from memory to the disk.
+                fd.getFileDescriptor().sync();
+            }
+            Log.d(TAG, "Writing to " + newFileUri + " finished");
+        }
+
+        private void copyFileToUsb(String filename, Uri sourceUri, Uri parentDocumentUri)
+                throws IOException {
+            String mimeType = mResolver.getType(sourceUri);
+            Uri newFileUri = DocumentsContract.createDocument(
+                    mResolver, parentDocumentUri, mimeType, filename);
+            if (newFileUri == null) {
+                throw new IOException("Unable to create a file " + filename + " in USB");
+            }
+            try (InputStream input = mResolver.openInputStream(sourceUri);
+                 AssetFileDescriptor fd = mResolver.openAssetFileDescriptor(newFileUri, "w")) {
+                OutputStream output = fd.createOutputStream();
+                ByteStreams.copy(input, output);
+                // Force sync the written data from memory to the disk.
+                fd.getFileDescriptor().sync();
+            }
+        }
+
+        @Override
+        protected void onPostExecute(MetaBugReport updatedBugReport) {
+            // Refresh the UI to reflect the new status.
+            mBugInfoAdapter.updateBugReportInDataSet(
+                    updatedBugReport, mBugViewHolder.getAdapterPosition());
+        }
+    }
+
+    /** Asynchronously loads bugreports from {@link BugStorageProvider}. */
+    private static final class BugReportsLoaderAsyncTask extends
+            AsyncTask<Void, Void, List<MetaBugReport>> {
+        private final WeakReference<BugReportInfoActivity> mBugReportInfoActivityWeakReference;
+
+        BugReportsLoaderAsyncTask(BugReportInfoActivity activity) {
+            mBugReportInfoActivityWeakReference = new WeakReference<>(activity);
+        }
+
+        @Override
+        protected List<MetaBugReport> doInBackground(Void... voids) {
+            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
+            if (activity == null) {
+                Log.w(TAG, "Activity is gone, cancelling BugReportsLoaderAsyncTask.");
+                return new ArrayList<>();
+            }
+            return BugStorageUtils.getAllBugReportsDescending(activity);
+        }
+
+        @Override
+        protected void onPostExecute(List<MetaBugReport> result) {
+            BugReportInfoActivity activity = mBugReportInfoActivityWeakReference.get();
+            if (activity == null) {
+                Log.w(TAG, "Activity is gone, cancelling onPostExecute.");
+                return;
+            }
+            activity.mBugInfoAdapter.setDataset(result);
+        }
+    }
+
+    /** Observer for {@link BugStorageProvider}. */
+    private static class BugStorageObserver extends ContentObserver {
+        private final BugReportInfoActivity mInfoActivity;
+
+        /**
+         * Creates a content observer.
+         *
+         * @param activity A {@link BugReportInfoActivity} instance.
+         * @param handler The handler to run {@link #onChange} on, or null if none.
+         */
+        BugStorageObserver(BugReportInfoActivity activity, Handler handler) {
+            super(handler);
+            mInfoActivity = activity;
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            new BugReportsLoaderAsyncTask(mInfoActivity).execute();
+        }
+    }
 }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java
index 70ba65e..2bebd72 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportService.java
@@ -15,6 +15,10 @@
  */
 package com.google.android.car.bugreport;
 
+import static android.car.CarBugreportManager.CarBugreportManagerCallback.CAR_BUGREPORT_DUMPSTATE_CONNECTION_FAILED;
+import static android.car.CarBugreportManager.CarBugreportManagerCallback.CAR_BUGREPORT_DUMPSTATE_FAILED;
+import static android.car.CarBugreportManager.CarBugreportManagerCallback.CAR_BUGREPORT_SERVICE_NOT_AVAILABLE;
+
 import static com.google.android.car.bugreport.PackageUtils.getPackageVersion;
 
 import android.annotation.FloatRange;
@@ -27,7 +31,12 @@
 import android.car.Car;
 import android.car.CarBugreportManager;
 import android.car.CarNotConnectedException;
+import android.content.Context;
 import android.content.Intent;
+import android.media.AudioManager;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
@@ -38,33 +47,32 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.google.common.base.Preconditions;
+import com.google.common.io.ByteStreams;
 import com.google.common.util.concurrent.AtomicDouble;
 
-import libcore.io.IoUtils;
-
 import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Enumeration;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 /**
  * Service that captures screenshot and bug report using dumpstate and bluetooth snoop logs.
  *
- * <p>After collecting all the logs it updates the {@link MetaBugReport} using {@link
- * BugStorageProvider}, which in turn schedules bug report to upload.
+ * <p>After collecting all the logs it sets the {@link MetaBugReport} status to
+ * {@link Status#STATUS_AUDIO_PENDING} or {@link Status#STATUS_PENDING_USER_ACTION} depending
+ * on {@link MetaBugReport#getType}.
+ *
+ * <p>If the service is started with action {@link #ACTION_START_SILENT}, it will start
+ * bugreporting without showing dialog and recording audio message, see
+ * {@link MetaBugReport#TYPE_SILENT}.
  */
 public class BugReportService extends Service {
     private static final String TAG = BugReportService.class.getSimpleName();
@@ -74,6 +82,10 @@
      */
     static final String EXTRA_META_BUG_REPORT = "meta_bug_report";
 
+    /** Starts silent (no audio message recording) bugreporting. */
+    private static final String ACTION_START_SILENT =
+            "com.google.android.car.bugreport.action.START_SILENT";
+
     // Wait a short time before starting to capture the bugreport and the screen, so that
     // bugreport activity can detach from the view tree.
     // It is ugly to have a timeout, but it is ok here because such a delay should not really
@@ -81,6 +93,15 @@
     // this, the best option is probably to wait for onDetach events from view tree.
     private static final int ACTIVITY_FINISH_DELAY_MILLIS = 1000;
 
+    /** Stop the service only after some delay, to allow toasts to show on the screen. */
+    private static final int STOP_SERVICE_DELAY_MILLIS = 1000;
+
+    /**
+     * Wait a short time before showing "bugreport started" toast message, because the service
+     * will take a screenshot of the screen.
+     */
+    private static final int BUGREPORT_STARTED_TOAST_DELAY_MILLIS = 2000;
+
     private static final String BT_SNOOP_LOG_LOCATION = "/data/misc/bluetooth/logs/btsnoop_hci.log";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
@@ -90,9 +111,10 @@
     /** Notifications on this channel will pop-up. */
     private static final String STATUS_CHANNEL_ID = "BUGREPORT_STATUS_CHANNEL";
 
+    /** Persistent notification is shown when bugreport is in progress or waiting for audio. */
     private static final int BUGREPORT_IN_PROGRESS_NOTIF_ID = 1;
 
-    /** The notification is shown when bugreport is collected. */
+    /** Dismissible notification is shown when bugreport is collected. */
     static final int BUGREPORT_FINISHED_NOTIF_ID = 2;
 
     private static final String OUTPUT_ZIP_FILE = "output_file.zip";
@@ -109,6 +131,7 @@
     /** Binder given to clients. */
     private final IBinder mBinder = new ServiceBinder();
 
+    /** True if {@link BugReportService} is already collecting bugreport, including zipping. */
     private final AtomicBoolean mIsCollectingBugReport = new AtomicBoolean(false);
     private final AtomicDouble mBugReportProgress = new AtomicDouble(0);
 
@@ -119,9 +142,16 @@
     private Car mCar;
     private CarBugreportManager mBugreportManager;
     private CarBugreportManager.CarBugreportManagerCallback mCallback;
+    private Config mConfig;
 
     /** A handler on the main thread. */
     private Handler mHandler;
+    /**
+     * A handler to the main thread to show toast messages, it will be cleared when the service
+     * finishes. We need to clear it otherwise when bugreport fails, it will show "bugreport start"
+     * toast, which will confuse users.
+     */
+    private Handler mHandlerStartedToast;
 
     /** A listener that's notified when bugreport progress changes. */
     interface BugReportProgressListener {
@@ -141,7 +171,7 @@
         }
     }
 
-    /** A handler on a main thread. */
+    /** A handler on the main thread. */
     private class BugReportHandler extends Handler {
         @Override
         public void handleMessage(Message message) {
@@ -161,6 +191,8 @@
 
     @Override
     public void onCreate() {
+        Preconditions.checkState(Config.isBugReportEnabled(), "BugReport is disabled.");
+
         mNotificationManager = getSystemService(NotificationManager.class);
         mNotificationManager.createNotificationChannel(new NotificationChannel(
                 PROGRESS_CHANNEL_ID,
@@ -172,38 +204,73 @@
                 NotificationManager.IMPORTANCE_HIGH));
         mSingleThreadExecutor = Executors.newSingleThreadScheduledExecutor();
         mHandler = new BugReportHandler();
-        mCar = Car.createCar(this);
-        try {
-            mBugreportManager = (CarBugreportManager) mCar.getCarManager(Car.CAR_BUGREPORT_SERVICE);
-        } catch (CarNotConnectedException | NoClassDefFoundError e) {
-            Log.w(TAG, "Couldn't get CarBugreportManager", e);
+        mHandlerStartedToast = new Handler();
+        mConfig = new Config();
+        mConfig.start();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) {
+            Log.d(TAG, "Service destroyed");
         }
+        disconnectFromCarService();
     }
 
     @Override
     public int onStartCommand(final Intent intent, int flags, int startId) {
-        if (mIsCollectingBugReport.get()) {
+        if (mIsCollectingBugReport.getAndSet(true)) {
             Log.w(TAG, "bug report is already being collected, ignoring");
             Toast.makeText(this, R.string.toast_bug_report_in_progress, Toast.LENGTH_SHORT).show();
             return START_NOT_STICKY;
         }
+
         Log.i(TAG, String.format("Will start collecting bug report, version=%s",
                 getPackageVersion(this)));
-        mIsCollectingBugReport.set(true);
+
+        if (ACTION_START_SILENT.equals(intent.getAction())) {
+            Log.i(TAG, "Starting a silent bugreport.");
+            mMetaBugReport = BugReportActivity.createBugReport(this, MetaBugReport.TYPE_SILENT);
+        } else {
+            Bundle extras = intent.getExtras();
+            mMetaBugReport = extras.getParcelable(EXTRA_META_BUG_REPORT);
+        }
+
         mBugReportProgress.set(0);
 
         startForeground(BUGREPORT_IN_PROGRESS_NOTIF_ID, buildProgressNotification());
         showProgressNotification();
 
-        Bundle extras = intent.getExtras();
-        mMetaBugReport = extras.getParcelable(EXTRA_META_BUG_REPORT);
-
         collectBugReport();
 
+        // Show a short lived "bugreport started" toast message after a short delay.
+        mHandlerStartedToast.postDelayed(() -> {
+            Toast.makeText(this,
+                    getText(R.string.toast_bug_report_started), Toast.LENGTH_LONG).show();
+        }, BUGREPORT_STARTED_TOAST_DELAY_MILLIS);
+
         // If the service process gets killed due to heavy memory pressure, do not restart.
         return START_NOT_STICKY;
     }
 
+    private void onCarLifecycleChanged(Car car, boolean ready) {
+        // not ready - car service is crashed or is restarting.
+        if (!ready) {
+            mBugreportManager = null;
+            mCar = null;
+
+            // NOTE: dumpstate still might be running, but we can't kill it or reconnect to it
+            //       so we ignore it.
+            handleBugReportManagerError(CAR_BUGREPORT_SERVICE_NOT_AVAILABLE);
+            return;
+        }
+        try {
+            mBugreportManager = (CarBugreportManager) car.getCarManager(Car.CAR_BUGREPORT_SERVICE);
+        } catch (CarNotConnectedException | NoClassDefFoundError e) {
+            throw new IllegalStateException("Failed to get CarBugreportManager.", e);
+        }
+    }
+
     /** Shows an updated progress notification. */
     private void showProgressNotification() {
         if (isCollectingBugReport()) {
@@ -213,13 +280,18 @@
     }
 
     private Notification buildProgressNotification() {
+        Intent intent = new Intent(getApplicationContext(), BugReportInfoActivity.class);
+        PendingIntent startBugReportInfoActivity =
+                PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
         return new Notification.Builder(this, PROGRESS_CHANNEL_ID)
                 .setContentTitle(getText(R.string.notification_bugreport_in_progress))
+                .setContentText(mMetaBugReport.getTitle())
                 .setSubText(String.format("%.1f%%", mBugReportProgress.get()))
                 .setSmallIcon(R.drawable.download_animation)
                 .setCategory(Notification.CATEGORY_STATUS)
                 .setOngoing(true)
                 .setProgress((int) MAX_PROGRESS_VALUE, (int) mBugReportProgress.get(), false)
+                .setContentIntent(startBugReportInfoActivity)
                 .build();
     }
 
@@ -253,7 +325,26 @@
         mHandler.post(() -> Toast.makeText(this, getText(resId), Toast.LENGTH_LONG).show());
     }
 
+    private void disconnectFromCarService() {
+        if (mCar != null) {
+            mCar.disconnect();
+            mCar = null;
+        }
+        mBugreportManager = null;
+    }
+
+    private void connectToCarServiceSync() {
+        if (mCar == null || !(mCar.isConnected() || mCar.isConnecting())) {
+            mCar = Car.createCar(this, /* handler= */ null,
+                    Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, this::onCarLifecycleChanged);
+        }
+    }
+
     private void collectBugReport() {
+        // Connect to the car service before collecting bugreport, because when car service crashes,
+        // BugReportService doesn't automatically reconnect to it.
+        connectToCarServiceSync();
+
         if (Build.IS_USERDEBUG || Build.IS_ENG) {
             mSingleThreadExecutor.schedule(
                     this::grabBtSnoopLog, ACTIVITY_FINISH_DELAY_MILLIS, TimeUnit.MILLISECONDS);
@@ -266,9 +357,14 @@
         Log.i(TAG, "Grabbing bt snoop log");
         File result = FileUtils.getFileWithSuffix(this, mMetaBugReport.getTimestamp(),
                 "-btsnoop.bin.log");
-        try {
-            copyBinaryStream(new FileInputStream(new File(BT_SNOOP_LOG_LOCATION)),
-                    new FileOutputStream(result));
+        File snoopFile = new File(BT_SNOOP_LOG_LOCATION);
+        if (!snoopFile.exists()) {
+            Log.w(TAG, BT_SNOOP_LOG_LOCATION + " not found, skipping");
+            return;
+        }
+        try (FileInputStream input = new FileInputStream(snoopFile);
+             FileOutputStream output = new FileOutputStream(result)) {
+            ByteStreams.copy(input, output);
         } catch (IOException e) {
             // this regularly happens when snooplog is not enabled so do not log as an error
             Log.i(TAG, "Failed to grab bt snooplog, continuing to take bug report.", e);
@@ -290,6 +386,8 @@
             BugStorageUtils.setBugReportStatus(this, mMetaBugReport, Status.STATUS_WRITE_FAILED,
                     MESSAGE_FAILURE_DUMPSTATE);
             showToast(R.string.toast_status_dump_state_failed);
+            disconnectFromCarService();
+            mIsCollectingBugReport.set(false);
         }
     }
 
@@ -306,15 +404,10 @@
         }
         mCallback = new CarBugreportManager.CarBugreportManagerCallback() {
             @Override
-            public void onError(int errorCode) {
-                Log.e(TAG, "Bugreport failed " + errorCode);
-                showToast(R.string.toast_status_failed);
-                // TODO(b/133520419): show this error on Info page or add to zip file.
-                scheduleZipTask();
-                // We let the UI know that bug reporting is finished, because the next step is to
-                // zip everything and upload.
-                mBugReportProgress.set(MAX_PROGRESS_VALUE);
-                sendProgressEventToHandler(MAX_PROGRESS_VALUE);
+            public void onError(@CarBugreportErrorCode int errorCode) {
+                Log.e(TAG, "CarBugreportManager failed: " + errorCode);
+                disconnectFromCarService();
+                handleBugReportManagerError(errorCode);
             }
 
             @Override
@@ -325,86 +418,147 @@
 
             @Override
             public void onFinished() {
-                Log.i(TAG, "Bugreport finished");
-                scheduleZipTask();
+                Log.d(TAG, "CarBugreportManager finished");
+                disconnectFromCarService();
                 mBugReportProgress.set(MAX_PROGRESS_VALUE);
                 sendProgressEventToHandler(MAX_PROGRESS_VALUE);
+                mSingleThreadExecutor.submit(BugReportService.this::zipDirectoryAndUpdateStatus);
             }
         };
+        if (mBugreportManager == null) {
+            mHandler.post(() -> Toast.makeText(this,
+                    "Car service is not ready", Toast.LENGTH_LONG).show());
+            Log.e(TAG, "CarBugReportManager is not ready");
+            return;
+        }
         mBugreportManager.requestBugreport(outFd, extraOutFd, mCallback);
     }
 
-    private void scheduleZipTask() {
-        mSingleThreadExecutor.submit(this::zipDirectoryAndScheduleForUpload);
+    private void handleBugReportManagerError(
+            @CarBugreportManager.CarBugreportManagerCallback.CarBugreportErrorCode int errorCode) {
+        if (mMetaBugReport == null) {
+            Log.w(TAG, "No bugreport is running");
+            mIsCollectingBugReport.set(false);
+            return;
+        }
+        // We let the UI know that bug reporting is finished, because the next step is to
+        // zip everything and upload.
+        mBugReportProgress.set(MAX_PROGRESS_VALUE);
+        sendProgressEventToHandler(MAX_PROGRESS_VALUE);
+        showToast(R.string.toast_status_failed);
+        BugStorageUtils.setBugReportStatus(
+                BugReportService.this, mMetaBugReport,
+                Status.STATUS_WRITE_FAILED, getBugReportFailureStatusMessage(errorCode));
+        mHandler.postDelayed(() -> {
+            mNotificationManager.cancel(BUGREPORT_IN_PROGRESS_NOTIF_ID);
+            stopForeground(true);
+        }, STOP_SERVICE_DELAY_MILLIS);
+        mHandlerStartedToast.removeCallbacksAndMessages(null);
+        mMetaBugReport = null;
+        mIsCollectingBugReport.set(false);
+    }
+
+    private static String getBugReportFailureStatusMessage(
+            @CarBugreportManager.CarBugreportManagerCallback.CarBugreportErrorCode int errorCode) {
+        switch (errorCode) {
+            case CAR_BUGREPORT_DUMPSTATE_CONNECTION_FAILED:
+            case CAR_BUGREPORT_DUMPSTATE_FAILED:
+                return "Failed to connect to dumpstate. Retry again after a minute.";
+            case CAR_BUGREPORT_SERVICE_NOT_AVAILABLE:
+                return "Car service is not available. Retry again.";
+            default:
+                return "Car service bugreport collection failed: " + errorCode;
+        }
     }
 
     /**
      * Shows a clickable bugreport finished notification. When clicked it opens
      * {@link BugReportInfoActivity}.
      */
-    private void showBugReportFinishedNotification() {
-        Intent intent = new Intent(getApplicationContext(), BugReportInfoActivity.class);
+    static void showBugReportFinishedNotification(Context context, MetaBugReport bug) {
+        Intent intent = new Intent(context, BugReportInfoActivity.class);
         PendingIntent startBugReportInfoActivity =
-                PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
+                PendingIntent.getActivity(context, 0, intent, 0);
         Notification notification = new Notification
-                .Builder(getApplicationContext(), STATUS_CHANNEL_ID)
-                .setContentTitle(getText(R.string.notification_bugreport_finished_title))
-                .setContentText(getText(JobSchedulingUtils.uploadByDefault()
-                        ? R.string.notification_bugreport_auto_upload_finished_text
-                        : R.string.notification_bugreport_manual_upload_finished_text))
+                .Builder(context, STATUS_CHANNEL_ID)
+                .setContentTitle(context.getText(R.string.notification_bugreport_finished_title))
+                .setContentText(bug.getTitle())
                 .setCategory(Notification.CATEGORY_STATUS)
                 .setSmallIcon(R.drawable.ic_upload)
                 .setContentIntent(startBugReportInfoActivity)
                 .build();
-        mNotificationManager.notify(BUGREPORT_FINISHED_NOTIF_ID, notification);
+        context.getSystemService(NotificationManager.class)
+                .notify(BUGREPORT_FINISHED_NOTIF_ID, notification);
     }
 
-    private void zipDirectoryAndScheduleForUpload() {
+    /**
+     * Zips the temp directory, writes to the system user's {@link FileUtils#getPendingDir} and
+     * updates the bug report status.
+     *
+     * <p>For {@link MetaBugReport#TYPE_INTERACTIVE}: Sets status to either STATUS_UPLOAD_PENDING or
+     * STATUS_PENDING_USER_ACTION and shows a regular notification.
+     *
+     * <p>For {@link MetaBugReport#TYPE_SILENT}: Sets status to STATUS_AUDIO_PENDING and shows
+     * a dialog to record audio message.
+     */
+    private void zipDirectoryAndUpdateStatus() {
         try {
-            // When OutputStream from openBugReportFile is closed, BugStorageProvider automatically
-            // schedules an upload job.
-            zipDirectoryToOutputStream(
-                    FileUtils.createTempDir(this, mMetaBugReport.getTimestamp()),
-                    BugStorageUtils.openBugReportFile(this, mMetaBugReport));
-            showBugReportFinishedNotification();
+            // All the generated zip files, images and audio messages are located in this dir.
+            // This is located under the current user.
+            String bugreportFileName = FileUtils.getZipFileName(mMetaBugReport);
+            Log.d(TAG, "Zipping bugreport into " + bugreportFileName);
+            mMetaBugReport = BugStorageUtils.update(this,
+                    mMetaBugReport.toBuilder().setBugReportFileName(bugreportFileName).build());
+            File bugReportTempDir = FileUtils.createTempDir(this, mMetaBugReport.getTimestamp());
+            zipDirectoryToOutputStream(bugReportTempDir,
+                    BugStorageUtils.openBugReportFileToWrite(this, mMetaBugReport));
         } catch (IOException e) {
             Log.e(TAG, "Failed to zip files", e);
             BugStorageUtils.setBugReportStatus(this, mMetaBugReport, Status.STATUS_WRITE_FAILED,
                     MESSAGE_FAILURE_ZIP);
             showToast(R.string.toast_status_failed);
+            return;
         }
+        if (mMetaBugReport.getType() == MetaBugReport.TYPE_SILENT) {
+            BugStorageUtils.setBugReportStatus(BugReportService.this,
+                    mMetaBugReport, Status.STATUS_AUDIO_PENDING, /* message= */ "");
+            playNotificationSound();
+            startActivity(BugReportActivity.buildAddAudioIntent(this, mMetaBugReport));
+        } else {
+            // NOTE: If bugreport type is INTERACTIVE, it will already contain an audio message.
+            Status status = mConfig.getAutoUpload()
+                    ? Status.STATUS_UPLOAD_PENDING : Status.STATUS_PENDING_USER_ACTION;
+            BugStorageUtils.setBugReportStatus(BugReportService.this,
+                    mMetaBugReport, status, /* message= */ "");
+            showBugReportFinishedNotification(this, mMetaBugReport);
+        }
+        mHandler.post(() -> {
+            mNotificationManager.cancel(BUGREPORT_IN_PROGRESS_NOTIF_ID);
+            stopForeground(true);
+        });
+        mHandlerStartedToast.removeCallbacksAndMessages(null);
+        mMetaBugReport = null;
         mIsCollectingBugReport.set(false);
-        showToast(R.string.toast_status_finished);
-        mHandler.post(() -> stopForeground(true));
     }
 
-    @Override
-    public void onDestroy() {
-        if (DEBUG) {
-            Log.d(TAG, "Service destroyed");
+    private void playNotificationSound() {
+        Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+        Ringtone ringtone = RingtoneManager.getRingtone(getApplicationContext(), notification);
+        if (ringtone == null) {
+            Log.w(TAG, "No notification ringtone found.");
+            return;
         }
-    }
-
-    private static void copyBinaryStream(InputStream in, OutputStream out) throws IOException {
-        OutputStream writer = null;
-        InputStream reader = null;
-        try {
-            writer = new DataOutputStream(out);
-            reader = new DataInputStream(in);
-            rawCopyStream(writer, reader);
-        } finally {
-            IoUtils.closeQuietly(reader);
-            IoUtils.closeQuietly(writer);
+        float volume = ringtone.getVolume();
+        // Use volume from audio manager, otherwise default ringtone volume can be too loud.
+        AudioManager audioManager = getSystemService(AudioManager.class);
+        if (audioManager != null) {
+            int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION);
+            int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_NOTIFICATION);
+            volume = (currentVolume + 0.0f) / maxVolume;
         }
-    }
-
-    // does not close the reader or writer.
-    private static void rawCopyStream(OutputStream writer, InputStream reader) throws IOException {
-        int read;
-        byte[] buf = new byte[8192];
-        while ((read = reader.read(buf, 0, buf.length)) > 0) {
-            writer.write(buf, 0, read);
-        }
+        Log.v(TAG, "Using volume " + volume);
+        ringtone.setVolume(volume);
+        ringtone.play();
     }
 
     /**
@@ -425,47 +579,23 @@
         Log.v(TAG, "zipping directory " + dirToZip.getAbsolutePath());
 
         File[] listFiles = dirToZip.listFiles();
-        ZipOutputStream zipStream = new ZipOutputStream(new BufferedOutputStream(outStream));
-        try {
+        try (ZipOutputStream zipStream = new ZipOutputStream(new BufferedOutputStream(outStream))) {
             for (File file : listFiles) {
                 if (file.isDirectory()) {
                     continue;
                 }
                 String filename = file.getName();
-
-                // only for the zipped output file, we add invidiual entries to zip file
+                // only for the zipped output file, we add individual entries to zip file.
                 if (filename.equals(OUTPUT_ZIP_FILE) || filename.equals(EXTRA_OUTPUT_ZIP_FILE)) {
-                    extractZippedFileToOutputStream(file, zipStream);
+                    ZipUtils.extractZippedFileToZipStream(file, zipStream);
                 } else {
-                    FileInputStream reader = new FileInputStream(file);
-                    addFileToOutputStream(filename, reader, zipStream);
+                    ZipUtils.addFileToZipStream(file, zipStream);
                 }
             }
         } finally {
-            zipStream.close();
             outStream.close();
         }
         // Zipping successful, now cleanup the temp dir.
         FileUtils.deleteDirectory(dirToZip);
     }
-
-    private void extractZippedFileToOutputStream(File file, ZipOutputStream zipStream)
-            throws IOException {
-        ZipFile zipFile = new ZipFile(file);
-        Enumeration<? extends ZipEntry> entries = zipFile.entries();
-        while (entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            InputStream stream = zipFile.getInputStream(entry);
-            addFileToOutputStream(entry.getName(), stream, zipStream);
-        }
-    }
-
-    private void addFileToOutputStream(String filename, InputStream reader,
-            ZipOutputStream zipStream) throws IOException {
-        ZipEntry entry = new ZipEntry(filename);
-        zipStream.putNextEntry(entry);
-        rawCopyStream(zipStream, reader);
-        zipStream.closeEntry();
-        reader.close();
-    }
 }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java
index 7a4b3de..d9e271e 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageProvider.java
@@ -17,6 +17,7 @@
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.StringDef;
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
@@ -26,13 +27,19 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
 import android.os.CancellationSignal;
-import android.os.Handler;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.function.Function;
 
 
 /**
@@ -40,32 +47,76 @@
  * In Android Automotive user 0 runs as the system and all the time, while other users won't once
  * their session ends. This content provider enables bug reports to be uploaded even after
  * user session ends.
+ *
+ * <p>A bugreport constists of two files: bugreport zip file and audio file. Audio file is added
+ * later through notification. {@link SimpleUploaderAsyncTask} merges two files into one zip file
+ * before uploading.
+ *
+ * <p>All files are stored under system user's {@link FileUtils#getPendingDir}.
  */
 public class BugStorageProvider extends ContentProvider {
     private static final String TAG = BugStorageProvider.class.getSimpleName();
 
     private static final String AUTHORITY = "com.google.android.car.bugreport";
     private static final String BUG_REPORTS_TABLE = "bugreports";
-    static final Uri BUGREPORT_CONTENT_URI =
-            Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE);
 
-    static final String COLUMN_ID = "_ID";
-    static final String COLUMN_USERNAME = "username";
-    static final String COLUMN_TITLE = "title";
-    static final String COLUMN_TIMESTAMP = "timestamp";
-    static final String COLUMN_DESCRIPTION = "description";
-    static final String COLUMN_FILEPATH = "filepath";
-    static final String COLUMN_STATUS = "status";
-    static final String COLUMN_STATUS_MESSAGE = "message";
+    /** Deletes files associated with a bug report. */
+    static final String URL_SEGMENT_DELETE_FILES = "deleteZipFile";
+    /** Destructively deletes a bug report. */
+    static final String URL_SEGMENT_COMPLETE_DELETE = "completeDelete";
+    /** Opens bugreport file of a bug report, uses column {@link #COLUMN_BUGREPORT_FILENAME}. */
+    static final String URL_SEGMENT_OPEN_BUGREPORT_FILE = "openBugReportFile";
+    /** Opens audio file of a bug report, uses column {@link #URL_MATCHED_OPEN_AUDIO_FILE}. */
+    static final String URL_SEGMENT_OPEN_AUDIO_FILE = "openAudioFile";
+    /**
+     * Opens final bugreport zip file, uses column {@link #COLUMN_FILEPATH}.
+     *
+     * <p>NOTE: This is the old way of storing final zipped bugreport. In
+     * {@code BugStorageProvider#AUDIO_VERSION} {@link #COLUMN_FILEPATH} is dropped. But there are
+     * still some devices with this field set.
+     */
+    static final String URL_SEGMENT_OPEN_FILE = "openFile";
 
     // URL Matcher IDs.
     private static final int URL_MATCHED_BUG_REPORTS_URI = 1;
     private static final int URL_MATCHED_BUG_REPORT_ID_URI = 2;
+    private static final int URL_MATCHED_DELETE_FILES = 3;
+    private static final int URL_MATCHED_COMPLETE_DELETE = 4;
+    private static final int URL_MATCHED_OPEN_BUGREPORT_FILE = 5;
+    private static final int URL_MATCHED_OPEN_AUDIO_FILE = 6;
+    private static final int URL_MATCHED_OPEN_FILE = 7;
 
-    private Handler mHandler;
+    @StringDef({
+            URL_SEGMENT_DELETE_FILES,
+            URL_SEGMENT_COMPLETE_DELETE,
+            URL_SEGMENT_OPEN_BUGREPORT_FILE,
+            URL_SEGMENT_OPEN_AUDIO_FILE,
+            URL_SEGMENT_OPEN_FILE,
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    @interface UriActionSegments {}
+
+    static final Uri BUGREPORT_CONTENT_URI =
+            Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE);
+
+    /** See {@link MetaBugReport} for column descriptions. */
+    static final String COLUMN_ID = "_ID";
+    static final String COLUMN_USERNAME = "username";
+    static final String COLUMN_TITLE = "title";
+    static final String COLUMN_TIMESTAMP = "timestamp";
+    /** not used anymore */
+    static final String COLUMN_DESCRIPTION = "description";
+    /** not used anymore, but some devices still might have bugreports with this field set. */
+    static final String COLUMN_FILEPATH = "filepath";
+    static final String COLUMN_STATUS = "status";
+    static final String COLUMN_STATUS_MESSAGE = "message";
+    static final String COLUMN_TYPE = "type";
+    static final String COLUMN_BUGREPORT_FILENAME = "bugreport_filename";
+    static final String COLUMN_AUDIO_FILENAME = "audio_filename";
 
     private DatabaseHelper mDatabaseHelper;
     private final UriMatcher mUriMatcher;
+    private Config mConfig;
 
     /**
      * A helper class to work with sqlite database.
@@ -78,9 +129,13 @@
         /**
          * All changes in database versions should be recorded here.
          * 1: Initial version.
+         * 2: Add integer column details_needed.
+         * 3: Add string column audio_filename and bugreport_filename.
          */
         private static final int INITIAL_VERSION = 1;
-        private static final int DATABASE_VERSION = INITIAL_VERSION;
+        private static final int TYPE_VERSION = 2;
+        private static final int AUDIO_VERSION = 3;
+        private static final int DATABASE_VERSION = AUDIO_VERSION;
 
         private static final String CREATE_TABLE = "CREATE TABLE " + BUG_REPORTS_TABLE + " ("
                 + COLUMN_ID + " INTEGER PRIMARY KEY,"
@@ -90,7 +145,10 @@
                 + COLUMN_DESCRIPTION + " TEXT NULL,"
                 + COLUMN_FILEPATH + " TEXT DEFAULT NULL,"
                 + COLUMN_STATUS + " INTEGER DEFAULT " + Status.STATUS_WRITE_PENDING.getValue() + ","
-                + COLUMN_STATUS_MESSAGE + " TEXT NULL"
+                + COLUMN_STATUS_MESSAGE + " TEXT NULL,"
+                + COLUMN_TYPE + " INTEGER DEFAULT " + MetaBugReport.TYPE_INTERACTIVE + ","
+                + COLUMN_BUGREPORT_FILENAME + " TEXT DEFAULT NULL,"
+                + COLUMN_AUDIO_FILENAME + " TEXT DEFAULT NULL"
                 + ");";
 
         DatabaseHelper(Context context) {
@@ -105,24 +163,56 @@
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             Log.w(TAG, "Upgrading from " + oldVersion + " to " + newVersion);
+            if (oldVersion < TYPE_VERSION) {
+                db.execSQL("ALTER TABLE " + BUG_REPORTS_TABLE + " ADD COLUMN "
+                        + COLUMN_TYPE + " INTEGER DEFAULT " + MetaBugReport.TYPE_INTERACTIVE);
+            }
+            if (oldVersion < AUDIO_VERSION) {
+                db.execSQL("ALTER TABLE " + BUG_REPORTS_TABLE + " ADD COLUMN "
+                        + COLUMN_BUGREPORT_FILENAME + " TEXT DEFAULT NULL");
+                db.execSQL("ALTER TABLE " + BUG_REPORTS_TABLE + " ADD COLUMN "
+                        + COLUMN_AUDIO_FILENAME + " TEXT DEFAULT NULL");
+            }
         }
     }
 
-    /** Builds {@link Uri} that points to a bugreport entry with provided bugreport id. */
-    static Uri buildUriWithBugId(int bugReportId) {
-        return Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE + "/" + bugReportId);
+    /**
+     * Builds an {@link Uri} that points to the single bug report and performs an action
+     * defined by given URI segment.
+     */
+    static Uri buildUriWithSegment(int bugReportId, @UriActionSegments String segment) {
+        return Uri.parse("content://" + AUTHORITY + "/" + BUG_REPORTS_TABLE + "/"
+                + segment + "/" + bugReportId);
     }
 
     public BugStorageProvider() {
         mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
         mUriMatcher.addURI(AUTHORITY, BUG_REPORTS_TABLE, URL_MATCHED_BUG_REPORTS_URI);
         mUriMatcher.addURI(AUTHORITY, BUG_REPORTS_TABLE + "/#", URL_MATCHED_BUG_REPORT_ID_URI);
+        mUriMatcher.addURI(
+                AUTHORITY, BUG_REPORTS_TABLE + "/" + URL_SEGMENT_DELETE_FILES + "/#",
+                URL_MATCHED_DELETE_FILES);
+        mUriMatcher.addURI(
+                AUTHORITY, BUG_REPORTS_TABLE + "/" + URL_SEGMENT_COMPLETE_DELETE + "/#",
+                URL_MATCHED_COMPLETE_DELETE);
+        mUriMatcher.addURI(
+                AUTHORITY, BUG_REPORTS_TABLE + "/" + URL_SEGMENT_OPEN_BUGREPORT_FILE + "/#",
+                URL_MATCHED_OPEN_BUGREPORT_FILE);
+        mUriMatcher.addURI(
+                AUTHORITY, BUG_REPORTS_TABLE + "/" + URL_SEGMENT_OPEN_AUDIO_FILE + "/#",
+                URL_MATCHED_OPEN_AUDIO_FILE);
+        mUriMatcher.addURI(
+                AUTHORITY, BUG_REPORTS_TABLE + "/" + URL_SEGMENT_OPEN_FILE + "/#",
+                URL_MATCHED_OPEN_FILE);
     }
 
     @Override
     public boolean onCreate() {
+        Preconditions.checkState(Config.isBugReportEnabled(), "BugReport is disabled.");
+
         mDatabaseHelper = new DatabaseHelper(getContext());
-        mHandler = new Handler();
+        mConfig = new Config();
+        mConfig.start();
         return true;
     }
 
@@ -181,10 +271,6 @@
         switch (mUriMatcher.match(uri)) {
             case URL_MATCHED_BUG_REPORTS_URI:
                 table = BUG_REPORTS_TABLE;
-                String filepath = FileUtils.getZipFile(getContext(),
-                        (String) values.get(COLUMN_TIMESTAMP),
-                        (String) values.get(COLUMN_USERNAME)).getPath();
-                values.put(COLUMN_FILEPATH, filepath);
                 break;
             default:
                 throw new IllegalArgumentException("unknown uri" + uri);
@@ -203,31 +289,46 @@
     @Nullable
     @Override
     public String getType(@NonNull Uri uri) {
-        if (mUriMatcher.match(uri) != URL_MATCHED_BUG_REPORT_ID_URI) {
-            throw new IllegalArgumentException("unknown uri:" + uri);
+        switch (mUriMatcher.match(uri)) {
+            case URL_MATCHED_OPEN_BUGREPORT_FILE:
+            case URL_MATCHED_OPEN_FILE:
+                return "application/zip";
+            case URL_MATCHED_OPEN_AUDIO_FILE:
+                return "audio/3gpp";
+            default:
+                throw new IllegalArgumentException("unknown uri:" + uri);
         }
-        // We only store zip files in this provider.
-        return "application/zip";
     }
 
     @Override
     public int delete(
             @NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        SQLiteDatabase db = mDatabaseHelper.getReadableDatabase();
         switch (mUriMatcher.match(uri)) {
-            //  returns the bugreport that match the id.
-            case URL_MATCHED_BUG_REPORT_ID_URI:
+            case URL_MATCHED_DELETE_FILES:
                 if (selection != null || selectionArgs != null) {
                     throw new IllegalArgumentException("selection is not allowed for "
-                            + URL_MATCHED_BUG_REPORT_ID_URI);
+                            + URL_MATCHED_DELETE_FILES);
+                }
+                if (deleteFilesFor(getBugReportFromUri(uri))) {
+                    getContext().getContentResolver().notifyChange(uri, null);
+                    return 1;
+                }
+                return 0;
+            case URL_MATCHED_COMPLETE_DELETE:
+                if (selection != null || selectionArgs != null) {
+                    throw new IllegalArgumentException("selection is not allowed for "
+                            + URL_MATCHED_COMPLETE_DELETE);
                 }
                 selection = COLUMN_ID + " = ?";
                 selectionArgs = new String[]{uri.getLastPathSegment()};
-                break;
+                // Ignore the results of zip file deletion, possibly it wasn't even created.
+                deleteFilesFor(getBugReportFromUri(uri));
+                getContext().getContentResolver().notifyChange(uri, null);
+                return db.delete(BUG_REPORTS_TABLE, selection, selectionArgs);
             default:
                 throw new IllegalArgumentException("Unknown URL " + uri);
         }
-        SQLiteDatabase db = mDatabaseHelper.getReadableDatabase();
-        return db.delete(BUG_REPORTS_TABLE, selection, selectionArgs);
     }
 
     @Override
@@ -263,77 +364,72 @@
     }
 
     /**
-     * This is called when the OutputStream is requested by
-     * {@link BugStorageUtils#openBugReportFile}.
+     * This is called when a file is opened.
      *
-     * It expects the file to be a zip file and schedules an upload under the primary user.
+     * <p>See {@link BugStorageUtils#openBugReportFileToWrite},
+     * {@link BugStorageUtils#openAudioMessageFileToWrite}.
      */
     @Nullable
     @Override
     public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode)
             throws FileNotFoundException {
-        if (mUriMatcher.match(uri) != URL_MATCHED_BUG_REPORT_ID_URI) {
-            throw new IllegalArgumentException("unknown uri:" + uri);
+        Function<MetaBugReport, String> fileNameExtractor;
+        switch (mUriMatcher.match(uri)) {
+            case URL_MATCHED_OPEN_BUGREPORT_FILE:
+                fileNameExtractor = MetaBugReport::getBugReportFileName;
+                break;
+            case URL_MATCHED_OPEN_AUDIO_FILE:
+                fileNameExtractor = MetaBugReport::getAudioFileName;
+                break;
+            case URL_MATCHED_OPEN_FILE:
+                File file = new File(getBugReportFromUri(uri).getFilePath());
+                Log.v(TAG, "Opening file " + file + " with mode " + mode);
+                return ParcelFileDescriptor.open(file, ParcelFileDescriptor.parseMode(mode));
+            default:
+                throw new IllegalArgumentException("unknown uri:" + uri);
         }
-
-        Cursor c = query(uri, new String[]{COLUMN_FILEPATH}, null, null, null);
-        int count = (c != null) ? c.getCount() : 0;
-        if (count != 1) {
-            // If there is not exactly one result, throw an appropriate
-            // exception.
-            if (c != null) {
-                c.close();
-            }
-            if (count == 0) {
-                throw new FileNotFoundException("No entry for " + uri);
-            }
-            throw new FileNotFoundException("Multiple items at " + uri);
-        }
-
-        c.moveToFirst();
-        int i = c.getColumnIndex(COLUMN_FILEPATH);
-        String path = (i >= 0 ? c.getString(i) : null);
-        c.close();
-        if (path == null) {
-            throw new FileNotFoundException("Column for path not found.");
-        }
-
+        // URI contains bugreport ID as the last segment, see the matched urls.
+        MetaBugReport bugReport = getBugReportFromUri(uri);
+        File file = new File(
+                FileUtils.getPendingDir(getContext()), fileNameExtractor.apply(bugReport));
+        Log.v(TAG, "Opening file " + file + " with mode " + mode);
         int modeBits = ParcelFileDescriptor.parseMode(mode);
-        try {
-            return ParcelFileDescriptor.open(new File(path), modeBits, mHandler, e -> {
-                if (mode.equals("r")) {
-                    Log.i(TAG, "File " + path + " opened in read-only mode.");
-                    return;
-                } else if (!mode.equals("w")) {
-                    Log.e(TAG, "Only read-only or write-only mode supported; mode=" + mode);
-                    return;
-                }
-                Log.i(TAG, "File " + path + " opened in write-only mode.");
-                Status status;
-                if (e == null) {
-                    // success writing the file. Update the field to indicate bugreport
-                    // is ready for upload
-                    status = JobSchedulingUtils.uploadByDefault() ? Status.STATUS_UPLOAD_PENDING
-                            : Status.STATUS_PENDING_USER_ACTION;
-                } else {
-                    // We log it and ignore it
-                    Log.e(TAG, "Bug report file write failed ", e);
-                    status = Status.STATUS_WRITE_FAILED;
-                }
-                SQLiteDatabase db = mDatabaseHelper.getWritableDatabase();
-                ContentValues values = new ContentValues();
-                values.put(COLUMN_STATUS, status.getValue());
-                db.update(BUG_REPORTS_TABLE, values, COLUMN_ID + "=?",
-                        new String[]{ uri.getLastPathSegment() });
-                if (status == Status.STATUS_UPLOAD_PENDING) {
-                    JobSchedulingUtils.scheduleUploadJob(BugStorageProvider.this.getContext());
-                }
-                Log.i(TAG, "Finished adding bugreport " + path + " " + uri);
-            });
-        } catch (IOException e) {
-            // An IOException (for example not being able to open the file, will crash us.
-            // That is ok.
-            throw new RuntimeException(e);
+        return ParcelFileDescriptor.open(file, modeBits);
+    }
+
+    private MetaBugReport getBugReportFromUri(@NonNull Uri uri) {
+        int bugreportId = Integer.parseInt(uri.getLastPathSegment());
+        return BugStorageUtils.findBugReport(getContext(), bugreportId)
+                .orElseThrow(() -> new IllegalArgumentException("No record found for " + uri));
+    }
+
+    /**
+     * Print the Provider's state into the given stream. This gets invoked if
+     * you run "dumpsys activity provider com.google.android.car.bugreport/.BugStorageProvider".
+     *
+     * @param fd The raw file descriptor that the dump is being sent to.
+     * @param writer The PrintWriter to which you should dump your state.  This will be
+     * closed for you after you return.
+     * @param args additional arguments to the dump request.
+     */
+    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        writer.println("BugStorageProvider:");
+        mConfig.dump(/* prefix= */ "  ", writer);
+    }
+
+    private boolean deleteFilesFor(MetaBugReport bugReport) {
+        if (!Strings.isNullOrEmpty(bugReport.getFilePath())) {
+            // Old bugreports have only filePath.
+            return new File(bugReport.getFilePath()).delete();
         }
+        File pendingDir = FileUtils.getPendingDir(getContext());
+        boolean result = true;
+        if (!Strings.isNullOrEmpty(bugReport.getAudioFileName())) {
+            result = new File(pendingDir, bugReport.getAudioFileName()).delete();
+        }
+        if (!Strings.isNullOrEmpty(bugReport.getBugReportFileName())) {
+            result = result && new File(pendingDir, bugReport.getBugReportFileName()).delete();
+        }
+        return result;
     }
 }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java
index cbb1a3c..a009129 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugStorageUtils.java
@@ -15,12 +15,15 @@
  */
 package com.google.android.car.bugreport;
 
+import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_AUDIO_FILENAME;
+import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_BUGREPORT_FILENAME;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_FILEPATH;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_ID;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_STATUS;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_STATUS_MESSAGE;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_TIMESTAMP;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_TITLE;
+import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_TYPE;
 import static com.google.android.car.bugreport.BugStorageProvider.COLUMN_USERNAME;
 
 import android.annotation.NonNull;
@@ -30,18 +33,21 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.api.client.auth.oauth2.TokenResponseException;
+import com.google.common.base.Strings;
 
 import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * A class that hides details when communicating with the bug storage provider.
@@ -68,6 +74,7 @@
      * @param title     - title of the bug report.
      * @param timestamp - timestamp when the bug report was initiated.
      * @param username  - current user name. Note, it's a user name, not an account name.
+     * @param type      - bug report type, {@link MetaBugReport.BugReportType}.
      * @return an instance of {@link MetaBugReport} that was created in a database.
      */
     @NonNull
@@ -75,68 +82,95 @@
             @NonNull Context context,
             @NonNull String title,
             @NonNull String timestamp,
-            @NonNull String username) {
+            @NonNull String username,
+            @MetaBugReport.BugReportType int type) {
         // insert bug report username and title
         ContentValues values = new ContentValues();
         values.put(COLUMN_TITLE, title);
         values.put(COLUMN_TIMESTAMP, timestamp);
         values.put(COLUMN_USERNAME, username);
+        values.put(COLUMN_TYPE, type);
 
         ContentResolver r = context.getContentResolver();
         Uri uri = r.insert(BugStorageProvider.BUGREPORT_CONTENT_URI, values);
-
-        Cursor c = r.query(uri, new String[]{COLUMN_ID}, null, null, null);
-        int count = (c == null) ? 0 : c.getCount();
-        if (count != 1) {
-            throw new RuntimeException("Could not create a bug report entry.");
-        }
-        c.moveToFirst();
-        int id = getInt(c, COLUMN_ID);
-        c.close();
-        return new MetaBugReport.Builder(id, timestamp)
-                .setTitle(title)
-                .setUserName(username)
-                .build();
+        return findBugReport(context, Integer.parseInt(uri.getLastPathSegment())).get();
     }
 
-    /**
-     * Returns a file stream to write the zipped file to. The content provider listens for file
-     * descriptor to be closed, and as soon as it is closed, {@link BugStorageProvider} schedules
-     * it for upload.
-     *
-     * @param context       - an application context.
-     * @param metaBugReport - a bug report.
-     * @return a file descriptor where a zip content should be written.
-     */
+    /** Returns an output stream to write the zipped file to. */
     @NonNull
-    static OutputStream openBugReportFile(
+    static OutputStream openBugReportFileToWrite(
             @NonNull Context context, @NonNull MetaBugReport metaBugReport)
             throws FileNotFoundException {
         ContentResolver r = context.getContentResolver();
+        return r.openOutputStream(BugStorageProvider.buildUriWithSegment(
+                metaBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_BUGREPORT_FILE));
+    }
 
-        // Write the file. When file is closed, bug report record status
-        // will automatically be made ready for uploading.
-        return r.openOutputStream(BugStorageProvider.buildUriWithBugId(metaBugReport.getId()));
+    /** Returns an output stream to write the audio message file to. */
+    static OutputStream openAudioMessageFileToWrite(
+            @NonNull Context context, @NonNull MetaBugReport metaBugReport)
+            throws FileNotFoundException {
+        ContentResolver r = context.getContentResolver();
+        return r.openOutputStream(BugStorageProvider.buildUriWithSegment(
+                metaBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_AUDIO_FILE));
     }
 
     /**
-     * Deletes {@link MetaBugReport} record from a local database. Returns true if the record was
-     * deleted.
+     * Returns an input stream to read the final zip file from.
+     *
+     * <p>NOTE: This is the old way of storing final zipped bugreport. See
+     * {@link BugStorageProvider#URL_SEGMENT_OPEN_FILE} for more info.
+     */
+    static InputStream openFileToRead(Context context, MetaBugReport bug)
+            throws FileNotFoundException {
+        return context.getContentResolver().openInputStream(
+                BugStorageProvider.buildUriWithSegment(
+                        bug.getId(), BugStorageProvider.URL_SEGMENT_OPEN_FILE));
+    }
+
+    /** Returns an input stream to read the bug report zip file from. */
+    static InputStream openBugReportFileToRead(Context context, MetaBugReport bug)
+            throws FileNotFoundException {
+        return context.getContentResolver().openInputStream(
+                BugStorageProvider.buildUriWithSegment(
+                        bug.getId(), BugStorageProvider.URL_SEGMENT_OPEN_BUGREPORT_FILE));
+    }
+
+    /** Returns an input stream to read the audio file from. */
+    static InputStream openAudioFileToRead(Context context, MetaBugReport bug)
+            throws FileNotFoundException {
+        return context.getContentResolver().openInputStream(
+                BugStorageProvider.buildUriWithSegment(
+                        bug.getId(), BugStorageProvider.URL_SEGMENT_OPEN_AUDIO_FILE));
+    }
+
+    /**
+     * Deletes {@link MetaBugReport} record from a local database and deletes the associated file.
+     *
+     * <p>WARNING: destructive operation.
      *
      * @param context     - an application context.
      * @param bugReportId - a bug report id.
      * @return true if the record was deleted.
      */
-    static boolean deleteBugReport(@NonNull Context context, int bugReportId) {
+    static boolean completeDeleteBugReport(@NonNull Context context, int bugReportId) {
         ContentResolver r = context.getContentResolver();
-        return r.delete(BugStorageProvider.buildUriWithBugId(bugReportId), null, null) == 1;
+        return r.delete(BugStorageProvider.buildUriWithSegment(
+                bugReportId, BugStorageProvider.URL_SEGMENT_COMPLETE_DELETE), null, null) == 1;
+    }
+
+    /** Deletes all files for given bugreport id; doesn't delete sqlite3 record. */
+    static boolean deleteBugReportFiles(@NonNull Context context, int bugReportId) {
+        ContentResolver r = context.getContentResolver();
+        return r.delete(BugStorageProvider.buildUriWithSegment(
+                bugReportId, BugStorageProvider.URL_SEGMENT_DELETE_FILES), null, null) == 1;
     }
 
     /**
-     * Returns bugreports that are waiting to be uploaded.
+     * Returns all the bugreports that are waiting to be uploaded.
      */
     @NonNull
-    public static List<MetaBugReport> getPendingBugReports(@NonNull Context context) {
+    public static List<MetaBugReport> getUploadPendingBugReports(@NonNull Context context) {
         String selection = COLUMN_STATUS + "=?";
         String[] selectionArgs = new String[]{
                 Integer.toString(Status.STATUS_UPLOAD_PENDING.getValue())};
@@ -152,17 +186,32 @@
         return getBugreports(context, null, null, COLUMN_ID + " DESC");
     }
 
-    private static List<MetaBugReport> getBugreports(Context context, String selection,
-            String[] selectionArgs, String order) {
+    /** Returns {@link MetaBugReport} for given bugreport id. */
+    static Optional<MetaBugReport> findBugReport(Context context, int bugreportId) {
+        String selection = COLUMN_ID + " = ?";
+        String[] selectionArgs = new String[]{Integer.toString(bugreportId)};
+        List<MetaBugReport> bugs = BugStorageUtils.getBugreports(
+                context, selection, selectionArgs, null);
+        if (bugs.isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(bugs.get(0));
+    }
+
+    private static List<MetaBugReport> getBugreports(
+            Context context, String selection, String[] selectionArgs, String order) {
         ArrayList<MetaBugReport> bugReports = new ArrayList<>();
         String[] projection = {
                 COLUMN_ID,
                 COLUMN_USERNAME,
                 COLUMN_TITLE,
                 COLUMN_TIMESTAMP,
+                COLUMN_BUGREPORT_FILENAME,
+                COLUMN_AUDIO_FILENAME,
                 COLUMN_FILEPATH,
                 COLUMN_STATUS,
-                COLUMN_STATUS_MESSAGE};
+                COLUMN_STATUS_MESSAGE,
+                COLUMN_TYPE};
         ContentResolver r = context.getContentResolver();
         Cursor c = r.query(BugStorageProvider.BUGREPORT_CONTENT_URI, projection,
                 selection, selectionArgs, order);
@@ -171,13 +220,17 @@
 
         if (count > 0) c.moveToFirst();
         for (int i = 0; i < count; i++) {
-            MetaBugReport meta = new MetaBugReport.Builder(getInt(c, COLUMN_ID),
-                    getString(c, COLUMN_TIMESTAMP))
+            MetaBugReport meta = MetaBugReport.builder()
+                    .setId(getInt(c, COLUMN_ID))
+                    .setTimestamp(getString(c, COLUMN_TIMESTAMP))
                     .setUserName(getString(c, COLUMN_USERNAME))
                     .setTitle(getString(c, COLUMN_TITLE))
-                    .setFilepath(getString(c, COLUMN_FILEPATH))
+                    .setBugReportFileName(getString(c, COLUMN_BUGREPORT_FILENAME))
+                    .setAudioFileName(getString(c, COLUMN_AUDIO_FILENAME))
+                    .setFilePath(getString(c, COLUMN_FILEPATH))
                     .setStatus(getInt(c, COLUMN_STATUS))
                     .setStatusMessage(getString(c, COLUMN_STATUS_MESSAGE))
+                    .setType(getInt(c, COLUMN_TYPE))
                     .build();
             bugReports.add(meta);
             c.moveToNext();
@@ -207,7 +260,7 @@
             Log.w(TAG, "Column " + colName + " not found.");
             return "";
         }
-        return c.getString(colIndex);
+        return Strings.nullToEmpty(c.getString(colIndex));
     }
 
     /**
@@ -219,13 +272,6 @@
     }
 
     /**
-     * Sets bugreport status to upload failed.
-     */
-    public static void setUploadFailed(Context context, MetaBugReport bugReport, Exception e) {
-        setBugReportStatus(context, bugReport, Status.STATUS_UPLOAD_FAILED, getRootCauseMessage(e));
-    }
-
-    /**
      * Sets bugreport status pending, and update the message to last exception message.
      *
      * <p>Used when a transient error has occurred.
@@ -244,6 +290,22 @@
         setBugReportStatus(context, bugReport, Status.STATUS_UPLOAD_PENDING, msg);
     }
 
+    /**
+     * Sets {@link MetaBugReport} status {@link Status#STATUS_EXPIRED}.
+     * Deletes the associated zip file from disk.
+     *
+     * @return true if succeeded.
+     */
+    static boolean expireBugReport(@NonNull Context context,
+            @NonNull MetaBugReport metaBugReport, @NonNull Instant expiredAt) {
+        metaBugReport = setBugReportStatus(
+                context, metaBugReport, Status.STATUS_EXPIRED, "Expired on " + expiredAt);
+        if (metaBugReport.getStatus() != Status.STATUS_EXPIRED.getValue()) {
+            return false;
+        }
+        return deleteBugReportFiles(context, metaBugReport.getId());
+    }
+
     /** Gets the root cause of the error. */
     @NonNull
     private static String getRootCauseMessage(@Nullable Throwable t) {
@@ -260,18 +322,52 @@
         return t.getMessage();
     }
 
-    /** Updates bug report record status. */
-    static void setBugReportStatus(
+    /**
+     * Updates bug report record status.
+     *
+     * <p>NOTE: When status is set to STATUS_UPLOAD_PENDING, BugStorageProvider automatically
+     * schedules the bugreport to be uploaded.
+     *
+     * @return Updated {@link MetaBugReport}.
+     */
+    static MetaBugReport setBugReportStatus(
             Context context, MetaBugReport bugReport, Status status, String message) {
-        // update status
+        return update(context, bugReport.toBuilder()
+                .setStatus(status.getValue())
+                .setStatusMessage(message)
+                .build());
+    }
+
+    /**
+     * Updates bug report record status.
+     *
+     * <p>NOTE: When status is set to STATUS_UPLOAD_PENDING, BugStorageProvider automatically
+     * schedules the bugreport to be uploaded.
+     *
+     * @return Updated {@link MetaBugReport}.
+     */
+    static MetaBugReport setBugReportStatus(
+            Context context, MetaBugReport bugReport, Status status, Exception e) {
+        return setBugReportStatus(context, bugReport, status, getRootCauseMessage(e));
+    }
+
+    /**
+     * Updates the bugreport and returns the updated version.
+     *
+     * <p>NOTE: doesn't update all the fields.
+     */
+    static MetaBugReport update(Context context, MetaBugReport bugReport) {
+        // Update only necessary fields.
         ContentValues values = new ContentValues();
-        values.put(COLUMN_STATUS, status.getValue());
-        if (!TextUtils.isEmpty(message)) {
-            values.put(COLUMN_STATUS_MESSAGE, message);
-        }
+        values.put(COLUMN_BUGREPORT_FILENAME, bugReport.getBugReportFileName());
+        values.put(COLUMN_AUDIO_FILENAME, bugReport.getAudioFileName());
+        values.put(COLUMN_STATUS, bugReport.getStatus());
+        values.put(COLUMN_STATUS_MESSAGE, bugReport.getStatusMessage());
         String where = COLUMN_ID + "=" + bugReport.getId();
-        context.getContentResolver().update(BugStorageProvider.BUGREPORT_CONTENT_URI, values,
-                where, null);
+        context.getContentResolver().update(
+                BugStorageProvider.BUGREPORT_CONTENT_URI, values, where, null);
+        return findBugReport(context, bugReport.getId()).orElseThrow(
+                () -> new IllegalArgumentException("Bug " + bugReport.getId() + " not found"));
     }
 
     private static String currentTimestamp() {
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java b/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
new file mode 100644
index 0000000..b253caf
--- /dev/null
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.bugreport;
+
+import android.app.ActivityThread;
+import android.os.Build;
+import android.os.SystemProperties;
+import android.provider.DeviceConfig;
+import android.util.Log;
+
+import com.android.internal.annotations.GuardedBy;
+
+import com.google.common.collect.ImmutableSet;
+
+import java.io.PrintWriter;
+
+/**
+ * Contains config for BugReport App.
+ *
+ * <p>The config is kept synchronized with {@code car} namespace. It's not defined in
+ * {@link DeviceConfig}.
+ *
+ * <ul>To get/set the flags via adb:
+ *   <li>{@code adb shell device_config get car bugreport_upload_destination}
+ *   <li>{@code adb shell device_config put car bugreport_upload_destination gcs}
+ *   <li>{@code adb shell device_config delete car bugreport_upload_destination}
+ * </ul>
+ */
+final class Config {
+    private static final String TAG = Config.class.getSimpleName();
+
+    /**
+     * Namespace for all Android Automotive related features.
+     *
+     * <p>In the future it will move to {@code DeviceConfig#NAMESPACE_CAR}.
+     */
+    private static final String NAMESPACE_CAR = "car";
+
+    /**
+     * A string flag, can be one of {@code null} or {@link #UPLOAD_DESTINATION_GCS}.
+     */
+    private static final String KEY_BUGREPORT_UPLOAD_DESTINATION = "bugreport_upload_destination";
+
+    /**
+     * A value for {@link #KEY_BUGREPORT_UPLOAD_DESTINATION}.
+     *
+     * Upload bugreports to GCS. Only works in {@code userdebug} or {@code eng} builds.
+     */
+    private static final String UPLOAD_DESTINATION_GCS = "gcs";
+
+    /**
+     * A system property to force enable the app bypassing the {@code userdebug/eng} build check.
+     */
+    private static final String PROP_FORCE_ENABLE = "android.car.bugreport.force_enable";
+
+    /*
+     * Enable uploading new bugreports to GCS for these devices. If the device is not in this list,
+     * {@link #KEY_UPLOAD_DESTINATION} flag will be used instead.
+     */
+    private static final ImmutableSet<String> ENABLE_FORCE_UPLOAD_TO_GCS_FOR_DEVICES =
+            ImmutableSet.of("hawk");
+
+    private final Object mLock = new Object();
+
+    @GuardedBy("mLock")
+    private String mUploadDestination = null;
+
+    void start() {
+        DeviceConfig.addOnPropertiesChangedListener(NAMESPACE_CAR,
+                ActivityThread.currentApplication().getMainExecutor(), this::onPropertiesChanged);
+        updateConstants();
+    }
+
+    private void onPropertiesChanged(DeviceConfig.Properties properties) {
+        if (properties.getKeyset().contains(KEY_BUGREPORT_UPLOAD_DESTINATION)) {
+            updateConstants();
+        }
+    }
+
+    /** Returns true if bugreport app is enabled for this device. */
+    static boolean isBugReportEnabled() {
+        return Build.IS_DEBUGGABLE || SystemProperties.getBoolean(PROP_FORCE_ENABLE, false);
+    }
+
+    /** If new bugreports should be scheduled for uploading. */
+    boolean getAutoUpload() {
+        // TODO(b/144851443): Enable auto-upload only if upload destination is Gcs until
+        //                    we create a way to allow implementing OEMs custom upload logic.
+        return isUploadDestinationGcs();
+    }
+
+    /**
+     * Returns {@link true} if bugreport upload destination is GCS.
+     */
+    private boolean isUploadDestinationGcs() {
+        if (isTempForceAutoUploadGcsEnabled()) {
+            Log.d(TAG, "Setting upload dest to GCS ENABLE_AUTO_UPLOAD is true");
+            return true;
+        }
+        // NOTE: enable it only for userdebug/eng builds.
+        return UPLOAD_DESTINATION_GCS.equals(getUploadDestination()) && Build.IS_DEBUGGABLE;
+    }
+
+    private static boolean isTempForceAutoUploadGcsEnabled() {
+        return ENABLE_FORCE_UPLOAD_TO_GCS_FOR_DEVICES.contains(Build.DEVICE);
+    }
+
+    /**
+     * Returns value of a flag {@link #KEY_BUGREPORT_UPLOAD_DESTINATION}.
+     */
+    private String getUploadDestination() {
+        synchronized (mLock) {
+            return mUploadDestination;
+        }
+    }
+
+    private void updateConstants() {
+        synchronized (mLock) {
+            mUploadDestination = DeviceConfig.getString(NAMESPACE_CAR,
+                    KEY_BUGREPORT_UPLOAD_DESTINATION, /* defaultValue= */ null);
+        }
+    }
+
+    void dump(String prefix, PrintWriter pw) {
+        pw.println(prefix + "car.bugreport.Config:");
+
+        pw.print(prefix + "  ");
+        pw.print("getAutoUpload");
+        pw.print("=");
+        pw.println(getAutoUpload() ? "true" : "false");
+
+        pw.print(prefix + "  ");
+        pw.print("getUploadDestination");
+        pw.print("=");
+        pw.println(getUploadDestination());
+
+        pw.print(prefix + "  ");
+        pw.print("isUploadDestinationGcs");
+        pw.print("=");
+        pw.println(isUploadDestinationGcs());
+    }
+}
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/FileUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/FileUtils.java
index 47d05c6..b30035e 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/FileUtils.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/FileUtils.java
@@ -17,6 +17,8 @@
 
 import android.content.Context;
 
+import com.google.common.base.Preconditions;
+
 import java.io.File;
 
 /**
@@ -34,14 +36,16 @@
  */
 public class FileUtils {
     private static final String PREFIX = "bugreport-";
-    // bug reports waiting to be uploaded
+    /** A directory under the system user; contains bugreport zip files and audio files. */
     private static final String PENDING_DIR = "bug_reports_pending";
-    // temporary directory, used for zipping files
+    // Temporary directory under the current user, used for zipping files.
     private static final String TEMP_DIR = "bug_reports_temp";
 
     private static final String FS = "@";
 
-    private static File getPendingDir(Context context) {
+    static File getPendingDir(Context context) {
+        Preconditions.checkArgument(context.getUser().isSystem(),
+                "Must be called from the system user.");
         File dir = new File(context.getDataDir(), PENDING_DIR);
         dir.mkdirs();
         return dir;
@@ -62,15 +66,38 @@
      * single file.
      */
     static File getTempDir(Context context, String timestamp) {
+        Preconditions.checkArgument(!context.getUser().isSystem(),
+                "Must be called from the current user.");
         return new File(context.getDataDir(), TEMP_DIR + "/" + timestamp);
     }
 
     /**
-     * Returns zip file directory with the given timestamp and ldap
+     * Constructs a bugreport zip file name.
+     *
+     * <p>Add lookup code to the filename to allow matching audio file and bugreport file in USB.
      */
-    static File getZipFile(Context context, String timestamp, String ldap) {
-        File zipdir = getPendingDir(context);
-        return new File(zipdir, PREFIX + ldap + FS + timestamp + ".zip");
+    static String getZipFileName(MetaBugReport bug) {
+        String lookupCode = extractLookupCode(bug);
+        return PREFIX + bug.getUserName() + FS + bug.getTimestamp() + "-" + lookupCode + ".zip";
+    }
+
+    /**
+     * Constructs a audio message file name.
+     *
+     * <p>Add lookup code to the filename to allow matching audio file and bugreport file in USB.
+     *
+     * @param timestamp - current timestamp, when audio was created.
+     * @param bug       - a bug report.
+     */
+    static String getAudioFileName(String timestamp, MetaBugReport bug) {
+        String lookupCode = extractLookupCode(bug);
+        return PREFIX + bug.getUserName() + FS + timestamp + "-" + lookupCode + "-message.3gp";
+    }
+
+    private static String extractLookupCode(MetaBugReport bug) {
+        Preconditions.checkArgument(bug.getTitle().startsWith("["),
+                "Invalid bugreport title, doesn't contain lookup code. ");
+        return bug.getTitle().substring(1, BugReportActivity.LOOKUP_STRING_LENGTH + 1);
     }
 
     /**
@@ -99,7 +126,6 @@
         return new File(getTempDir(context, timestamp), name);
     }
 
-
     /**
      * Deletes a directory and its contents recursively
      *
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java
index 7a6de23..eac8b9a 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/JobSchedulingUtils.java
@@ -19,7 +19,6 @@
 import android.app.job.JobScheduler;
 import android.content.ComponentName;
 import android.content.Context;
-import android.os.SystemProperties;
 import android.util.Log;
 
 /**
@@ -32,15 +31,7 @@
     private static final int RETRY_DELAY_IN_MS = 5_000;
 
     /**
-     * The system property to disable auto-upload when bug reports are collected. When auto-upload
-     * is disabled, the app waits for user action on collected bug reports: user can either
-     * upload to Google Cloud or copy to flash drive.
-     */
-    private static final String PROP_DISABLE_AUTO_UPLOAD =
-            "android.car.bugreport.disableautoupload";
-
-    /**
-     * Schedules an upload job under the current user.
+     * Schedules {@link UploadJob} under the current user.
      *
      * <p>Make sure this method is called under the primary user.
      *
@@ -72,15 +63,4 @@
                 .setBackoffCriteria(RETRY_DELAY_IN_MS, JobInfo.BACKOFF_POLICY_LINEAR)
                 .build());
     }
-
-    /**
-     * Returns true if collected bugreports should be uploaded automatically.
-     *
-     * <p>If it returns false, the app maps to an alternative workflow that requires user action
-     * after bugreport is successfully written. A user then has an option to choose whether to
-     * upload the bugreport or copy it to an external drive.
-     */
-    static boolean uploadByDefault() {
-        return !SystemProperties.getBoolean(PROP_DISABLE_AUTO_UPLOAD, false);
-    }
 }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java b/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java
index d309303..fcdb5b7 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/MetaBugReport.java
@@ -15,77 +15,95 @@
  */
 package com.google.android.car.bugreport;
 
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-/** Represents the information that a bugreport can contain. */
-public final class MetaBugReport implements Parcelable {
-    private final int mId;
-    private final String mTimestamp;
-    private final String mTitle;
-    private final String mUsername;
-    private final String mFilePath;
-    private final int mStatus;
-    private final String mStatusMessage;
+import com.google.auto.value.AutoValue;
 
-    private MetaBugReport(Builder builder) {
-        mId = builder.mId;
-        mTimestamp = builder.mTimestamp;
-        mTitle = builder.mTitle;
-        mUsername = builder.mUsername;
-        mFilePath = builder.mFilePath;
-        mStatus = builder.mStatus;
-        mStatusMessage = builder.mStatusMessage;
-    }
+import java.lang.annotation.Retention;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/** Represents the information that a bugreport can contain. */
+@AutoValue
+abstract class MetaBugReport implements Parcelable {
+
+    private static final DateFormat BUG_REPORT_TIMESTAMP_DATE_FORMAT =
+            new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
+
+    /** The app records audio message when initiated. Can change audio state. */
+    static final int TYPE_INTERACTIVE = 0;
+
+    /**
+     * The app doesn't show dialog and doesn't record audio when initiated. It allows user to
+     * add audio message when bugreport is collected.
+     */
+    static final int TYPE_SILENT = 1;
+
+    /** Annotation for bug report types. */
+    @Retention(SOURCE)
+    @IntDef({TYPE_INTERACTIVE, TYPE_SILENT})
+    @interface BugReportType {};
 
     /**
      * @return Id of the bug report. Bug report id monotonically increases and is unique.
      */
-    public int getId() {
-        return mId;
-    }
+    public abstract int getId();
 
     /**
      * @return Username (LDAP) that created this bugreport
      */
-    public String getUsername() {
-        return mUsername == null ? "" : mUsername;
-    }
+    public abstract String getUserName();
 
     /**
      * @return Title of the bug.
      */
-    public String getTitle() {
-        return mTitle == null ? "" : mTitle;
-    }
+    public abstract String getTitle();
 
     /**
      * @return Timestamp when the bug report is initialized.
      */
-    public String getTimestamp() {
-        return mTimestamp == null ? "" : mTimestamp;
-    }
+    public abstract String getTimestamp();
 
     /**
-     * @return path to the zip file
+     * @return path to the zip file stored under the system user.
+     *
+     * <p>NOTE: This is the old way of storing final zipped bugreport. See
+     * {@link BugStorageProvider#URL_SEGMENT_OPEN_FILE} for more info.
      */
-    public String getFilePath() {
-        return mFilePath == null ? "" : mFilePath;
-    }
+    public abstract String getFilePath();
 
     /**
-     * @return Status of the bug upload.
+     * @return filename of the bug report zip file stored under the system user.
      */
-    public int getStatus() {
-        return mStatus;
-    }
+    public abstract String getBugReportFileName();
+
+    /**
+     * @return filename of the audio message file stored under the system user.
+     */
+    public abstract String getAudioFileName();
+
+    /**
+     * @return {@link Status} of the bug upload.
+     */
+    public abstract int getStatus();
 
     /**
      * @return StatusMessage of the bug upload.
      */
-    public String getStatusMessage() {
-        return mStatusMessage == null ? "" : mStatusMessage;
-    }
+    public abstract String getStatusMessage();
+
+    /**
+     * @return {@link BugReportType}.
+     */
+    public abstract int getType();
+
+    /** @return {@link Builder} from the meta bug report. */
+    public abstract Builder toBuilder();
 
     @Override
     public int describeContents() {
@@ -94,13 +112,33 @@
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(mId);
-        dest.writeString(mTimestamp);
-        dest.writeString(mTitle);
-        dest.writeString(mUsername);
-        dest.writeString(mFilePath);
-        dest.writeInt(mStatus);
-        dest.writeString(mStatusMessage);
+        dest.writeInt(getId());
+        dest.writeString(getTimestamp());
+        dest.writeString(getTitle());
+        dest.writeString(getUserName());
+        dest.writeString(getFilePath());
+        dest.writeString(getBugReportFileName());
+        dest.writeString(getAudioFileName());
+        dest.writeInt(getStatus());
+        dest.writeString(getStatusMessage());
+        dest.writeInt(getType());
+    }
+
+    /** Converts {@link Date} to bugreport timestamp. */
+    static String toBugReportTimestamp(Date date) {
+        return BUG_REPORT_TIMESTAMP_DATE_FORMAT.format(date);
+    }
+
+    /** Creates a {@link Builder} with default, non-null values. */
+    static Builder builder() {
+        return new AutoValue_MetaBugReport.Builder()
+                .setTimestamp("")
+                .setFilePath("")
+                .setBugReportFileName("")
+                .setAudioFileName("")
+                .setStatusMessage("")
+                .setTitle("")
+                .setUserName("");
     }
 
     /** A creator that's used by Parcelable. */
@@ -112,14 +150,22 @@
                     String title = in.readString();
                     String username = in.readString();
                     String filePath = in.readString();
+                    String bugReportFileName = in.readString();
+                    String audioFileName = in.readString();
                     int status = in.readInt();
                     String statusMessage = in.readString();
-                    return new Builder(id, timestamp)
+                    int type = in.readInt();
+                    return MetaBugReport.builder()
+                            .setId(id)
+                            .setTimestamp(timestamp)
                             .setTitle(title)
                             .setUserName(username)
-                            .setFilepath(filePath)
+                            .setFilePath(filePath)
+                            .setBugReportFileName(bugReportFileName)
+                            .setAudioFileName(audioFileName)
                             .setStatus(status)
                             .setStatusMessage(statusMessage)
+                            .setType(type)
                             .build();
                 }
 
@@ -129,59 +175,38 @@
             };
 
     /** Builder for MetaBugReport. */
-    public static class Builder {
-        private final int mId;
-        private final String mTimestamp;
-        private String mTitle;
-        private String mUsername;
-        private String mFilePath;
-        private int mStatus;
-        private String mStatusMessage;
+    @AutoValue.Builder
+    abstract static class Builder {
+        /** Sets id. */
+        public abstract Builder setId(int id);
 
-        /**
-         * Initializes MetaBugReport.Builder.
-         *
-         * @param id        - mandatory bugreport id
-         * @param timestamp - mandatory timestamp when bugreport initialized.
-         */
-        public Builder(int id, String timestamp) {
-            mId = id;
-            mTimestamp = timestamp;
-        }
+        /** Sets timestamp. */
+        public abstract Builder setTimestamp(String timestamp);
 
         /** Sets title. */
-        public Builder setTitle(String title) {
-            mTitle = title;
-            return this;
-        }
+        public abstract Builder setTitle(String title);
 
         /** Sets username. */
-        public Builder setUserName(String username) {
-            mUsername = username;
-            return this;
-        }
+        public abstract Builder setUserName(String username);
 
         /** Sets filepath. */
-        public Builder setFilepath(String filePath) {
-            mFilePath = filePath;
-            return this;
-        }
+        public abstract Builder setFilePath(String filePath);
 
-        /** Sets status. */
-        public Builder setStatus(int status) {
-            mStatus = status;
-            return this;
-        }
+        /** Sets bugReportFileName. */
+        public abstract Builder setBugReportFileName(String bugReportFileName);
+
+        /** Sets audioFileName. */
+        public abstract Builder setAudioFileName(String audioFileName);
+
+        /** Sets {@link Status}. */
+        public abstract Builder setStatus(int status);
 
         /** Sets statusmessage. */
-        public Builder setStatusMessage(String statusMessage) {
-            mStatusMessage = statusMessage;
-            return this;
-        }
+        public abstract Builder setStatusMessage(String statusMessage);
 
-        /** Returns a {@link MetaBugReport}. */
-        public MetaBugReport build() {
-            return new MetaBugReport(this);
-        }
+        /** Sets the {@link BugReportType}. */
+        public abstract Builder setType(@BugReportType int type);
+
+        public abstract MetaBugReport build();
     }
 }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/SimpleUploaderAsyncTask.java b/tests/BugReportApp/src/com/google/android/car/bugreport/SimpleUploaderAsyncTask.java
index 97007b1..0e92010 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/SimpleUploaderAsyncTask.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/SimpleUploaderAsyncTask.java
@@ -23,28 +23,30 @@
 
 import com.google.api.client.extensions.android.http.AndroidHttp;
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.InputStreamContent;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.model.StorageObject;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.net.HttpRetryException;
-import java.net.SocketException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.zip.ZipOutputStream;
 
 /**
- * Uploads a file to GCS using a simple (no-multipart / no-resume) upload policy.
+ * Uploads a bugreport files to GCS using a simple (no-multipart / no-resume) upload policy.
+ *
+ * <p>It merges bugreport zip file and audio file into one final zip file and uploads it.
  *
  * <p>Please see {@code res/values/configs.xml} and {@code res/raw/gcs_credentials.json} for the
  * configuration.
@@ -117,14 +119,55 @@
         Storage storage = new Storage.Builder(httpTransport, jsonFactory, credential)
                 .setApplicationName("Bugreportupload/1.0").build();
 
-        File bugReportFile = new File(bugReport.getFilePath());
-        String fileName = bugReportFile.getName();
-        try (FileInputStream inputStream = new FileInputStream(bugReportFile)) {
-            StorageObject object = uploadSimple(storage, bugReport, fileName, inputStream);
-            Log.v(TAG, "finished uploading object " + object.getName() + " file " + fileName);
+        File tmpBugReportFile = zipBugReportFiles(bugReport);
+        Log.d(TAG, "Uploading file " + tmpBugReportFile);
+        try {
+            // Upload filename is bugreport filename, although, now it contains the audio message.
+            String fileName = bugReport.getBugReportFileName();
+            if (Strings.isNullOrEmpty(fileName)) {
+                // Old bugreports don't contain getBugReportFileName, fallback to getFilePath.
+                fileName = new File(bugReport.getFilePath()).getName();
+            }
+            try (FileInputStream inputStream = new FileInputStream(tmpBugReportFile)) {
+                StorageObject object = uploadSimple(storage, bugReport, fileName, inputStream);
+                Log.v(TAG, "finished uploading object " + object.getName() + " file " + fileName);
+            }
+            File pendingDir = FileUtils.getPendingDir(mContext);
+            // Delete only after successful upload; the files are needed for retry.
+            if (!Strings.isNullOrEmpty(bugReport.getAudioFileName())) {
+                Log.v(TAG, "Deleting file " + bugReport.getAudioFileName());
+                new File(pendingDir, bugReport.getAudioFileName()).delete();
+            }
+            if (!Strings.isNullOrEmpty(bugReport.getBugReportFileName())) {
+                Log.v(TAG, "Deleting file " + bugReport.getBugReportFileName());
+                new File(pendingDir, bugReport.getBugReportFileName()).delete();
+            }
+        } finally {
+            // Delete the temp file if it's not a MetaBugReport#getFilePath, because it's needed
+            // for retry.
+            if (Strings.isNullOrEmpty(bugReport.getFilePath())) {
+                Log.v(TAG, "Deleting file " + tmpBugReportFile);
+                tmpBugReportFile.delete();
+            }
         }
-        Log.v(TAG, "Deleting file " + fileName);
-        bugReportFile.delete();
+    }
+
+    private File zipBugReportFiles(MetaBugReport bugReport) throws IOException {
+        if (!Strings.isNullOrEmpty(bugReport.getFilePath())) {
+            // Old bugreports still have this field.
+            return new File(bugReport.getFilePath());
+        }
+        File finalZipFile =
+                File.createTempFile("bugreport", ".zip", mContext.getCacheDir());
+        File pendingDir = FileUtils.getPendingDir(mContext);
+        try (ZipOutputStream zipStream = new ZipOutputStream(
+                new BufferedOutputStream(new FileOutputStream(finalZipFile)))) {
+            ZipUtils.extractZippedFileToZipStream(
+                    new File(pendingDir, bugReport.getBugReportFileName()), zipStream);
+            ZipUtils.addFileToZipStream(
+                    new File(pendingDir, bugReport.getAudioFileName()), zipStream);
+        }
+        return finalZipFile;
     }
 
     @Override
@@ -135,7 +178,7 @@
     /** Returns true is there are more files to upload. */
     @Override
     protected Boolean doInBackground(Void... voids) {
-        List<MetaBugReport> bugReports = BugStorageUtils.getPendingBugReports(mContext);
+        List<MetaBugReport> bugReports = BugStorageUtils.getUploadPendingBugReports(mContext);
 
         for (MetaBugReport bugReport : bugReports) {
             try {
@@ -145,16 +188,10 @@
                 }
                 upload(bugReport);
                 BugStorageUtils.setUploadSuccess(mContext, bugReport);
-            } catch (HttpRetryException | HttpResponseException | SocketException
-                    | InterruptedIOException e) {
+            } catch (Exception e) {
                 Log.e(TAG, String.format("Failed uploading %s - likely a transient error",
                         bugReport.getTimestamp()), e);
                 BugStorageUtils.setUploadRetry(mContext, bugReport, e);
-            } catch (Exception e) {
-                Log.e(TAG,
-                        String.format("Failed uploading %s - giving up", bugReport.getTimestamp()),
-                        e);
-                BugStorageUtils.setUploadFailed(mContext, bugReport, e);
             }
         }
         return false;
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/StartUpBootReceiver.java b/tests/BugReportApp/src/com/google/android/car/bugreport/StartUpBootReceiver.java
index abe729a..7e89d2d 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/StartUpBootReceiver.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/StartUpBootReceiver.java
@@ -33,6 +33,9 @@
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (!Config.isBugReportEnabled()) {
+            return;
+        }
         // Run it only once for the system user (u0) and ignore for other users.
         UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         if (!userManager.isSystemUser()) {
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java b/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java
index 9142b91..380944e 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/Status.java
@@ -42,7 +42,16 @@
     STATUS_MOVE_SUCCESSFUL(7),
 
     // Bugreport move has failed.
-    STATUS_MOVE_FAILED(8);
+    STATUS_MOVE_FAILED(8),
+
+    // Bugreport is moving to USB drive.
+    STATUS_MOVE_IN_PROGRESS(9),
+
+    // Bugreport is expired. Associated file is deleted from the disk.
+    STATUS_EXPIRED(10),
+
+    // Bugreport needs audio message.
+    STATUS_AUDIO_PENDING(11);
 
     private final int mValue;
 
@@ -76,6 +85,12 @@
                 return "Move successful";
             case 8:
                 return "Move failed";
+            case 9:
+                return "Move in progress";
+            case 10:
+                return "Expired";
+            case 11:
+                return "Audio message pending";
         }
         return "unknown";
     }
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/UploadJob.java b/tests/BugReportApp/src/com/google/android/car/bugreport/UploadJob.java
index 67cc560..b2c17e9 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/UploadJob.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/UploadJob.java
@@ -27,6 +27,9 @@
 
     @Override
     public boolean onStartJob(final JobParameters jobParameters) {
+        if (!Config.isBugReportEnabled()) {
+            return false;
+        }
         Log.v(TAG, "Starting upload job");
         mUploader = new SimpleUploaderAsyncTask(
                 this, reschedule -> jobFinished(jobParameters, reschedule));
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java
new file mode 100644
index 0000000..6c50d18
--- /dev/null
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.bugreport;
+
+import android.util.Log;
+
+import com.google.common.io.ByteStreams;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+/** Zip utility functions. */
+final class ZipUtils {
+    private static final String TAG = ZipUtils.class.getSimpleName();
+
+    /** Extracts the contents of a zip file to the zip output stream. */
+    static void extractZippedFileToZipStream(File file, ZipOutputStream zipStream) {
+        if (!file.exists()) {
+            Log.w(TAG, "File " + file + " not found");
+            return;
+        }
+        if (file.length() == 0) {
+            // If there were issues with reading from dumpstate socket, the dumpstate zip
+            // file still might be available in
+            // /data/user_de/0/com.android.shell/files/bugreports/.
+            Log.w(TAG, "Zip file " + file.getName() + " is empty, skipping.");
+            return;
+        }
+        try (ZipFile zipFile = new ZipFile(file)) {
+            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+                try (InputStream stream = zipFile.getInputStream(entry)) {
+                    writeInputStreamToZipStream(entry.getName(), stream, zipStream);
+                }
+            }
+        } catch (IOException e) {
+            Log.w(TAG, "Failed to add " + file + " to zip", e);
+        }
+    }
+
+    /** Adds a file to the zip output stream. */
+    static void addFileToZipStream(File file, ZipOutputStream zipStream) {
+        if (!file.exists()) {
+            Log.w(TAG, "File " + file + " not found");
+            return;
+        }
+        if (file.length() == 0) {
+            Log.w(TAG, "File " + file.getName() + " is empty, skipping.");
+            return;
+        }
+        try (FileInputStream audioInput = new FileInputStream(file)) {
+            writeInputStreamToZipStream(file.getName(), audioInput, zipStream);
+        } catch (IOException e) {
+            Log.w(TAG, "Failed to add " + file + "to the final zip");
+        }
+    }
+
+    /** Writes a new file from input stream to the zip stream. */
+    static void writeInputStreamToZipStream(
+            String filename, InputStream input, ZipOutputStream zipStream) throws IOException {
+        ZipEntry entry = new ZipEntry(filename);
+        zipStream.putNextEntry(entry);
+        ByteStreams.copy(input, zipStream);
+        zipStream.closeEntry();
+    }
+
+    private ZipUtils() {}
+}
diff --git a/tests/BugReportApp/tests/Android.mk b/tests/BugReportApp/tests/Android.mk
new file mode 100644
index 0000000..2a6ab88
--- /dev/null
+++ b/tests/BugReportApp/tests/Android.mk
@@ -0,0 +1,40 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := BugReportAppTest
+LOCAL_INSTRUMENTATION_FOR := BugReportApp
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_CERTIFICATE := platform
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_JAVA_LIBRARIES := \
+    android.test.base \
+    android.test.mock \
+    android.test.runner
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    truth-prebuilt
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
diff --git a/tests/BugReportApp/tests/AndroidManifest.xml b/tests/BugReportApp/tests/AndroidManifest.xml
new file mode 100644
index 0000000..e6a8537
--- /dev/null
+++ b/tests/BugReportApp/tests/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.car.bugreport.tests" >
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:label="BugReportAppTest"
+            android:targetPackage="com.google.android.car.bugreport" />
+</manifest>
diff --git a/tests/BugReportApp/tests/src/com/google/android/car/bugreport/BugStorageUtilsTest.java b/tests/BugReportApp/tests/src/com/google/android/car/bugreport/BugStorageUtilsTest.java
new file mode 100644
index 0000000..747cac4
--- /dev/null
+++ b/tests/BugReportApp/tests/src/com/google/android/car/bugreport/BugStorageUtilsTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.bugreport;
+
+import static com.google.android.car.bugreport.MetaBugReport.TYPE_INTERACTIVE;
+import static com.google.android.car.bugreport.Status.STATUS_PENDING_USER_ACTION;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.time.Instant;
+import java.util.Date;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class BugStorageUtilsTest {
+    private static final String TIMESTAMP_TODAY = MetaBugReport.toBugReportTimestamp(new Date());
+    private static final String BUGREPORT_ZIP_FILE_NAME = "bugreport@ASD.zip";
+    private static final int BUGREPORT_ZIP_FILE_CONTENT = 1;
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getContext();
+    }
+
+    @Test
+    public void test_createBugReport_createsAndReturnsMetaBugReport() throws Exception {
+        MetaBugReport bug = createBugReportWithStatus(TIMESTAMP_TODAY,
+                STATUS_PENDING_USER_ACTION, TYPE_INTERACTIVE, /* createBugReportFile= */ true);
+
+        assertThat(BugStorageUtils.findBugReport(mContext, bug.getId()).get()).isEqualTo(bug);
+    }
+
+    @Test
+    public void test_expireBugReport_marksBugReportDeletedAndDeletesZip() throws Exception {
+        MetaBugReport bug = createBugReportWithStatus(TIMESTAMP_TODAY,
+                STATUS_PENDING_USER_ACTION, TYPE_INTERACTIVE, /* createBugReportFile= */ true);
+        try (InputStream in = BugStorageUtils.openBugReportFileToRead(mContext, bug)) {
+            assertThat(in).isNotNull();
+        }
+        Instant now = Instant.now();
+
+        boolean deleteResult = BugStorageUtils.expireBugReport(mContext, bug, now);
+
+        assertThat(deleteResult).isTrue();
+        assertThat(BugStorageUtils.findBugReport(mContext, bug.getId()).get())
+                .isEqualTo(bug.toBuilder()
+                        .setStatus(Status.STATUS_EXPIRED.getValue())
+                        .setStatusMessage("Expired on " + now).build());
+        assertThrows(FileNotFoundException.class, () ->
+                BugStorageUtils.openBugReportFileToRead(mContext, bug));
+    }
+
+    @Test
+    public void test_completeDeleteBugReport_removesBugReportRecordFromDb() throws Exception {
+        MetaBugReport bug = createBugReportWithStatus(TIMESTAMP_TODAY,
+                STATUS_PENDING_USER_ACTION, TYPE_INTERACTIVE, /* createBugReportFile= */ true);
+        try (InputStream in = BugStorageUtils.openBugReportFileToRead(mContext, bug)) {
+            assertThat(in).isNotNull();
+        }
+
+        boolean deleteResult = BugStorageUtils.completeDeleteBugReport(mContext, bug.getId());
+
+        assertThat(deleteResult).isTrue();
+        assertThat(BugStorageUtils.findBugReport(mContext, bug.getId()).isPresent()).isFalse();
+        assertThrows(IllegalArgumentException.class, () ->
+                BugStorageUtils.openBugReportFileToRead(mContext, bug));
+    }
+
+    private MetaBugReport createBugReportWithStatus(
+            String timestamp, Status status, int type, boolean createBugReportFile)
+            throws IOException {
+        MetaBugReport bugReport = BugStorageUtils.createBugReport(
+                mContext, "sample title", timestamp, "driver", type);
+        if (createBugReportFile) {
+            bugReport = BugStorageUtils.update(mContext,
+                    bugReport.toBuilder().setBugReportFileName(BUGREPORT_ZIP_FILE_NAME).build());
+            try (OutputStream out = BugStorageUtils.openBugReportFileToWrite(mContext, bugReport)) {
+                out.write(BUGREPORT_ZIP_FILE_CONTENT);
+            }
+        }
+        return BugStorageUtils.setBugReportStatus(mContext, bugReport, status, "");
+    }
+
+    private static void assertThrows(Class<? extends Throwable> exceptionClass,
+            ExceptionRunnable r) {
+        try {
+            r.run();
+        } catch (Throwable e) {
+            assertTrue("Expected exception type " + exceptionClass.getName() + " but got "
+                    + e.getClass().getName(), exceptionClass.isAssignableFrom(e.getClass()));
+            return;
+        }
+        fail("Expected exception type " + exceptionClass.getName()
+                + ", but no exception was thrown");
+    }
+
+    private interface ExceptionRunnable {
+        void run() throws Exception;
+    }
+}
diff --git a/tests/BugReportApp/utils/bugreport_app_tester.py b/tests/BugReportApp/utils/bugreport_app_tester.py
index 656f2d7..e86f827 100755
--- a/tests/BugReportApp/utils/bugreport_app_tester.py
+++ b/tests/BugReportApp/utils/bugreport_app_tester.py
@@ -15,6 +15,9 @@
 # limitations under the License.
 """Semi-automatic AAE BugReport App test utility.
 
+WARNING: the script is deprecated, because BugReportApp contains complicated logic of statuses,
+         and the script requires many changes to test them.
+
 It automates most of mundane steps when testing AAE BugReport app, but still
 requires manual input from a tester.
 
@@ -63,6 +66,10 @@
 STATUS_UPLOAD_SUCCESS = 3
 STATUS_UPLOAD_FAILED = 4
 STATUS_USER_CANCELLED = 5
+STATUS_PENDING_USER_ACTION = 6
+STATUS_MOVE_SUCCESSFUL = 7
+STATUS_MOVE_FAILED = 8
+STATUS_MOVE_IN_PROGRESS = 9
 
 DUMPSTATE_DEADLINE_SEC = 300  # 10 minutes.
 UPLOAD_DEADLINE_SEC = 180  # 3 minutes.
@@ -120,6 +127,14 @@
     return 'UPLOAD_FAILED'
   elif status == STATUS_USER_CANCELLED:
     return 'USER_CANCELLED'
+  elif status == STATUS_PENDING_USER_ACTION:
+    return 'PENDING_USER_ACTION'
+  elif status == STATUS_MOVE_SUCCESSFUL:
+    return 'MOVE_SUCCESSFUL'
+  elif status == STATUS_MOVE_FAILED:
+    return 'MOVE_FAILED'
+  elif status == STATUS_MOVE_IN_PROGRESS:
+    return 'MOVE_IN_PROGRESS'
   return 'UNKNOWN_STATUS'
 
 
@@ -356,13 +371,16 @@
     print('\nDumpstate (bugreport) completed (or failed).')
 
   def _wait_for_bugreport_to_upload(self, bugreport_id):
-    """Waits bugreport to be uploaded and returns None if succeeds."""
+    """Waits bugreport to be uploaded and returns None if succeeds.
+
+    NOTE: Depending on configuration BugReportApp will not upload bugreports by default.
+    """
     print('\nWaiting for the bug report to be uploaded.')
     err_msg = self._wait_for_bugreport_status_to_change_to(
         STATUS_UPLOAD_SUCCESS,
         UPLOAD_DEADLINE_SEC,
         bugreport_id,
-        allowed_statuses=[STATUS_UPLOAD_PENDING])
+        allowed_statuses=[STATUS_UPLOAD_PENDING, STATUS_PENDING_USER_ACTION])
     if err_msg:
       print('Failed to upload: %s' % err_msg)
       return err_msg
diff --git a/tests/CarCtsDummyLauncher/src/com/android/car/dummylauncher/LauncherActivity.java b/tests/CarCtsDummyLauncher/src/com/android/car/dummylauncher/LauncherActivity.java
index 20fcfc0..71b3c2b 100644
--- a/tests/CarCtsDummyLauncher/src/com/android/car/dummylauncher/LauncherActivity.java
+++ b/tests/CarCtsDummyLauncher/src/com/android/car/dummylauncher/LauncherActivity.java
@@ -33,6 +33,7 @@
 
         View view = getLayoutInflater().inflate(R.layout.launcher_activity, null);
         setContentView(view);
+        reportFullyDrawn();
     }
 }
 
diff --git a/tests/CarDeveloperOptions/Android.mk b/tests/CarDeveloperOptions/Android.mk
index 02541ff..4ae3a4f 100644
--- a/tests/CarDeveloperOptions/Android.mk
+++ b/tests/CarDeveloperOptions/Android.mk
@@ -53,6 +53,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     telephony-common \
+    android.car.settings \
     ims-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/tests/CarDeveloperOptions/AndroidManifest.xml b/tests/CarDeveloperOptions/AndroidManifest.xml
index 5975572..046b386 100644
--- a/tests/CarDeveloperOptions/AndroidManifest.xml
+++ b/tests/CarDeveloperOptions/AndroidManifest.xml
@@ -21,7 +21,6 @@
     <original-package android:name="com.android.car.developeroptions" />
 
     <uses-permission android:name="android.permission.REQUEST_NETWORK_SCORES" />
-    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
diff --git a/tests/CarDeveloperOptions/res/values-af-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-af-nokeys/strings.xml
new file mode 100644
index 0000000..c0cfed5
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-af-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Bestuur programme"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-af/arrays.xml b/tests/CarDeveloperOptions/res/values-af/arrays.xml
new file mode 100644
index 0000000..3b24efc
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-af/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asië"</item>
+    <item msgid="6683489385344409742">"Australië"</item>
+    <item msgid="5194868215515664953">"Pasifies"</item>
+    <item msgid="7044520255415007865">"Alles"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekondes"</item>
+    <item msgid="772029947136115322">"30 sekondes"</item>
+    <item msgid="8743663928349474087">"1 minuut"</item>
+    <item msgid="1506508631223164814">"2 minute"</item>
+    <item msgid="8664703938127907662">"5 minute"</item>
+    <item msgid="5827960506924849753">"10 minute"</item>
+    <item msgid="6677424950124253938">"30 minute"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nooit"</item>
+    <item msgid="2517785806387977252">"15 sekondes"</item>
+    <item msgid="6347954399441173672">"30 sekondes"</item>
+    <item msgid="4858305253279921789">"1 minuut"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minute"</item>
+    <item msgid="8012672183888404961">"10 minute"</item>
+    <item msgid="8271452751594598661">"30 minute"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Dadelik"</item>
+    <item msgid="2038544972632026612">"5 sekondes"</item>
+    <item msgid="5558060663472279597">"15 sekondes"</item>
+    <item msgid="45341168505452037">"30 sekondes"</item>
+    <item msgid="227647485917789272">"1 minuut"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minute"</item>
+    <item msgid="811192536981678974">"10 minute"</item>
+    <item msgid="7258394417241706272">"30 minute"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Klein"</item>
+    <item msgid="591935967183159581">"Verstek"</item>
+    <item msgid="1714184661981538355">"Groot"</item>
+    <item msgid="6195563047686707484">"Grootste"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skandeer tans…"</item>
+    <item msgid="5597394826455877834">"Verbind tans…"</item>
+    <item msgid="5848277343965362748">"Besig met geldigheidsvasstelling…"</item>
+    <item msgid="3391238031431440676">"Bekom tans IP-adres…"</item>
+    <item msgid="5257597310494000224">"Gekoppel"</item>
+    <item msgid="8472497592913050396">"Afgelas"</item>
+    <item msgid="1228072488815999109">"Ontkoppel tans…"</item>
+    <item msgid="7253087004422991731">"Ontkoppel"</item>
+    <item msgid="4169850917304751227">"Onsuksesvol"</item>
+    <item msgid="6266658166690831131">"Geblokkeer"</item>
+    <item msgid="4517230805854909775">"Vermy tydelik swak verbinding"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skandeer tans …"</item>
+    <item msgid="8058143476674427024">"Koppel tans aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Staaf tans met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Verkry tans jou IP-adres van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Gekoppel aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Afgelas"</item>
+    <item msgid="4133290864821295785">"Ontkoppel tans van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Ontkoppel"</item>
+    <item msgid="2847316776634969068">"Onsuksesvol"</item>
+    <item msgid="4390990424746035383">"Geblokkeer"</item>
+    <item msgid="3618248791367063949">"Vermy tydelik swak verbinding"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Druk knoppie"</item>
+    <item msgid="7401896200768713930">"PIN van eweknietoestel"</item>
+    <item msgid="4526848028011846710">"PIN van dié toestel"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Gekoppel"</item>
+    <item msgid="983792611851499732">"Uitgenooi"</item>
+    <item msgid="5438273405428201793">"Onsuksesvol"</item>
+    <item msgid="4646663015449312554">"Beskikbaar"</item>
+    <item msgid="3230556734162006146">"Buite reikwydte"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minute"</item>
+    <item msgid="2759776603549270587">"5 minute"</item>
+    <item msgid="167772676068860015">"1 uur"</item>
+    <item msgid="5985477119043628504">"Moenie uittel nie"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gebruik stelselverstek: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Swak"</item>
+    <item msgid="7882129634982603782">"Swak"</item>
+    <item msgid="6457357501905996224">"Redelik"</item>
+    <item msgid="405271628162918841">"Goed"</item>
+    <item msgid="999948812884919584">"Uitstekend"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Afgelope 30 dae"</item>
+    <item msgid="3211287705232736964">"Stel gebruiksiklus …"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Gebruikstyd"</item>
+    <item msgid="2784401352592276015">"Laas gebruik"</item>
+    <item msgid="249854287216326349">"Programnaam"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Geen"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Geen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Geen"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Staties"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Geen"</item>
+    <item msgid="1464741437353223198">"Handleiding"</item>
+    <item msgid="5793600062487886090">"Instaan-outo-opstelling"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Geen"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP of CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ongespesifiseer"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Geen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interne toestelberging"</item>
+    <item msgid="3186681694079967527">"Verwyderbare SD-kaart"</item>
+    <item msgid="6902033473986647035">"Laat die stelsel besluit"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Ligging"</item>
+    <item msgid="6842381562497597649">"Persoonlik"</item>
+    <item msgid="3966700236695683444">"Boodskappe"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Toestel"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"growwe ligging"</item>
+    <item msgid="1830619568689922920">"fyn ligging"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibreer"</item>
+    <item msgid="8632513128515114092">"lees kontakte"</item>
+    <item msgid="3741042113569620272">"verander kontakte"</item>
+    <item msgid="4204420969709009931">"lees oproeprekord"</item>
+    <item msgid="2260380357119423209">"verander oproeprekord"</item>
+    <item msgid="6550710385014530934">"lees kalender"</item>
+    <item msgid="3575906174264853951">"verander kalender"</item>
+    <item msgid="4319843242568057174">"Wi-Fi-skandering"</item>
+    <item msgid="2981791890467303819">"kennisgewing"</item>
+    <item msgid="6617825156152476692">"sel-skandering"</item>
+    <item msgid="8865260890611559753">"bel foon"</item>
+    <item msgid="3254999273961542982">"lees SMS"</item>
+    <item msgid="7711446453028825171">"skryf SMS"</item>
+    <item msgid="6123238544099198034">"ontvang SMS"</item>
+    <item msgid="838342167431596036">"ontvang nood-SMS"</item>
+    <item msgid="8554432731560956686">"ontvang MMS"</item>
+    <item msgid="7464863464299515059">"ontvang WAP-stootpos"</item>
+    <item msgid="310463075729606765">"stuur SMS"</item>
+    <item msgid="7338021933527689514">"lees ICC-SMS"</item>
+    <item msgid="6130369335466613036">"skryf ICC-SMS"</item>
+    <item msgid="6536865581421670942">"verander instellings"</item>
+    <item msgid="4547203129183558973">"teken bo-op"</item>
+    <item msgid="9080347512916542840">"kry toegang tot kennisgewings"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"neem oudio op"</item>
+    <item msgid="9182794235292595296">"speel oudio"</item>
+    <item msgid="8760743229597702019">"lees knipbord"</item>
+    <item msgid="2266923698240538544">"verander knipbord"</item>
+    <item msgid="1801619438618539275">"mediaknoppies"</item>
+    <item msgid="31588119965784465">"klankfokus"</item>
+    <item msgid="7565226799008076833">"meestervolume"</item>
+    <item msgid="5420704980305018295">"stemvolume"</item>
+    <item msgid="5797363115508970204">"lui-volume"</item>
+    <item msgid="8233154098550715999">"mediavolume"</item>
+    <item msgid="5196715605078153950">"wekkervolume"</item>
+    <item msgid="394030698764284577">"kennisgewingvolume"</item>
+    <item msgid="8952898972491680178">"bluetoothvolume"</item>
+    <item msgid="8506227454543690851">"hou wakker"</item>
+    <item msgid="1108160036049727420">"monitor ligging"</item>
+    <item msgid="1496205959751719491">"monitor hoë kragligging"</item>
+    <item msgid="3776296279910987380">"kry gebruikstatistiek"</item>
+    <item msgid="8827100324471975602">"demp of ontdemp mikrofoon"</item>
+    <item msgid="6880736730520126864">"wys opspringkennisgewing"</item>
+    <item msgid="4933375960222609935">"projekmedia"</item>
+    <item msgid="8357907018938895462">"aktiveer VPN"</item>
+    <item msgid="8143812849911310973">"skryf muurpapier"</item>
+    <item msgid="6266277260961066535">"bystandstruktuur"</item>
+    <item msgid="7715498149883482300">"bystandskermkiekie"</item>
+    <item msgid="4046679376726313293">"lees foonstaat"</item>
+    <item msgid="6329507266039719587">"voeg stemboodskap by"</item>
+    <item msgid="7692440726415391408">"gebruik SIP"</item>
+    <item msgid="8572453398128326267">"verwerk uitgaande oproep"</item>
+    <item msgid="7775674394089376306">"vingerafdruk"</item>
+    <item msgid="3182815133441738779">"liggaamsensors"</item>
+    <item msgid="2793100005496829513">"lees seluitsendings"</item>
+    <item msgid="2633626056029384366">"maak ligging na"</item>
+    <item msgid="8356842191824684631">"lees berging"</item>
+    <item msgid="5671906070163291500">"skryf berging"</item>
+    <item msgid="2791955098549340418">"skakel skerm aan"</item>
+    <item msgid="5599435119609178367">"kry rekeninge"</item>
+    <item msgid="1165623660533024666">"laat loop op agtergrond"</item>
+    <item msgid="6423861043647911030">"toeganklikheidsvolume"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Ligging"</item>
+    <item msgid="6656077694190491067">"Ligging"</item>
+    <item msgid="8790228218278477369">"Ligging"</item>
+    <item msgid="7836406246005211990">"Vibreer"</item>
+    <item msgid="3951439024549922598">"Lees kontakte"</item>
+    <item msgid="8802152411647068">"Verander kontakte"</item>
+    <item msgid="229544934599698735">"Lees oproeprekord"</item>
+    <item msgid="7396102294405899613">"Verander oproeprekord"</item>
+    <item msgid="3597797992398484655">"Lees kalender"</item>
+    <item msgid="2705975774250907343">"Verander kalender"</item>
+    <item msgid="4668747371441932697">"Ligging"</item>
+    <item msgid="1487578921720243646">"Plaas kennisgewing"</item>
+    <item msgid="4636080349724146638">"Ligging"</item>
+    <item msgid="673510900286463926">"Bel foon"</item>
+    <item msgid="542083422784609790">"Lees SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Skryf SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Ontvang SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Ontvang SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Ontvang SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Ontvang SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Stuur SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Lees SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Skryf SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Verander instellings"</item>
+    <item msgid="8705854389991425629">"Teken bo-op"</item>
+    <item msgid="5861356020344153651">"Kry toegang tot kennisgewings"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Neem oudio op"</item>
+    <item msgid="4516840825756409490">"Speel oudio"</item>
+    <item msgid="6811712502798183957">"Lees knipbord"</item>
+    <item msgid="2780369012602289114">"Verander knipbord"</item>
+    <item msgid="2331359440170850868">"Mediaknoppies"</item>
+    <item msgid="6133599737122751231">"Oudiofokus"</item>
+    <item msgid="6844485713404805301">"Meestervolume"</item>
+    <item msgid="1600379420669104929">"Stemvolume"</item>
+    <item msgid="6296768210470214866">"Luivolume"</item>
+    <item msgid="510690696071629241">"Mediavolume"</item>
+    <item msgid="406861638631430109">"Wekkervolume"</item>
+    <item msgid="4715864795872233884">"Kennisgewingvolume"</item>
+    <item msgid="2311478519251301183">"Bluetoothvolume"</item>
+    <item msgid="5133991377896747027">"Hou wakker"</item>
+    <item msgid="2464189519136248621">"Ligging"</item>
+    <item msgid="2062677934050803037">"Ligging"</item>
+    <item msgid="1735171933192715957">"Kry gebruikstatistiek"</item>
+    <item msgid="1014093788778383554">"Demp of ontdemp mikrofoon"</item>
+    <item msgid="4199297950608622850">"Wys opspringkennisgewing"</item>
+    <item msgid="2527962435313398821">"Projekmedia"</item>
+    <item msgid="5117506254221861929">"Aktiveer VPN"</item>
+    <item msgid="8291198322681891160">"Skryf muurpapier"</item>
+    <item msgid="7106921284621230961">"Bystandstruktuur"</item>
+    <item msgid="4496533640894624799">"Bystandskermkiekie"</item>
+    <item msgid="2598847264853993611">"Lees foonstaat"</item>
+    <item msgid="9215610846802973353">"Voeg stemboodskap by"</item>
+    <item msgid="9186411956086478261">"Gebruik SIP"</item>
+    <item msgid="6884763100104539558">"Verwerk uitgaande oproep"</item>
+    <item msgid="125513972170580692">"Vingerafdruk"</item>
+    <item msgid="2556071024281275619">"Liggaamsensors"</item>
+    <item msgid="617168514928339387">"Lees seluitsendings"</item>
+    <item msgid="7134693570516523585">"Maak ligging na"</item>
+    <item msgid="7224489175375229399">"Lees berging"</item>
+    <item msgid="8472735063903258202">"Skryf berging"</item>
+    <item msgid="4069276819909595110">"Skakel skerm aan"</item>
+    <item msgid="1228338896751121025">"Kry rekeninge"</item>
+    <item msgid="3181581793459233672">"Laat loop op agtergrond"</item>
+    <item msgid="2340936043025374076">"Toeganklikheidsvolume"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kort"</item>
+    <item msgid="4816511817309094890">"Middelmatig"</item>
+    <item msgid="8305084671259331134">"Lank"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Verstek"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif gekondenseer"</item>
+    <item msgid="6529379119163117545">"Sans-serif-enkelspasie"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif-enkelspasie"</item>
+    <item msgid="4448481989108928248">"Gemaklik"</item>
+    <item msgid="4627069151979553527">"Kursief"</item>
+    <item msgid="6896773537705206194">"Klein hoofletters"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Baie klein"</item>
+    <item msgid="5091603983404027034">"Klein"</item>
+    <item msgid="176844712416932112">"Normaal"</item>
+    <item msgid="2784236342175159295">"Groot"</item>
+    <item msgid="218913203203160606">"Baie groot"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Verstek"</item>
+    <item msgid="6488643537808152001">"Geen"</item>
+    <item msgid="552332815156010137">"Raamwerk"</item>
+    <item msgid="7187891159463789272">"Val-skaduwee"</item>
+    <item msgid="8019330250538856521">"Opgehewe"</item>
+    <item msgid="8987385315647049787">"Ingeduik"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Gebruik programverstekke"</item>
+    <item msgid="8611890312638868524">"Wit op swart"</item>
+    <item msgid="5891360837786277638">"Swart op wit"</item>
+    <item msgid="2798457065945456853">"Geel op swart"</item>
+    <item msgid="5799049811524553967">"Geel op blou"</item>
+    <item msgid="3673930830658169860">"Gepasmaak"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN met voorafgedeelde sleutels"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN met sertifikate"</item>
+    <item msgid="312397853907741968">"IPSec VPN met voorafgedeelde sleutels en Xauth-stawing"</item>
+    <item msgid="3319427315593649917">"IPSec VPN met sertifikate en Xauth-stawing"</item>
+    <item msgid="8258927774145391041">"IPSec VPN met sertifikate en hibriedstawing"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Geen"</item>
+    <item msgid="1157046369795346308">"Handleiding"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Ontkoppel"</item>
+    <item msgid="8754480102834556765">"Inisialiseer tans..."</item>
+    <item msgid="3351334355574270250">"Verbind tans…"</item>
+    <item msgid="8303882153995748352">"Gekoppel"</item>
+    <item msgid="9135049670787351881">"Uittelling"</item>
+    <item msgid="2124868417182583926">"Onsuksesvol"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Vra"</item>
+    <item msgid="7718817231348607934">"Moet nooit toelaat dat"</item>
+    <item msgid="8184570120217958741">"Laat altyd toe"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Aanhoudend"</item>
+    <item msgid="167418068739176448">"Topaktiwiteit"</item>
+    <item msgid="4760813290195199773">"Belangrik (voorgrond)"</item>
+    <item msgid="2328684826817647595">"Belangrik (agtergrond)"</item>
+    <item msgid="7746406490652867365">"Rugsteun"</item>
+    <item msgid="5597404364389196754">"Swaargewig"</item>
+    <item msgid="1290888779300174556">"Diens (werk tans)"</item>
+    <item msgid="7241098542073939046">"Diens (herbegin tans)"</item>
+    <item msgid="6610439017684111046">"Ontvanger"</item>
+    <item msgid="7367606086319921117">"Tuis"</item>
+    <item msgid="3344660712396741826">"Laaste aktiwiteit"</item>
+    <item msgid="5006559348883303865">"Gekas (aktiwiteit)"</item>
+    <item msgid="8633480732468137525">"Gekas (aktiwiteitkliënt)"</item>
+    <item msgid="6248998242443333892">"Gekas (leeg)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Blougroen"</item>
+    <item msgid="3228505970082457852">"Blou"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Pers"</item>
+    <item msgid="5932337981182999919">"Pienk"</item>
+    <item msgid="5642914536624000094">"Rooi"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Meer as 30 dae oud"</item>
+    <item msgid="8699273238891265610">"Meer as 60 dae oud"</item>
+    <item msgid="8346279419423837266">"Meer as 90 dae oud"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Bespeur outomaties"</item>
+    <item msgid="773943026484148895">"Hanteer as beperk"</item>
+    <item msgid="1008268820118852416">"Hanteer as onbeperk"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Gebruik ewekansige MAC (verstek)"</item>
+    <item msgid="214234417308375326">"Gebruik toestel-MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nee"</item>
+    <item msgid="1930581185557754880">"Ja"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Donker"</item>
+    <item msgid="5079453644557603349">"Lig"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Af"</item>
+    <item msgid="4072198137051566919">"Ontfout"</item>
+    <item msgid="2473005316958868509">"Woordryk"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Net tuis"</item>
+    <item msgid="1161026694891024702">"Outomaties"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA verkies"</item>
+    <item msgid="7581481130337402578">"Net GSM"</item>
+    <item msgid="8579197487913425819">"Net WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA outomaties"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo outomaties"</item>
+    <item msgid="4219607161971472471">"CDMA sonder EvDo"</item>
+    <item msgid="7278975240951052041">"Net EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globaal"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Net TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globaal"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-af/strings.xml b/tests/CarDeveloperOptions/res/values-af/strings.xml
index ca6d69d..6b63259 100644
--- a/tests/CarDeveloperOptions/res/values-af/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-af/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Beskerm jou tablet met \'n skermslotopsie sodat niemand dat sal kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigstawing op te stel. Tik op Kanselleer, en stel dan \'n PIN of kies \'n ander skermslotopsie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Beskerm jou toestel met \'n skermslotopsie sodat niemand dat sal kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigstawing op te stel. Tik op Kanselleer, en stel dan \'n PIN of kies \'n ander skermslotopsie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Beskerm jou foon met \'n skermslotopsie sodat niemand dat sal kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigstawing op te stel. Tik op Kanselleer, en stel dan \'n PIN of kies \'n ander skermslotopsie."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Slaan PIN-opstelling oor?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Slaan wagwoordopstelling oor?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Slaan patroonopstelling oor?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Stel skermslot op"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobiel"</item>
+    <item msgid="6007360612667098926">"Net Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2151,7 +2153,7 @@
     <string name="captioning_window_color" msgid="8696903405657599896">"Onderskrifvenster se kleur"</string>
     <string name="captioning_window_opacity" msgid="4315586548781763353">"Onderskrifvenster se ondeursigtigheid"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Tekskleur"</string>
-    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Teks-ondeursigtigheid"</string>
+    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Teksondeursigtigheid"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Randkleur"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Randtipe"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Letterfamilie"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Dit sal hierdie foon stadiger maak"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Dwing vol GNSS-metings af"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Spoor alle GNSS-konstellasies en -frekwensies na sonder enige dienssiklussering"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Ontfout wanneer gebruikers wissel"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Wys gedetailleerde inligting wanneer gebruikers wissel"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Laat agtergrondaktiwiteitafskoppe toe"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Laat alle agtergrondaktiwiteitafskoppe toe"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Wys altyd omvaldialoog"</string>
diff --git a/tests/CarDeveloperOptions/res/values-am-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-am-nokeys/strings.xml
new file mode 100644
index 0000000..c2e5b89
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-am-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"መተግበሪያዎች አዸራጅ"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-am/arrays.xml b/tests/CarDeveloperOptions/res/values-am/arrays.xml
new file mode 100644
index 0000000..46bbc7e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-am/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"አሜሪካ"</item>
+    <item msgid="4791956477275129121">"አውሮፓ"</item>
+    <item msgid="3812126832016254559">"አፍሪካ"</item>
+    <item msgid="2765816300353408280">"እስያ"</item>
+    <item msgid="6683489385344409742">"አውስትራሊያ"</item>
+    <item msgid="5194868215515664953">"ፓስፊክ"</item>
+    <item msgid="7044520255415007865">"ሁሉም"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 ሰከንዶች"</item>
+    <item msgid="772029947136115322">"30 ሰከንዶች"</item>
+    <item msgid="8743663928349474087">"1 ደቂቃ"</item>
+    <item msgid="1506508631223164814">"2 ደቂቃዎች"</item>
+    <item msgid="8664703938127907662">"5 ደቂቃዎች"</item>
+    <item msgid="5827960506924849753">"10 ደቂቃዎች"</item>
+    <item msgid="6677424950124253938">"30 ደቂቃዎች"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"በጭራሽ"</item>
+    <item msgid="2517785806387977252">"15 ሰከንዶች"</item>
+    <item msgid="6347954399441173672">"30 ሰከንዶች"</item>
+    <item msgid="4858305253279921789">"1 ደቂቃ"</item>
+    <item msgid="8109273437140044073">"2 ደቂቃዎች"</item>
+    <item msgid="2788593551142462622">"5 ደቂቃዎች"</item>
+    <item msgid="8012672183888404961">"10 ደቂቃዎች"</item>
+    <item msgid="8271452751594598661">"30 ደቂቃዎች"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ወዲያውኑ"</item>
+    <item msgid="2038544972632026612">"5 ሰከንዶች"</item>
+    <item msgid="5558060663472279597">"15 ሰከንዶች"</item>
+    <item msgid="45341168505452037">"30 ሰከንዶች"</item>
+    <item msgid="227647485917789272">"1 ደቂቃ"</item>
+    <item msgid="3367011891231217504">"2 ደቂቃዎች"</item>
+    <item msgid="4376575879222393045">"5 ደቂቃዎች"</item>
+    <item msgid="811192536981678974">"10 ደቂቃዎች"</item>
+    <item msgid="7258394417241706272">"30 ደቂቃዎች"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"አነስተኛ"</item>
+    <item msgid="591935967183159581">"ነባሪ"</item>
+    <item msgid="1714184661981538355">"ትልቅ"</item>
+    <item msgid="6195563047686707484">"በጣም ትልቁ"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"በመቃኘት ላይ....."</item>
+    <item msgid="5597394826455877834">"በማገናኘት ላይ…"</item>
+    <item msgid="5848277343965362748">"በማረጋገጥ ላይ..."</item>
+    <item msgid="3391238031431440676">"የIP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="5257597310494000224">"ተገናኝቷል"</item>
+    <item msgid="8472497592913050396">"ታግዷል"</item>
+    <item msgid="1228072488815999109">"በመለያየት ላይ..."</item>
+    <item msgid="7253087004422991731">"ተለያይቷል"</item>
+    <item msgid="4169850917304751227">"አልተሳካም"</item>
+    <item msgid="6266658166690831131">"ታግዷል"</item>
+    <item msgid="4517230805854909775">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"በመቃኘት ላይ....."</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማያያዝ ላይ..."</item>
+    <item msgid="7547609081339573756">"በ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማረጋገጥ ላይ..."</item>
+    <item msgid="5145158315060185414">"ከ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> የ IP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="3283243151651124831">"ለ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> የተገናኘ"</item>
+    <item msgid="6600156231416890902">"ታግዷል"</item>
+    <item msgid="4133290864821295785">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማለያየት ላይ...."</item>
+    <item msgid="3980154971187953257">"ተለያይቷል"</item>
+    <item msgid="2847316776634969068">"አልተሳካም"</item>
+    <item msgid="4390990424746035383">"ታግዷል"</item>
+    <item msgid="3618248791367063949">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"መግፊያ አዝራር"</item>
+    <item msgid="7401896200768713930">"ፒን ከአቻ መሣሪያ"</item>
+    <item msgid="4526848028011846710">"ከዚህ መሣሪያ ፒን"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"ተገናኝቷል"</item>
+    <item msgid="983792611851499732">"የተጋበዘ"</item>
+    <item msgid="5438273405428201793">"አልተሳካም"</item>
+    <item msgid="4646663015449312554">"የሚገኙ"</item>
+    <item msgid="3230556734162006146">"ከክልል ውጪ"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 ደቂቃዎች"</item>
+    <item msgid="2759776603549270587">"5 ደቂቃዎች"</item>
+    <item msgid="167772676068860015">"1 ሰዓት"</item>
+    <item msgid="5985477119043628504">"በጭራሽ አታቋርጥ"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"የስርዓት ነባሪ ይጠቀሙ፦ <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ደካማ"</item>
+    <item msgid="7882129634982603782">"ደካማ"</item>
+    <item msgid="6457357501905996224">"ደህና"</item>
+    <item msgid="405271628162918841">"ጥሩ"</item>
+    <item msgid="999948812884919584">"እጅግ በጣም ጥሩ"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"የመጨረሻዎቹ 30 ቀኖች"</item>
+    <item msgid="3211287705232736964">"የአጠቃቀም ዑደት አዘጋጅ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ጊዜ አጠቃቀም"</item>
+    <item msgid="2784401352592276015">"ለመጨረሻ ጊዜ ጥቅም ላይ የዋለበት ጊዜ"</item>
+    <item msgid="249854287216326349">"መተግበሪያ ስም"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ምንም"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ምንም የለም"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ሲም"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ምንም"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"አይለወጤ"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ምንም"</item>
+    <item msgid="1464741437353223198">"መመሪያ"</item>
+    <item msgid="5793600062487886090">"የተኪ ራስ-ውቅር"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ምንም"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ወይም CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ያልተገለጸ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"ኤችኤስፒኤፒ"</item>
+    <item msgid="7945352669463358624">"ኤችኤስፒኤ"</item>
+    <item msgid="4152166097223929133">"ኤችኤስዩፒኤ"</item>
+    <item msgid="5134662517319988296">"ኤችኤስፒዲኤ"</item>
+    <item msgid="4997539146036732961">"ዩኤምቲኤስ"</item>
+    <item msgid="4910169712073083585">"ኢዲጂኢ"</item>
+    <item msgid="3505904588897578792">"ጂፒአርኤስ"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"ኢቪዲኦ_B"</item>
+    <item msgid="3440758673769932256">"ኢቪዲኦ_A"</item>
+    <item msgid="1782525731958596741">"ኢቪዲኦ_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ምንም"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"የውስጥ መሣሪያ ማከማቻ"</item>
+    <item msgid="3186681694079967527">"ተወጋጅ SD ካርድ"</item>
+    <item msgid="6902033473986647035">"ስርዓቱ ይወስን"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"አካባቢ"</item>
+    <item msgid="6842381562497597649">"የግል"</item>
+    <item msgid="3966700236695683444">"መልዕክት መላኪያ"</item>
+    <item msgid="8563996233342430477">"ማህደረ መረጃ"</item>
+    <item msgid="5323851085993963783">"መሣሪያ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ግምታዊ አካባቢ"</item>
+    <item msgid="1830619568689922920">"ትክክለኛ አካባቢ"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ንዘር"</item>
+    <item msgid="8632513128515114092">"እውቂያዎችን አንብብ"</item>
+    <item msgid="3741042113569620272">"ዕውቂያዎችዎን ይቀይሩ"</item>
+    <item msgid="4204420969709009931">"የጥሪ ምዝግብ ማስታወሻን ያንብቡ"</item>
+    <item msgid="2260380357119423209">"የጥሪ ምዝግብ ማስታወሻን ይቀይሩ"</item>
+    <item msgid="6550710385014530934">"የቀን መቁጠሪያ አንብብ"</item>
+    <item msgid="3575906174264853951">"የቀን መቁጠሪያን ይቀይሩ"</item>
+    <item msgid="4319843242568057174">"የWi-Fi ቅኝት"</item>
+    <item msgid="2981791890467303819">"ማሳወቂያ"</item>
+    <item msgid="6617825156152476692">"የህዋስ ቅኝት"</item>
+    <item msgid="8865260890611559753">"ወደ ስልክ ደውል"</item>
+    <item msgid="3254999273961542982">"ኤስ ኤም ኤስን ያንብቡ"</item>
+    <item msgid="7711446453028825171">"ኤስ ኤም ኤስ ይጻፉ"</item>
+    <item msgid="6123238544099198034">"ኤስ ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="838342167431596036">"አስቸኳይ ኤስ ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="8554432731560956686">"ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="7464863464299515059">"የደልብዩ ኤ ፒ ግፊት ይቀበሉ"</item>
+    <item msgid="310463075729606765">"ኤስ ኤም ኤስ ይላኩ"</item>
+    <item msgid="7338021933527689514">"የአይ ሲ ሲ ኤስ ኤም ኤስ ያንብቡ"</item>
+    <item msgid="6130369335466613036">"የአይ ሲ ሲ ኤስ ኤም ኤስ ይጻፉ"</item>
+    <item msgid="6536865581421670942">"ቅንብሮችን ይቀይሩ"</item>
+    <item msgid="4547203129183558973">"ከላይ ይሳሉ"</item>
+    <item msgid="9080347512916542840">"ማሳወቂያዎችን ድረስ"</item>
+    <item msgid="5332718516635907742">"ካሜራ"</item>
+    <item msgid="6098422447246167852">"ኦዲዮ ቅረጽ"</item>
+    <item msgid="9182794235292595296">"ድምጽ አጫውት"</item>
+    <item msgid="8760743229597702019">"ቅንጥብ መለያ አንብብ"</item>
+    <item msgid="2266923698240538544">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="1801619438618539275">"የሚዲያ አዝራሮች"</item>
+    <item msgid="31588119965784465">"የድምጽ ትኩረት"</item>
+    <item msgid="7565226799008076833">"ዋናው ድምጽ መቆጣጠሪያ"</item>
+    <item msgid="5420704980305018295">"የድምጽ መጠን"</item>
+    <item msgid="5797363115508970204">"የጥሪ ድምጽ መጠን"</item>
+    <item msgid="8233154098550715999">"የማህደረ መረጃ መጠን"</item>
+    <item msgid="5196715605078153950">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="394030698764284577">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="8952898972491680178">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="8506227454543690851">"እንደነቃ አቆይ"</item>
+    <item msgid="1108160036049727420">"አካባቢን ይቆጣጠሩ"</item>
+    <item msgid="1496205959751719491">"የከፍተኛ ኃይል አካባቢ ተከታተል"</item>
+    <item msgid="3776296279910987380">"የአጠቃቀም ስታቲስቲክስ ያግኙ"</item>
+    <item msgid="8827100324471975602">"ማይክሮፎን ድምፅ-ከል አድርግ/አንሳ"</item>
+    <item msgid="6880736730520126864">"ቶስት አሳይ"</item>
+    <item msgid="4933375960222609935">"ፕሮጀክት ሚዲያ"</item>
+    <item msgid="8357907018938895462">"VPN አግብር"</item>
+    <item msgid="8143812849911310973">"ልጣፍ ይጻፉ"</item>
+    <item msgid="6266277260961066535">"የረዳት መዋቅር"</item>
+    <item msgid="7715498149883482300">"የረዳት ቅጽበታዊ ገጽ እይታ"</item>
+    <item msgid="4046679376726313293">"የስልክ ግዛት ያንብቡ"</item>
+    <item msgid="6329507266039719587">"የድምፅ መልዕክት ያክሉ"</item>
+    <item msgid="7692440726415391408">"sip ይጠቀሙ"</item>
+    <item msgid="8572453398128326267">"ወጪ ጥሪን አስኪድ"</item>
+    <item msgid="7775674394089376306">"የጣት አሻራ"</item>
+    <item msgid="3182815133441738779">"የሰውነት ዳሳሾች"</item>
+    <item msgid="2793100005496829513">"የተንቀሳቃሽ ስልክ ስርጭቶችን ያንብቡ"</item>
+    <item msgid="2633626056029384366">"የቀልድ መገኛ አካባቢ"</item>
+    <item msgid="8356842191824684631">"ማከማቻ ያንብቡ"</item>
+    <item msgid="5671906070163291500">"ማከማቻ ይጻፉ"</item>
+    <item msgid="2791955098549340418">"ማያ ገጽ አብራ"</item>
+    <item msgid="5599435119609178367">"መለያዎችን ያግኙ"</item>
+    <item msgid="1165623660533024666">"ዳራ ውስጥ አሂድ"</item>
+    <item msgid="6423861043647911030">"የተደራሽነት መጠን"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"አካባቢ"</item>
+    <item msgid="6656077694190491067">"አካባቢ"</item>
+    <item msgid="8790228218278477369">"አካባቢ"</item>
+    <item msgid="7836406246005211990">"ንዘር"</item>
+    <item msgid="3951439024549922598">"እውቂያዎችን አንብብ"</item>
+    <item msgid="8802152411647068">"ዕውቂያዎችዎን ይቀይሩ"</item>
+    <item msgid="229544934599698735">"የጥሪ ምዝግብ ማስታወሻን ያንብቡ"</item>
+    <item msgid="7396102294405899613">"የጥሪ ምዝግብ ማስታወሻን ይቀይሩ"</item>
+    <item msgid="3597797992398484655">"የቀን መቁጠሪያ ያንብቡ"</item>
+    <item msgid="2705975774250907343">"የቀን መቁጠሪያን ይቀይሩ"</item>
+    <item msgid="4668747371441932697">"አካባቢ"</item>
+    <item msgid="1487578921720243646">"ማሳወቂያ ለጥፍ"</item>
+    <item msgid="4636080349724146638">"አካባቢ"</item>
+    <item msgid="673510900286463926">"ወደ ስልክ ደውል"</item>
+    <item msgid="542083422784609790">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ያንብቡ"</item>
+    <item msgid="1033780373029588436">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይጻፉ"</item>
+    <item msgid="5647111115517787488">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="8591105601108455893">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="7730995008517841903">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="2613033109026626086">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="3037159047591081136">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይላኩ"</item>
+    <item msgid="4726682243833913568">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ያንብቡ"</item>
+    <item msgid="6555678522277865572">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይጻፉ"</item>
+    <item msgid="6981734935578130884">"ቅንብሮችን ይቀይሩ"</item>
+    <item msgid="8705854389991425629">"ከላይ ይሳሉ"</item>
+    <item msgid="5861356020344153651">"ማሳወቂያዎችን ይድረሱ"</item>
+    <item msgid="78432174621628659">"ካሜራ"</item>
+    <item msgid="3986116419882154794">"ኦዲዮ ቅረጽ"</item>
+    <item msgid="4516840825756409490">"ድምጽ አጫውት"</item>
+    <item msgid="6811712502798183957">"ቅንጥብ ሰሌዳ አንብብ"</item>
+    <item msgid="2780369012602289114">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="2331359440170850868">"የሚዲያ አዝራሮች"</item>
+    <item msgid="6133599737122751231">"የድምጽ ትኩረት"</item>
+    <item msgid="6844485713404805301">"ዋናው የድምጽ መቆጣጠሪያ"</item>
+    <item msgid="1600379420669104929">"የድምጽ መጠን"</item>
+    <item msgid="6296768210470214866">"የጥሪ ድምጽ መጠን"</item>
+    <item msgid="510690696071629241">"የማህደረመረጃ ክፍልፍል"</item>
+    <item msgid="406861638631430109">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="4715864795872233884">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="2311478519251301183">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="5133991377896747027">"ነቃ ብሏል"</item>
+    <item msgid="2464189519136248621">"ስፍራ"</item>
+    <item msgid="2062677934050803037">"አካባቢ"</item>
+    <item msgid="1735171933192715957">"የአጠቃቀም ስታቲስቲክሶችን ያግኙ"</item>
+    <item msgid="1014093788778383554">"ማይክሮፎን ድምፅ-ከል አድርግ/አንሳ"</item>
+    <item msgid="4199297950608622850">"ቶስት አሳይ"</item>
+    <item msgid="2527962435313398821">"ፕሮጀክት ሚዲያ"</item>
+    <item msgid="5117506254221861929">"VPN አግብር"</item>
+    <item msgid="8291198322681891160">"ልጣፍ ይጻፉ"</item>
+    <item msgid="7106921284621230961">"የረዳት መዋቅር"</item>
+    <item msgid="4496533640894624799">"የረዳት ቅጽበታዊ ገጽ እይታ"</item>
+    <item msgid="2598847264853993611">"የስልክ ግዛት ያንብቡ"</item>
+    <item msgid="9215610846802973353">"የድምጽ መልዕክት ያክሉ"</item>
+    <item msgid="9186411956086478261">"sip ይጠቀሙ"</item>
+    <item msgid="6884763100104539558">"ወጪ ጥሪን አስኪድ"</item>
+    <item msgid="125513972170580692">"የጣት አሻራ"</item>
+    <item msgid="2556071024281275619">"የሰውነት ዳሳሾች"</item>
+    <item msgid="617168514928339387">"የተንቀሳቃሽ ስልክ ስርጭቶችን ያንብቡ"</item>
+    <item msgid="7134693570516523585">"የቀልድ መገኛ አካባቢ"</item>
+    <item msgid="7224489175375229399">"ማከማቻ ያንብቡ"</item>
+    <item msgid="8472735063903258202">"ማከማቻ ይጻፉ"</item>
+    <item msgid="4069276819909595110">"ማያ ገጽ አብራ"</item>
+    <item msgid="1228338896751121025">"መለያዎችን ያግኙ"</item>
+    <item msgid="3181581793459233672">"ዳራ ውስጥ አሂድ"</item>
+    <item msgid="2340936043025374076">"የተደራሽነት መጠን"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"አጭር"</item>
+    <item msgid="4816511817309094890">"መካከለኛ"</item>
+    <item msgid="8305084671259331134">"ረጅም"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ነባሪ"</item>
+    <item msgid="4147246073737933622">"ጭረት-አልባ"</item>
+    <item msgid="3117680749167407907">"ጭረት-አልባ ተጨምቆ"</item>
+    <item msgid="6529379119163117545">"ሳንስ ሰሪፍ ሞኖስፔስ"</item>
+    <item msgid="1487203730637617924">"ባለጭረት"</item>
+    <item msgid="4937790671987480464">"ሰሪፍ ሞኖስፔስ"</item>
+    <item msgid="4448481989108928248">"የተለመደ"</item>
+    <item msgid="4627069151979553527">"ቅጥልጥል"</item>
+    <item msgid="6896773537705206194">"ትንሽ አብይ ሆሄያት"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"በጣም ትንሽ"</item>
+    <item msgid="5091603983404027034">"ትንሽ"</item>
+    <item msgid="176844712416932112">"መደበኛ"</item>
+    <item msgid="2784236342175159295">"ትልቅ"</item>
+    <item msgid="218913203203160606">"በጣም ትልቅ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ነባሪ"</item>
+    <item msgid="6488643537808152001">"ምንም"</item>
+    <item msgid="552332815156010137">"ቢጋር"</item>
+    <item msgid="7187891159463789272">"ጥላጣል"</item>
+    <item msgid="8019330250538856521">"ከፍ የተደረገ"</item>
+    <item msgid="8987385315647049787">"የተኛ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"የመተግበሪያ ነባሪዎችን ይጠቀሙ"</item>
+    <item msgid="8611890312638868524">"ነጭ በጥቁር ላይ"</item>
+    <item msgid="5891360837786277638">"ጥቁር በነጭ ላይ"</item>
+    <item msgid="2798457065945456853">"ቢጫ በጥቁር ላይ"</item>
+    <item msgid="5799049811524553967">"ቢጫ በሰማያዊ ላይ"</item>
+    <item msgid="3673930830658169860">"ብጁ"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN ከቅድመ-ተጋሪ ቁልፎች ጋር"</item>
+    <item msgid="6128519070545038358">"የL2TP/IPSec VPN ከምስክሮችጋር"</item>
+    <item msgid="312397853907741968">"የIPSec VPN በቅድመ ተጋሪ ቁልፎችእና በXauth ማረጋገጥ"</item>
+    <item msgid="3319427315593649917">"የIPSec VPN በምስክር እና በXauth ማረጋገጥ"</item>
+    <item msgid="8258927774145391041">"የIPSec VPN በዕውቅና ማረጋገጫ  እና በድቀላ ማረጋገጥ"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ምንም"</item>
+    <item msgid="1157046369795346308">"መመሪያ"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"ተለያይቷል"</item>
+    <item msgid="8754480102834556765">"እየጀመረ ነው…"</item>
+    <item msgid="3351334355574270250">"በማገናኘት ላይ…"</item>
+    <item msgid="8303882153995748352">"ተገናኝቷል"</item>
+    <item msgid="9135049670787351881">"ጊዜው አልቋል"</item>
+    <item msgid="2124868417182583926">"አልተሳካም"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ጠይቅ"</item>
+    <item msgid="7718817231348607934">"በጭራሽ አትፍቀድ"</item>
+    <item msgid="8184570120217958741">"ሁልጊዜ ፍቀድ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"የሚጸና"</item>
+    <item msgid="167418068739176448">"ከፍተኛ እንቅስቃሴ"</item>
+    <item msgid="4760813290195199773">"አስፈላጊ (ከፊት)"</item>
+    <item msgid="2328684826817647595">"አስፈላጊ (ከጀርባ)"</item>
+    <item msgid="7746406490652867365">"ምትኬ"</item>
+    <item msgid="5597404364389196754">"ከባድ ስራ"</item>
+    <item msgid="1290888779300174556">"አገልግሎት (እያሄዱ ያለ)"</item>
+    <item msgid="7241098542073939046">"አገልግሎት (ዳግም በማስጀመር ላይ)"</item>
+    <item msgid="6610439017684111046">"ተቀባይ"</item>
+    <item msgid="7367606086319921117">"መነሻ"</item>
+    <item msgid="3344660712396741826">"የመጨረሻ እንቅስቃሴ"</item>
+    <item msgid="5006559348883303865">"የተሸጎጠ (እንቅስቃሴ)"</item>
+    <item msgid="8633480732468137525">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
+    <item msgid="6248998242443333892">"የተሸጎጠ (ባዶ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ጥቁር አረንጓዴ-ሰማያዊ"</item>
+    <item msgid="3228505970082457852">"ሰማያዊ"</item>
+    <item msgid="6590260735734795647">"ወይን ጠጅ"</item>
+    <item msgid="3521763377357218577">"ወይን ጠጅ"</item>
+    <item msgid="5932337981182999919">"ሮዝ"</item>
+    <item msgid="5642914536624000094">"ቀይ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"ከ30 ቀኖች በላይ የሆናቸው"</item>
+    <item msgid="8699273238891265610">"ከ60 ቀኖች በላይ የሆናቸው"</item>
+    <item msgid="8346279419423837266">"ከ90 ቀኖች በላይ የሆናቸው"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"በራስ-ሰር አግኝ"</item>
+    <item msgid="773943026484148895">"እንደ ተለካ አስተናግድ"</item>
+    <item msgid="1008268820118852416">"እንደ ያልተለካ አስተናግድ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"የዘፈቀደ ማክ ይጠቀሙ (ነባሪ)"</item>
+    <item msgid="214234417308375326">"የመሣሪያ MAC ይጠቀሙ"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"የለም"</item>
+    <item msgid="1930581185557754880">"አዎ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ጨለማ"</item>
+    <item msgid="5079453644557603349">"ቀላል"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ጠፍቷል"</item>
+    <item msgid="4072198137051566919">"አርም"</item>
+    <item msgid="2473005316958868509">"ዝርክርክ ቃላት"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"መነሻ ብቻ"</item>
+    <item msgid="1161026694891024702">"ራስ-ሰር"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA ይመረጣል"</item>
+    <item msgid="7581481130337402578">"GSM ብቻ"</item>
+    <item msgid="8579197487913425819">"WCDMA ብቻ"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ራስ-ሰር"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ራስ-ሰር"</item>
+    <item msgid="4219607161971472471">"CDMA ያለEvDo"</item>
+    <item msgid="7278975240951052041">"EvDo ብቻ"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ሁለንተናዊ"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA ብቻ"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ሁለንተናዊ"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-am/strings.xml b/tests/CarDeveloperOptions/res/values-am/strings.xml
index 06fb06d..8cc3ee5 100644
--- a/tests/CarDeveloperOptions/res/values-am/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-am/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ከጠፋ ወይም ከተሰረቀ ማንም ሊጠቀምበት እንዳይችል ከማያ ገጽ መቆለፊያ አማራጭ ጋር የእርስዎን ጡባዊ ጥበቃ ያድርጉለት። በተጨማሪ የመልክ ማረጋገጫን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ተወው የሚለውን መታ ያድርጉና በመቀጠል ፒን ያቀናብሩ ወይም ሌላ የማያ ገጽ መቆለፊያ አማራጭ ይምረጡ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ከጠፋ ወይም ከተሰረቀ ማንም ሊጠቀምበት እንዳይችል ከማያ ገጽ መቆለፊያ አማራጭ ጋር የእርስዎን መሣሪያ ጥበቃ ያድርጉለት። በተጨማሪ የመልክ ማረጋገጫን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ተወው የሚለውን መታ ያድርጉና በመቀጠል ፒን ያቀናብሩ ወይም ሌላ የማያ ገጽ መቆለፊያ አማራጭ ይምረጡ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ከጠፋ ወይም ከተሰረቀ ማንም ሊጠቀምበት እንዳይችል ከማያ ገጽ መቆለፊያ አማራጭ ጋር የእርስዎን ስልክ ጥበቃ ያድርጉለት። በተጨማሪ የመልክ ማረጋገጫን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ተወው የሚለውን መታ ያድርጉና በመቀጠል ፒን ያቀናብሩ ወይም ሌላ የማያ ገጽ መቆለፊያ አማራጭ ይምረጡ።"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"የፒን ቅንብር ይዘለል?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"የይለፍ ቃል ቅንብር ይዘለል?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"የሥርዓተ ጥለት ቅንብር ይዘለል?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ማያ ገጽ መቆለፊያ ያዋቅሩ"</string>
@@ -757,10 +756,10 @@
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"የሚገኙ መሣሪያዎች"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"ምንም መሣሪያዎች አይገኙም"</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"አያይዝ"</string>
-    <string name="bluetooth_device_context_disconnect" msgid="8085015949275771802">"አለያይ"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8085015949275771802">"ግንኙነት አቋርጥ"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="1503322591778810032">"አጣምር&amp;  አያይዝ"</string>
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"አታጣምር"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"አለያይ &amp; አልተጣመረም"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"ግንኙነት አቋርጥ &amp; አልተጣመረም"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"አማራጮች…"</string>
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"ከፍተኛ"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"ከፍተኛ ብሉቱዝ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ተንቀሳቃሽ ስልክ"</item>
+    <item msgid="6007360612667098926">"Wi-Fi ብቻ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ይህን ስልክ ያዘገየዋል"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"ሙሉ የGNSS መለኪያዎች አስገድድ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ሁሉንም የGNSS ህብረ ፎቶዎችን እና ድግምግሞሾችን ያለምንም የሥራ ብስክሌት ግልቢያ ዱካቸውን ይከታተሉ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"የተጠቃሚ ለውጥን አርም"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"በተጠቃሚ ለውጥ ጊዜ ዝርዝር መረጃን አሳይ"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"የበስተጀርባ እንቅስቃሴ ጅምሮችን ፍቀድ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"ሁሉም የበስተጀርባ እንቅስቃሴ ጅምሮችን ይፈቅዳል"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"የስንክል ንግግር ሳጥንን ሁልጊዜ አሳይ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ar-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ar-nokeys/strings.xml
new file mode 100644
index 0000000..dd6b531
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ar-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"إدارة التطبيقات"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ar/arrays.xml b/tests/CarDeveloperOptions/res/values-ar/arrays.xml
new file mode 100644
index 0000000..e6e5ee5
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ar/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"أمريكا"</item>
+    <item msgid="4791956477275129121">"أوروبا"</item>
+    <item msgid="3812126832016254559">"إفريقيا"</item>
+    <item msgid="2765816300353408280">"آسيا"</item>
+    <item msgid="6683489385344409742">"أستراليا"</item>
+    <item msgid="5194868215515664953">"المحيط الهادئ"</item>
+    <item msgid="7044520255415007865">"الكل"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 ثانية"</item>
+    <item msgid="772029947136115322">"30 ثانية"</item>
+    <item msgid="8743663928349474087">"دقيقة واحدة"</item>
+    <item msgid="1506508631223164814">"دقيقتان"</item>
+    <item msgid="8664703938127907662">"٥ دقائق"</item>
+    <item msgid="5827960506924849753">"۱۰ دقائق"</item>
+    <item msgid="6677424950124253938">"۳۰ دقيقة"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"عدم التشغيل أبدًا"</item>
+    <item msgid="2517785806387977252">"١٥ ثانية"</item>
+    <item msgid="6347954399441173672">"30 ثانية"</item>
+    <item msgid="4858305253279921789">"دقيقة واحدة"</item>
+    <item msgid="8109273437140044073">"دقيقتان"</item>
+    <item msgid="2788593551142462622">"٥ دقائق"</item>
+    <item msgid="8012672183888404961">"۱۰ دقائق"</item>
+    <item msgid="8271452751594598661">"30 دقيقة"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"فورًا"</item>
+    <item msgid="2038544972632026612">"٥ ثوانٍ"</item>
+    <item msgid="5558060663472279597">"١٥ ثانية"</item>
+    <item msgid="45341168505452037">"30 ثانية"</item>
+    <item msgid="227647485917789272">"دقيقة واحدة"</item>
+    <item msgid="3367011891231217504">"دقيقتان"</item>
+    <item msgid="4376575879222393045">"٥ دقائق"</item>
+    <item msgid="811192536981678974">"۱۰ دقائق"</item>
+    <item msgid="7258394417241706272">"۳۰ دقيقة"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"صغير"</item>
+    <item msgid="591935967183159581">"تلقائي"</item>
+    <item msgid="1714184661981538355">"كبير"</item>
+    <item msgid="6195563047686707484">"الأكبر"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"البحث عن الشبكات..."</item>
+    <item msgid="5597394826455877834">"جارٍ الاتصال..."</item>
+    <item msgid="5848277343965362748">"جارٍ المصادقة..."</item>
+    <item msgid="3391238031431440676">"جارٍ الحصول على عنوان IP…"</item>
+    <item msgid="5257597310494000224">"متّصلة"</item>
+    <item msgid="8472497592913050396">"معلق"</item>
+    <item msgid="1228072488815999109">"جارٍ قطع الاتصال..."</item>
+    <item msgid="7253087004422991731">"غير متصل"</item>
+    <item msgid="4169850917304751227">"غير ناجح"</item>
+    <item msgid="6266658166690831131">"محظور"</item>
+    <item msgid="4517230805854909775">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"جارٍ البحث..."</item>
+    <item msgid="8058143476674427024">"جارٍ الاتصال بجهاز <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"جارٍ المصادقة مع <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"جارٍ الحصول على عنوان IP من <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"متصل بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"معلق"</item>
+    <item msgid="4133290864821295785">"جارٍ قطع الاتصال بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"غير متصل"</item>
+    <item msgid="2847316776634969068">"غير ناجح"</item>
+    <item msgid="4390990424746035383">"محظور"</item>
+    <item msgid="3618248791367063949">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"زر الدفع"</item>
+    <item msgid="7401896200768713930">"رقم تعريف شخصي من جهاز نظير"</item>
+    <item msgid="4526848028011846710">"رقم التعريف من هذا الجهاز"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"متّصلة"</item>
+    <item msgid="983792611851499732">"مدعو"</item>
+    <item msgid="5438273405428201793">"غير ناجح"</item>
+    <item msgid="4646663015449312554">"متوفرة"</item>
+    <item msgid="3230556734162006146">"خارج النطاق"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"دقيقتان"</item>
+    <item msgid="2759776603549270587">"5 دقائق"</item>
+    <item msgid="167772676068860015">"ساعة واحدة"</item>
+    <item msgid="5985477119043628504">"بلا مهلة"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"استخدام الإعداد التلقائي للنظام: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"١"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"٥"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ضعيفة"</item>
+    <item msgid="7882129634982603782">"ضعيفة"</item>
+    <item msgid="6457357501905996224">"متوسطة"</item>
+    <item msgid="405271628162918841">"جيدة"</item>
+    <item msgid="999948812884919584">"ممتازة"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"آخر ۳۰ يومًا"</item>
+    <item msgid="3211287705232736964">"تعيين دورة الاستخدام..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"وقت الاستخدام"</item>
+    <item msgid="2784401352592276015">"آخر مرة تم استخدامه"</item>
+    <item msgid="249854287216326349">"اسم التطبيق"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"بدون"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"بدون"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"شريحة SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'‎"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"بدون"</item>
+    <item msgid="7901133332272818442">"بروتوكول مصادقة كلمات المرور"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"ثابت"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"بدون خادم وكيل"</item>
+    <item msgid="1464741437353223198">"الكتيب"</item>
+    <item msgid="5793600062487886090">"إعداد الوكيل تلقائيًا"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"بدون"</item>
+    <item msgid="1950796738039490374">"بروتوكول مصادقة كلمات المرور"</item>
+    <item msgid="8166687999538788787">"بروتوكول CHAP"</item>
+    <item msgid="1276004657191968988">"بروتوكول مصادقة كلمات المرور أو بروتوكول CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"غير محدد"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"بدون"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"مساحة تخزين الجهاز الداخلية"</item>
+    <item msgid="3186681694079967527">"بطاقة SD قابلة للإزالة"</item>
+    <item msgid="6902033473986647035">"ترك القرار للنظام"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"الموقع"</item>
+    <item msgid="6842381562497597649">"شخصي"</item>
+    <item msgid="3966700236695683444">"المراسلة"</item>
+    <item msgid="8563996233342430477">"الوسائط"</item>
+    <item msgid="5323851085993963783">"جهاز"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"الموقع التقريبي"</item>
+    <item msgid="1830619568689922920">"الموقع الدقيق"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"اهتزاز"</item>
+    <item msgid="8632513128515114092">"قراءة جهات الاتصال"</item>
+    <item msgid="3741042113569620272">"تعديل جهات الاتصال"</item>
+    <item msgid="4204420969709009931">"قراءة سجل المكالمات"</item>
+    <item msgid="2260380357119423209">"تعديل سجل المكالمات"</item>
+    <item msgid="6550710385014530934">"قراءة التقويم"</item>
+    <item msgid="3575906174264853951">"تعديل التقويم"</item>
+    <item msgid="4319843242568057174">"فحص Wi-Fi"</item>
+    <item msgid="2981791890467303819">"إشعار"</item>
+    <item msgid="6617825156152476692">"فحص الشبكة الخلوية"</item>
+    <item msgid="8865260890611559753">"اتصال هاتفي"</item>
+    <item msgid="3254999273961542982">"قراءة الرسائل القصيرة SMS"</item>
+    <item msgid="7711446453028825171">"كتابة الرسائل القصيرة SMS"</item>
+    <item msgid="6123238544099198034">"تلقي الرسائل القصيرة SMS"</item>
+    <item msgid="838342167431596036">"تلقي الرسائل القصيرة SMS في حالة الطوارئ"</item>
+    <item msgid="8554432731560956686">"تلقي رسائل الوسائط المتعددة (MMS)"</item>
+    <item msgid="7464863464299515059">"تلقي رسائل WAP push"</item>
+    <item msgid="310463075729606765">"إرسال رسائل قصيرة SMS"</item>
+    <item msgid="7338021933527689514">"قراءة الرسائل القصيرة SMS لبطاقة ICC"</item>
+    <item msgid="6130369335466613036">"كتابة الرسائل القصيرة SMS لبطاقة ICC"</item>
+    <item msgid="6536865581421670942">"تعديل الإعدادات"</item>
+    <item msgid="4547203129183558973">"رسم في الأعلى"</item>
+    <item msgid="9080347512916542840">"إشعارات الدخول"</item>
+    <item msgid="5332718516635907742">"الكاميرا"</item>
+    <item msgid="6098422447246167852">"تسجيل الصوت"</item>
+    <item msgid="9182794235292595296">"تشغيل الصوت"</item>
+    <item msgid="8760743229597702019">"قراءة الحافظة"</item>
+    <item msgid="2266923698240538544">"تعديل الحافظة"</item>
+    <item msgid="1801619438618539275">"أزرار الوسائط"</item>
+    <item msgid="31588119965784465">"التركيز على الصوت"</item>
+    <item msgid="7565226799008076833">"مستوى الصوت الرئيسي"</item>
+    <item msgid="5420704980305018295">"مستوى الصوت"</item>
+    <item msgid="5797363115508970204">"مستوى صوت الرنين"</item>
+    <item msgid="8233154098550715999">"مستوى صوت الوسائط"</item>
+    <item msgid="5196715605078153950">"مستوى صوت المنبّه"</item>
+    <item msgid="394030698764284577">"مستوى صوت الإشعار"</item>
+    <item msgid="8952898972491680178">"مستوى صوت البلوتوث"</item>
+    <item msgid="8506227454543690851">"البقاء في الوضع النشط"</item>
+    <item msgid="1108160036049727420">"مراقبة الموقع"</item>
+    <item msgid="1496205959751719491">"مراقبة موقع متميز"</item>
+    <item msgid="3776296279910987380">"الحصول على إحصاءات الاستخدام"</item>
+    <item msgid="8827100324471975602">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
+    <item msgid="6880736730520126864">"عرض الإعلام المنبثق"</item>
+    <item msgid="4933375960222609935">"وسائط المشروع"</item>
+    <item msgid="8357907018938895462">"تفعيل الشبكة الافتراضية الخاصة"</item>
+    <item msgid="8143812849911310973">"كتابة الخلفية"</item>
+    <item msgid="6266277260961066535">"تركيبة مساعدة"</item>
+    <item msgid="7715498149883482300">"لقطة شاشة مساعدة"</item>
+    <item msgid="4046679376726313293">"قراءة حالة الهاتف"</item>
+    <item msgid="6329507266039719587">"إضافة بريد صوتي"</item>
+    <item msgid="7692440726415391408">"استخدام SIP"</item>
+    <item msgid="8572453398128326267">"معالجة المكالمات الصادرة"</item>
+    <item msgid="7775674394089376306">"بصمة الإصبع"</item>
+    <item msgid="3182815133441738779">"أجهزة استشعار الجسم"</item>
+    <item msgid="2793100005496829513">"قراءة رسائل البث الخلوي"</item>
+    <item msgid="2633626056029384366">"موقع وهمي"</item>
+    <item msgid="8356842191824684631">"قراءة مساحة التخزين"</item>
+    <item msgid="5671906070163291500">"كتابة مساحة التخزين"</item>
+    <item msgid="2791955098549340418">"تشغيل الشاشة"</item>
+    <item msgid="5599435119609178367">"الحصول على الحسابات"</item>
+    <item msgid="1165623660533024666">"التشغيل في الخلفية"</item>
+    <item msgid="6423861043647911030">"مستوى صوت \"سهولة الاستخدام\""</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"قصيرة"</item>
+    <item msgid="4816511817309094890">"أهميّة متوسّطة"</item>
+    <item msgid="8305084671259331134">"طويلة"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"تلقائي"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif مكثف"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"أحرف استهلالية صغيرة"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"صغير جدًا"</item>
+    <item msgid="5091603983404027034">"صغير"</item>
+    <item msgid="176844712416932112">"عادي"</item>
+    <item msgid="2784236342175159295">"كبير"</item>
+    <item msgid="218913203203160606">"كبير جدًا"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"تلقائي"</item>
+    <item msgid="6488643537808152001">"بدون"</item>
+    <item msgid="552332815156010137">"مخطط"</item>
+    <item msgid="7187891159463789272">"تظليل القطرات"</item>
+    <item msgid="8019330250538856521">"مرتفعة"</item>
+    <item msgid="8987385315647049787">"منخفضة"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"٢٥٪"</item>
+    <item msgid="4665048002584838262">"٥٠٪"</item>
+    <item msgid="1874668269931014581">"٧٥٪"</item>
+    <item msgid="6462911487571123954">"٪۱۰۰"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"استخدام الإعدادات التلقائية للتطبيق"</item>
+    <item msgid="8611890312638868524">"أبيض في أسود"</item>
+    <item msgid="5891360837786277638">"أسود في أبيض"</item>
+    <item msgid="2798457065945456853">"أصفر في أسود"</item>
+    <item msgid="5799049811524553967">"أصفر في أزرق"</item>
+    <item msgid="3673930830658169860">"مخصص"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"شبكة افتراضية خاصة (VPN) عبر PPTP"</item>
+    <item msgid="1349760781118368659">"شبكة افتراضية خاصة (VPN) لـ L2TP/IPSec مزودة بمفاتيح مشتركة مسبقًا"</item>
+    <item msgid="6128519070545038358">"شبكة افتراضية خاصة (VPN) لـ L2TP/IPSec مزودة بشهادات"</item>
+    <item msgid="312397853907741968">"شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بمفاتيح مشتركة مسبقًا ومصادقة Xauth"</item>
+    <item msgid="3319427315593649917">"شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة Xauth"</item>
+    <item msgid="8258927774145391041">"شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة مختلطة"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"لا شيء"</item>
+    <item msgid="1157046369795346308">"الكتيب"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"غير متصل"</item>
+    <item msgid="8754480102834556765">"جار التهيئة..."</item>
+    <item msgid="3351334355574270250">"جارٍ الاتصال..."</item>
+    <item msgid="8303882153995748352">"متّصلة"</item>
+    <item msgid="9135049670787351881">"المهلة"</item>
+    <item msgid="2124868417182583926">"غير ناجح"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"اسأل"</item>
+    <item msgid="7718817231348607934">"عدم السماح مطلقًا"</item>
+    <item msgid="8184570120217958741">"السماح دومًا"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ثابتة"</item>
+    <item msgid="167418068739176448">"أهم نشاط"</item>
+    <item msgid="4760813290195199773">"مهم (المقدمة)"</item>
+    <item msgid="2328684826817647595">"مهم (الخلفية)"</item>
+    <item msgid="7746406490652867365">"الاحتفاظ بنسخة احتياطية"</item>
+    <item msgid="5597404364389196754">"مرتبة عالية"</item>
+    <item msgid="1290888779300174556">"الخدمة (قيد التشغيل)"</item>
+    <item msgid="7241098542073939046">"الخدمة (إعادة التشغيل)"</item>
+    <item msgid="6610439017684111046">"مستلم"</item>
+    <item msgid="7367606086319921117">"الرئيسية"</item>
+    <item msgid="3344660712396741826">"آخر نشاط"</item>
+    <item msgid="5006559348883303865">"تخزين مؤقت (النشاط)"</item>
+    <item msgid="8633480732468137525">"تخزين مؤقت (برنامج النشاط)"</item>
+    <item msgid="6248998242443333892">"تخزين مؤقت (فارغ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"أزرق مخضر"</item>
+    <item msgid="3228505970082457852">"أزرق"</item>
+    <item msgid="6590260735734795647">"نيلي"</item>
+    <item msgid="3521763377357218577">"أرجواني"</item>
+    <item msgid="5932337981182999919">"قرنفلي"</item>
+    <item msgid="5642914536624000094">"أحمر"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"تم إنشاؤها منذ أكثر من 30 يومًا"</item>
+    <item msgid="8699273238891265610">"تم إنشاؤها منذ أكثر من 60 يومًا"</item>
+    <item msgid="8346279419423837266">"تم إنشاؤها منذ أكثر من 90 يومًا"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"١"</item>
+    <item msgid="3118234477029486741">"٠"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"الاكتشاف التلقائي"</item>
+    <item msgid="773943026484148895">"معاملة الشبكة باعتبارها تفرض تكلفة استخدام"</item>
+    <item msgid="1008268820118852416">"معاملة الشبكة باعتبارها لا تفرض تكلفة استخدام"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"استخدام عنوان MAC عشوائي (الإعداد التلقائي)"</item>
+    <item msgid="214234417308375326">"استخدام عنوان MAC للجهاز"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"لا"</item>
+    <item msgid="1930581185557754880">"نعم"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"مظهر داكن"</item>
+    <item msgid="5079453644557603349">"مظهر فاتح"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"غير مفعّل"</item>
+    <item msgid="4072198137051566919">"تصحيح الأخطاء"</item>
+    <item msgid="2473005316958868509">"مطوّل"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"الرئيسية فقط"</item>
+    <item msgid="1161026694891024702">"تلقائي"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA المُفضَّل"</item>
+    <item msgid="7581481130337402578">"نظام GSM فقط"</item>
+    <item msgid="8579197487913425819">"WCDMA فقط"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA تلقائي"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo تلقائي"</item>
+    <item msgid="4219607161971472471">"CDMA بدون EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo فقط"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"عام"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA فقط"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"بطاقة RUIM/شريحة SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"عام"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ar/strings.xml b/tests/CarDeveloperOptions/res/values-ar/strings.xml
index 95e9211..de2eee3 100644
--- a/tests/CarDeveloperOptions/res/values-ar/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ar/strings.xml
@@ -78,8 +78,8 @@
     <string name="radioInfo_display_asu" msgid="3971624665121408962">"asu"</string>
     <string name="radioInfo_lac" msgid="808364938769458312">"LAC"</string>
     <string name="radioInfo_cid" msgid="9063028533037488663">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="4814645994330822610">"إلغاء تركيب وحدة تخزين USB"</string>
-    <string name="sdcard_unmount" product="default" msgid="1853537922358462235">"إلغاء تحميل بطاقة SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="4814645994330822610">"إلغاء تثبيت وحدة تخزين USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="1853537922358462235">"إلغاء تثبيت بطاقة SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="4403736378743828292">"محو وحدة تخزين USB"</string>
     <string name="sdcard_format" product="default" msgid="4831611387627849108">"محو بطاقة SD"</string>
     <string name="preview_pager_content_description" msgid="5731599395893090038">"معاينة"</string>
@@ -93,7 +93,7 @@
     <string name="font_size_preview_text_title" msgid="2593520249400910305">"ساحر أوز العجيب"</string>
     <string name="font_size_preview_text_subtitle" msgid="6106782964143379331">"الفصل ۱۱: مدينة أوز الزمردية العجيبة"</string>
     <string name="font_size_preview_text_body" msgid="6803085337474390845">"على الرغم من احتماء دورثي ورفاقها خلف نظارات خضراء، انبهرت عيونهم للوهلة الأولى بتوهج المدينة العجيبة وتألقها. كانت المنازل الرائعة أمامهم متراصة على الشوارع ومصممة جميعها من الرخام الأخضر المرصع بالزمرّد البرّاق. ساروا على رصيف من الرخام الأخضر نفسه حيث تلتقي المباني الضخمة على صفوف من الزمرد المتلألئ تحت أشعة الشمس الساطعة. كانت ألواح النوافذ الزجاجية خضراء هي أيضًا، حتى أنّ السماء وأشعة الشمس تلوّنت بالأخضر الفاتح. \n\nرأوا الكثير من الرجال والنساء والأطفال يجوبون الشوارع وجميعهم في ثياب خضراء فوق بشرة تميل إلى الأخضر. نظروا إلى دورثي ورفاقها الغريبين بتعجب، في حين أنّ الأطفال اختبأوا وراء أمهاتهم خائفين من الأسد، ولكن لم يتحدث معهم أحد. اصطفّت في الشارع المتاجر الخضراء ولاحظت دورثي أنّ كل ما فيها كان أخضر، من الحلوى الخضراء والفشار الأخضر إلى الأحذية والقبعات والملابس الخضراء. وفي أحد الأركان، وقف رجل يبيع الليموناضة الخضراء ورأت دورثي أنّ الأطفال كانوا يشترون العصير منه بعملة خضراء هي أيضًا. \n\nخلت الشوارع من الأحصنة أو أي نوع آخر من الحيوانات، وكان الرجال ينقلون أمتعتهم في عربات خضراء صغيرة يدفعونها أمامهم. وبدت ملامح السعادة والارتياح على وجوه الجميع."</string>
-    <string name="font_size_save" msgid="8652044574655753921">"موافق"</string>
+    <string name="font_size_save" msgid="8652044574655753921">"حسنًا"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"وحدة تخزين USB"</string>
     <string name="sdcard_setting" product="default" msgid="8398782065765523178">"بطاقة SD"</string>
     <string name="bluetooth" msgid="1564520421786841227">"بلوتوث"</string>
@@ -134,9 +134,9 @@
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"الملفات التي تم استلامها"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"الملفات المستلَمة عبر البلوتوث"</string>
     <string name="device_picker" msgid="8345264486071697705">"اختيار جهاز البلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="8716802066127746062">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث"</string>
+    <string name="bluetooth_ask_enablement" msgid="8716802066127746062">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث"</string>
     <string name="bluetooth_ask_disablement" msgid="7125319551097350783">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> إيقاف البلوتوث"</string>
-    <string name="bluetooth_ask_enablement_no_name" msgid="6105893027185475233">"يريد أحد التطبيقات تشغيل بلوتوث"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="6105893027185475233">"يريد أحد التطبيقات تفعيل بلوتوث"</string>
     <string name="bluetooth_ask_disablement_no_name" msgid="8648888502291681310">"يريد أحد التطبيقات إيقاف البلوتوث"</string>
     <string name="bluetooth_ask_discovery" product="tablet" msgid="6871595755186170115">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> أن يكون جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
     <string name="bluetooth_ask_discovery" product="default" msgid="3388041479101348095">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> أن يكون هاتفك مرئيًا لأجهزة بلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
@@ -146,16 +146,16 @@
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7796723473397303412">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> جعل هاتفك مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
     <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="5961921359655434504">"يريد أحد التطبيقات جعل جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
     <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="3585910858758443872">"يريد أحد التطبيقات جعل هاتفك مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5676466923424941153">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="507088376226791063">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="1164681893121736219">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="2542247690119921188">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7118362102769177771">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="2577488464813970727">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="7083038132794842691">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="3541668604020109525">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
-    <string name="bluetooth_turning_on" msgid="6935183036449748493">"جارٍ تشغيل البلوتوث..."</string>
-    <string name="bluetooth_turning_off" msgid="9214026723789756620">"جارٍ إيقاف تشغيل البلوتوث..."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5676466923424941153">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="507088376226791063">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="1164681893121736219">"يريد أحد التطبيقات تفعيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="2542247690119921188">"يريد أحد التطبيقات تفعيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7118362102769177771">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="2577488464813970727">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="7083038132794842691">"يريد أحد التطبيقات تفعيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="3541668604020109525">"يريد أحد التطبيقات تفعيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_turning_on" msgid="6935183036449748493">"جارٍ تفعيل البلوتوث..."</string>
+    <string name="bluetooth_turning_off" msgid="9214026723789756620">"جارٍ إيقاف البلوتوث..."</string>
     <string name="bluetooth_connection_permission_request" msgid="2382506002340643398">"طلب اتصال بلوتوث"</string>
     <string name="bluetooth_connection_notif_message" msgid="6824654400460127108">"انقر للاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="5454660775522235951">"هل تريد الاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"؟"</string>
@@ -183,7 +183,7 @@
     <string name="connected_device_available_call_title" msgid="6774859446815858428">"أجهزة الاتصال المتاحة"</string>
     <string name="connected_device_connected_title" msgid="6255107326608785482">"الأجهزة المتصلة حاليًا"</string>
     <string name="connected_device_saved_title" msgid="8270136893488475163">"الأجهزة المحفوظة"</string>
-    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"سيتم تشغيل بلوتوث للإقران"</string>
+    <string name="connected_device_add_device_summary" msgid="7960491471270158891">"سيتم تفعيل بلوتوث للإقران"</string>
     <string name="connected_device_connections_title" msgid="9205000271382018428">"إعدادات الاتصال المفضّلة"</string>
     <string name="connected_device_previously_connected_title" msgid="225918223397410428">"الأجهزة المتصلة سابقًا"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"الأجهزة المتصلة سابقًا"</string>
@@ -206,7 +206,7 @@
     <string name="proxy_action_text" msgid="814511434843981413">"تم"</string>
     <string name="proxy_hostname_label" msgid="6798891831427287847">"اسم المضيف للخادم الوكيل"</string>
     <string name="proxy_error" msgid="5036164133669802299">"تنبيه"</string>
-    <string name="proxy_error_dismiss" msgid="883805570485635650">"موافق"</string>
+    <string name="proxy_error_dismiss" msgid="883805570485635650">"حسنًا"</string>
     <string name="proxy_error_invalid_host" msgid="5430640241353307223">"اسم المضيف الذي كتبته غير صالح."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="4314503082913856333">"لم يتم تنسيق قائمة الاستبعاد التي كتبتها بشكل صحيح. اكتب قائمة مفصولة بفواصل للنطاقات المستبعدة."</string>
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"يلزمك إكمال حقل المنفذ."</string>
@@ -218,13 +218,13 @@
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"معدّل نقل بيانات UL (كيلوبت في الثانية):"</string>
     <string name="radio_info_signal_location_label" msgid="6788144906873498013">"معلومات الموقع الخلوية (تم الإيقاف):"</string>
     <string name="radio_info_phy_chan_config" msgid="1184401689381480522">"تهيئة قناة LTE Physical:"</string>
-    <string name="radio_info_cell_info_refresh_rate" msgid="3557422342215875913">"معدل تحديث المعلومات الخلوية:"</string>
+    <string name="radio_info_cell_info_refresh_rate" msgid="3557422342215875913">"معدل إعادة تحميل المعلومات الخلوية:"</string>
     <string name="radio_info_cellinfo_label" msgid="632796561627452215">"جميع معلومات القياس الخلوية:"</string>
     <string name="radio_info_gprs_service_label" msgid="7926626443442993242">"خدمة البيانات:"</string>
     <string name="radio_info_roaming_label" msgid="3131949337031835485">"تجوال:"</string>
     <string name="radio_info_imei_label" msgid="7300156592358133405">"IMEI:"</string>
     <string name="radio_info_call_redirect_label" msgid="2679891718182753061">"إعادة توجيه الاتصال:"</string>
-    <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"عدد مرات إعادة تعيين PPP منذ التشغيل:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"عدد مرات إعادة ضبط PPP منذ التشغيل:"</string>
     <string name="radio_info_current_network_label" msgid="5785805819312999094">"الشبكة الحالية:"</string>
     <string name="radio_info_ppp_received_label" msgid="5217391494757374330">"البيانات المستلمة:"</string>
     <string name="radio_info_gsm_service_label" msgid="7488842563230281026">"الخدمة الصوتية:"</string>
@@ -243,7 +243,7 @@
     <string name="ping_test_label" msgid="4759194831308897624">"تشغيل اختبار Ping"</string>
     <string name="radio_info_smsc_label" msgid="4561160340649588034">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="3992739670219389246">"تحديث"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="5343925292858337909">"تحديث"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="5343925292858337909">"إعادة تحميل"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="3058615074503857400">"تبديل فحص نظام أسماء النطاقات"</string>
     <string name="oem_radio_info_label" msgid="8679815523111164378">"المعلومات/الإعدادات الخاصة بـ OEM"</string>
     <string name="band_mode_title" msgid="8180320100446559884">"تحديد وضع النطاق اللاسلكي"</string>
@@ -299,7 +299,7 @@
     <string name="sd_card_settings_label" product="default" msgid="1074813865245983607">"بطاقة SD"</string>
     <string name="proxy_settings_label" msgid="7219106162267925123">"إعدادات الخادم الوكيل"</string>
     <string name="cancel" msgid="2582602392048772404">"إلغاء"</string>
-    <string name="okay" msgid="5838476766924989056">"موافق"</string>
+    <string name="okay" msgid="5838476766924989056">"حسنًا"</string>
     <string name="forget" msgid="7735525146062672874">"نسيان"</string>
     <string name="save" msgid="3418211178410498517">"حفظ"</string>
     <string name="done" msgid="5143229467535372339">"تم"</string>
@@ -320,7 +320,7 @@
     <string name="roaming" msgid="8860308342135146004">"التجوال"</string>
     <string name="roaming_enable" msgid="2108142024297441116">"الاتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="1915440242079953809">"الاتصال بخدمات البيانات عند التجوال"</string>
-    <string name="roaming_reenable_message" msgid="8388505868655113258">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
+    <string name="roaming_reenable_message" msgid="8388505868655113258">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تفعيل تجوال البيانات بشبكتك الرئيسية."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"تشغيل"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"قد يكلف ذلك رسومًا مرتفعة."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"عند السماح بتجوال البيانات، قد تتكلف رسوم تجوال مرتفعة!\n\nيؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
@@ -360,10 +360,10 @@
     <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"بعد السكون مباشرة، باستثناء عندما ميزة <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> تبقي الجهاز مفتوحًا"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> بعد السكون، باستثناء عندما ميزة <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> تبقي الجهاز مفتوحًا"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"إظهار معلومات المالك في شاشة التأمين"</string>
-    <string name="owner_info_settings_title" msgid="2537966178998339896">"رسالة شاشة التأمين"</string>
+    <string name="owner_info_settings_title" msgid="2537966178998339896">"رسالة شاشة القفل"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"تفعيل الأدوات"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"تم إيقاف الإعداد بواسطة المشرف"</string>
-    <string name="lockdown_settings_title" msgid="4534779922580115990">"عرض خيار التأمين"</string>
+    <string name="lockdown_settings_title" msgid="4534779922580115990">"عرض خيار إلغاء التأمين"</string>
     <string name="lockdown_settings_summary" msgid="7270756909878256174">"عرض خيار زر التشغيل الذي يعمل على إيقاف كل من Smart Lock والقفل باستخدام بصمة الإصبع والإشعارات على شاشة القفل"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"بإمكان الوكلاء المعتمَدين تمديد فتح القفل فقط"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"في حال تفعيل هذه الميزة، سيُبقي الوكلاء المعتمَدون الجهاز مفتوحًا لوقت أطول، إلا أنّهم لن يتمكنوا بعد ذلك من فتح جهاز تمّ قفله."</string>
@@ -391,14 +391,14 @@
     <string name="account_settings_title" msgid="7870321267198486578">"الحسابات"</string>
     <string name="security_settings_title" msgid="8228075165942416425">"الأمان"</string>
     <string name="encryption_and_credential_settings_title" msgid="6911729638397745353">"التشفير وبيانات الاعتماد"</string>
-    <string name="encryption_and_credential_settings_summary" product="default" msgid="468749700109808546">"تم تشفير الهاتف"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="468749700109808546">"تم ترميز الهاتف"</string>
     <string name="decryption_settings_summary" product="default" msgid="7401802133199522441">"الهاتف ليس مشفّرًا."</string>
-    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"تم تشفير الجهاز"</string>
+    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"تم ترميز الجهاز"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"الجهاز ليس مشفرًا."</string>
-    <string name="lockscreen_settings_title" msgid="1221505938891948413">"عرض شاشة التأمين"</string>
+    <string name="lockscreen_settings_title" msgid="1221505938891948413">"عرض شاشة القفل"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"ما يتم عرضه"</string>
-    <string name="security_settings_summary" msgid="5210109100643223686">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
-    <string name="cdma_security_settings_summary" msgid="1783066617800041869">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
+    <string name="security_settings_summary" msgid="5210109100643223686">"تعيين موقعي، فتح قفل الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
+    <string name="cdma_security_settings_summary" msgid="1783066617800041869">"تعيين موقعي، فتح قفل الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="6853942836045862315">"الخصوصية"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"تم إيقاف الإعداد بواسطة المشرف"</string>
     <string name="security_status_title" msgid="1261960357751754428">"حالة الأمان"</string>
@@ -412,7 +412,7 @@
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="1130222333285509856"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_vision" msgid="356568621735811168"></string>
     <string name="security_settings_face_enroll_introduction_cancel" msgid="4190924649721437238">"إلغاء"</string>
-    <string name="security_settings_face_enroll_introduction_title" msgid="6073249653318265486">"إلغاء القفل باستخدام وجهك"</string>
+    <string name="security_settings_face_enroll_introduction_title" msgid="6073249653318265486">"فتح القفل باستخدام وجهك"</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="9223270521083202896">"استخدام وجهك للمصادقة"</string>
     <string name="security_settings_face_enroll_introduction_message" msgid="484806903869220184">"استخدم وجهك لإلغاء قفل الهاتف أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="2850101281254663082">"يمكنك استخدام وجهك لفتح الهاتف أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام وجهك لفتح هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
@@ -437,7 +437,7 @@
     <string name="security_settings_face_settings_require_confirmation" msgid="7312024271060416438">"طلب التأكيد دائمًا"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"عند إجراء مصادقة في التطبيقات، يجب طلب التأكيد دائمًا."</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"إزالة بيانات الوجه"</string>
-    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"يمكن إلغاء قفل جهازك والوصول إلى التطبيقات بالوجه. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
+    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"يمكن فتح قفل جهازك والوصول إلى التطبيقات بالوجه. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"هل تريد حذف بيانات الوجه؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"سيتم حذف البيانات المسجّلة باستخدام ميزة \"فتح القفل بالوجه\" نهائيًا وبشكل آمن. وبعد إزالتها، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف وتسجيل الدخول إلى التطبيقات وتأكيد الدفعات."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"بصمة الإصبع"</string>
@@ -466,9 +466,9 @@
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"هل تريد تخطّي بصمة الإصبع؟"</string>
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"لا يستغرق إعداد بصمة الإصبع أكثر من دقيقة أو دقيقتين. وعند تخطّي ذلك، يمكنك إضافة بصمة إصبع لاحقًا من الإعدادات."</string>
     <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"هل تريد تخطّي قفل الشاشة؟"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"لن يتم تشغيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"لن يتم تفعيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"لن يتم تفعيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"لن يتم تفعيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته أو إعادة ضبطه."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"لن يتم تفعيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز اللوحي في حالة فقدانه أو سرقته."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"لن يتم تفعيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الجهاز في حالة فقدانه أو سرقته."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"لن يتم تفعيل ميزات حماية الجهاز. ولن تتمكن من منع الآخرين من استخدام هذا الهاتف في حالة فقدانه أو سرقته."</string>
@@ -497,8 +497,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"يمكنك حماية جهازك اللوحي بتفعيل خيار قفل الشاشة حتى لا يتمكَّن أي شخص من استخدامه في حال فقدانه أو سرقته. وتحتاج أيضًا إلى خيار قفل الشاشة لإعداد مصادقة الوجه. انقر على \"إلغاء\" ثُم حدِّد رقم تعريف شخصيًا أو اختَر خيارًا آخر لقفل الشاشة."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"يمكنك حماية جهازك بتفعيل خيار قفل الشاشة حتى لا يتمكَّن أي شخص من استخدامه في حال فقدانه أو سرقته. وتحتاج أيضًا إلى خيار قفل الشاشة لإعداد مصادقة الوجه. انقر على \"إلغاء\" ثُم حدِّد رقم تعريف شخصيًا أو اختَر خيارًا آخر لقفل الشاشة."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"يمكنك حماية هاتفك بتفعيل خيار قفل الشاشة حتى لا يتمكَّن أي شخص من استخدامه في حال فقدانه أو سرقته. وتحتاج أيضًا إلى خيار قفل الشاشة لإعداد مصادقة الوجه. انقر على \"إلغاء\" ثُم حدِّد رقم تعريف شخصيًا أو اختَر خيارًا آخر لقفل الشاشة."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"أتريد تخطي إعداد رقم التعريف الشخصي؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"أتريد تخطّي إعداد كلمة المرور؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"هل تريد تخطّي إعداد النقش؟"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"إعداد تأمين الشاشة"</string>
@@ -510,7 +509,7 @@
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="7896295829530444810">"تعذّر تسجيل بصمة الإصبع. يُرجى إعادة المحاولة أو استخدام إصبع آخر."</string>
     <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"إضافة بصمة إصبع أخرى"</string>
     <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"التالي"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"بالإضافة إلى إلغاء قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"بالإضافة إلى فتح قفل هاتفك، يمكنك أيضًا استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" تم إيقاف خيار قفل الشاشة. لمعرفة المزيد من المعلومات، اتصل بمشرف مؤسستك. "<annotation id="admin_details">"مزيد من التفاصيل"</annotation>\n\n"ما زال بإمكانك استخدام بصمة إصبعك للسماح بعمليات الشراء والوصول إلى التطبيقات. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1670703069782212223">"ارفع إصبعك ثم المس زر الاستشعار مرة أخرى"</string>
     <string name="fingerprint_add_max" msgid="2939393314646115661">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> بصمات الإصبع"</string>
@@ -523,13 +522,13 @@
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"لن تتمكن من استخدام بصمات إصبعك لإلغاء تأمين الملف الشخصي للعمل، أو السماح بعمليات الشراء، أو تسجيل الدخول إلى تطبيقات العمل"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"نعم، إزالة"</string>
     <string name="crypt_keeper_settings_title" msgid="839783588093862748">"التشفير"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"تشفير الجهاز اللوحي"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"تشفير الهاتف"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"ترميز الجهاز اللوحي"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"ترميز الهاتف"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"مشفّر"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب إلغاء قفل الشاشة لفك تشفير الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك تشفير الجهاز هي إجراء إعادة الضبط بحسب بيانات المصنع، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية التشفير. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"يمكنك تشفير حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد تشفير هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب إلغاء قفل الشاشة لفك تشفير الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك تشفير الجهاز هي إجراء إعادة الضبط بحسب بيانات المصنع، ومحو كل بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية التشفير. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"تشفير الجهاز اللوحي"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"تشفير الهاتف"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"يمكنك ترميز حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد ترميز جهازك اللوحي، بافتراض أنك قد أعددت قفل الشاشة (باستخدام نقش أو رقم تعريف شخصي أو كلمة مرور)، يجب فتح قفل الشاشة لفك ترميز الجهاز اللوحي في كل مرة تشغله فيها. والوسيلة الأخرى الوحيدة لفك ترميز الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق الترميز ساعة أو أكثر. ويجب البدء ببطارية مشحونة وتوصيل الجهاز اللوحي بالشاحن أثناء عملية الترميز. فإذا أوقفت العملية، ستفقد بعض أو كل بياناتك"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"يمكنك ترميز حساباتك وإعداداتك والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. وبعد ترميز هاتفك، وبافتراض أنك قد أعددت قفل الشاشة (عبر النقش أو رقم التعريف الشخصي أو كلمة المرور)، يجب فتح قفل الشاشة لفك ترميز الهاتف في كل مرة تشغله فيها. الطريقة الوحيدة الأخرى لفك ترميز الجهاز هي إجراء إعادة الضبط على الإعدادات الأصلية، ومحو كل بياناتك.\n\nيستغرق الترميز ساعة أو أكثر. يجب البدء ببطارية مشحونة وتوصيل الهاتف بالشاحن أثناء عملية الترميز. فإذا أوقفت هذه العملية، ستفقد بعض أو كل البيانات."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"ترميز الجهاز اللوحي"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"ترميز الهاتف"</string>
     <string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"اشحن البطارية وأعد المحاولة."</string>
     <string name="crypt_keeper_unplugged_text" msgid="6597684068340036200">"صل الشاحن وأعد المحاولة."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="8532211509636340535">"ليس هناك رقم تعريف شخصي (PIN) أو كلمة مرور لتأمين الشاشة"</string>
@@ -538,20 +537,20 @@
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2713708841024805586">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الجهاز اللوحي عدة مرات."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="2483549885938505746">"لا يمكن التراجع عن عملية التشفير، وفي حالة مقاطعتها، ستفقد البيانات. تستغرق عملية التشفير ساعة أو أكثر، وسيتم خلالها إعادة تشغيل الهاتف عدة مرات."</string>
     <string name="crypt_keeper_setup_title" msgid="5444657765706199408">"التشفير"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="9129783898699975969">"انتظر حتى يتم تشفير الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="3391750289253411494">"انتظر حتى يتم تشفير هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="7841271240063858796">"انتظر بينما يتم تشفير جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8049188590821796173">"انتظر بينما يتم تشفير هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="9129783898699975969">"انتظر حتى يتم ترميز الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="3391750289253411494">"انتظر حتى يتم ترميز هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="7841271240063858796">"انتظر بينما يتم ترميز جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8049188590821796173">"انتظر بينما يتم ترميز هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="9168213181845231795">"لإلغاء تأمين الجهاز اللوحي، يمكنك إيقافه وتشغيله مرة أخرى."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1182690469082263666">"لإلغاء تأمين الهاتف، يمكنك إيقافه وتشغيله مرة أخرى."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"تحذير: سيتم محو محتويات جهازك بعد إخفاق <xliff:g id="COUNT">^1</xliff:g> من المحاولات الأخرى لإلغاء القفل!"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"تحذير: سيتم محو محتوى جهازك بعد فشل <xliff:g id="COUNT">^1</xliff:g> من المحاولات الأخرى في فتح القفل!"</string>
     <string name="crypt_keeper_enter_password" msgid="726933635335219421">"اكتب كلمة المرور"</string>
     <string name="crypt_keeper_failed_title" msgid="1906382607060855782">"لم يتم التشفير بنجاح"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. \n\nلاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. \n\nلاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. \n\nلاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. \n\nلاستئناف استخدام الهاتف، يجب إجراء إعادة الضبط على الإعدادات الأصلية. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="6561535293845985713">"لم ينجح إلغاء التشفير"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام جهازك اللوحي، يلزمك إجراء إعادة تعيين إعدادات المصنع. عند إعداد الجهاز اللوحي بعد إعادة التعيين، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام هاتفك، يلزمك إجراء إعادة تعيين إعدادات المصنع. عند إعداد الهاتف بعد إعادة التعيين، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام جهازك اللوحي، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. عند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"كلمة المرور التي أدخلتها صحيحة، ولكن للأسف بياناتك تالفة. \n\nلاستئناف استخدام هاتفك، يلزمك إجراء إعادة الضبط على الإعدادات الأصلية. عند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة لاستعادة أي بيانات تم نسخها احتياطيًا في حسابك على Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"تبديل أسلوب الإدخال"</string>
     <string name="suggested_lock_settings_title" msgid="1518155558803371661">"تأمين هاتفك"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"تعيين قفل شاشة لحماية الجهاز اللوحي"</string>
@@ -597,12 +596,12 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"بصمة الإصبع ورقم التعريف الشخصي"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="3325527833422156515">"بصمة الإصبع وكلمة المرور"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="2063700014903801639">"المتابعة بدون بصمة الإصبع"</string>
-    <string name="fingerprint_unlock_title" msgid="8009992449332532869">"يمكنك إلغاء قفل هاتفك باستخدام بصمة إصبعك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="fingerprint_unlock_title" msgid="8009992449332532869">"يمكنك فتح قفل هاتفك باستخدام بصمة إصبعك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
     <string name="face_unlock_set_unlock_pattern" msgid="3748596996869406905">"مصادقة الوجه + نمط"</string>
     <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"مصادقة الوجه + رقم التعريف الشخصي"</string>
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"مصادقة الوجه + كلمة المرور"</string>
     <string name="face_unlock_skip_face" msgid="7173197040501143880">"المتابعة بدون مصادقة الوجه"</string>
-    <string name="face_unlock_title" msgid="1298031162909236127">"يمكنك إلغاء قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="face_unlock_title" msgid="1298031162909236127">"يمكنك فتح قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"تم إيقافه بواسطة المشرف، أو سياسة التشفير، أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"بدون قفل"</string>
     <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"التمرير السريع"</string>
@@ -616,35 +615,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="1843950215687159135">"لن تعمل ميزات حماية الجهاز بدون النقش."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8846957650251741548">"لن تعمل ميزات حماية الجهاز بدون النقش.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="6760473271034592796">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="4384632309103635233">"لن تعمل ميزات حماية الجهاز بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="854665587186358170">"لن تعمل ميزات حماية الجهاز بدون كلمة المرور."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="218143910981979545">"لن تعمل ميزات حماية الجهاز بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="3570135744390201244">"لن تعمل ميزات حماية الجهاز بدون قفل الشاشة."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="5775815077478538855">"لن تعمل ميزات حماية الجهاز بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من إلغاء قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الجهاز ولن تتمكن من فتح قفل هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="2369992898062808499">"لن تعمل ميزات حماية الملف الشخصي بدون النقش."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="8511105093090018735">"لن تعمل ميزات حماية الملف الشخصي بدون النقش.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7114165651000498040">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="5118210431544156122">"لن تعمل ميزات حماية الملف الشخصي بدون رقم التعريف الشخصي.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="3989497526180082037">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="8360485354164416198">"لن تعمل ميزات حماية الملف الشخصي بدون كلمة المرور.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم ازالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم ازالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="4066001421137974082">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1201259228331105948">"لن تعمل ميزات حماية الملف الشخصي بدون قفل الشاشة.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من إلغاء تأمين ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
+</xliff:g>كما ستتم إزالة بصمات الإصبع المحفوظة من هذا الملف الشخصي ولن تتمكن من فتح قفل ملفك الشخصي أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات باستخدامها."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"نعم، إزالة"</string>
     <string name="unlock_change_lock_pattern_title" msgid="7622476883851319877">"تغيير نقش فتح القفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"تغيير رمز PIN لإلغاء التأمين"</string>
@@ -788,13 +787,13 @@
       <item quantity="one">خدمة واحدة ناشطة لمنح الثقة</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="7410319268406112792">"بلوتوث"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="3951769568065428093">"تشغيل البلوتوث"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="3951769568065428093">"تفعيل البلوتوث"</string>
     <string name="bluetooth_settings" msgid="5228032727293770389">"بلوتوث"</string>
     <string name="bluetooth_settings_title" msgid="7261244857456521825">"بلوتوث"</string>
     <string name="bluetooth_settings_summary" msgid="1221689092429277887">"إدارة الاتصالات، تعيين اسم الجهاز وقابلية الاكتشاف"</string>
     <string name="bluetooth_pairing_request" msgid="7221745525632573125">"هل تريد الإقران مع <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"شفرة إقران البلوتوث"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"اكتب شفرة الإقران، ثم اضغط على \"رجوع\" أو \"إدخال\""</string>
+    <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"رمز إقران البلوتوث"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"اكتب رمز الإقران، ثم انقر على \"رجوع\" أو \"إدخال\""</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"يشتمل رمز PIN على أحرف ورموز"</string>
     <string name="bluetooth_pin_values_hint" msgid="8044671726261326240">"0000 أو 1234 عادة"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="2665983525706661525">"يجب أن يتكون من ١٦ رقمًا"</string>
@@ -807,7 +806,7 @@
     <string name="bluetooth_error_title" msgid="5718761586633101960"></string>
     <string name="bluetooth_connecting_error_message" msgid="8473359363469518478">"تعذر الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="457781003962324807">"البحث عن أجهزة"</string>
-    <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"تحديث"</string>
+    <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"إعادة تحميل"</string>
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"جارٍ البحث…"</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"إعدادات الجهاز"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"الجهاز المقترن"</string>
@@ -828,8 +827,8 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"الخيارات…"</string>
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"إعدادات متقدمة"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"إعدادات بلوتوث المتقدمة"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"عند تشغيل البلوتوث، يمكن للجهاز التواصل مع أجهزة البلوتوث الأخرى القريبة."</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"عند تشغيل البلوتوث، يمكن للجهاز التواصل مع أجهزة البلوتوث الأخرى القريبة.\n\nولتحسين تجربة استخدام الجهاز، يمكن للتطبيقات والخدمات أيضًا البحث عن الأجهزة القريبة في أي وقت، حتى عند إيقاف البلوتوث. ويمكن استخدام هذا الإجراء لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي مثلاً. وبإمكانك تغيير هذا الإعداد في "<annotation id="link">"إعدادات البحث"</annotation>"."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"عند تفعيل البلوتوث، يمكن للجهاز التواصل مع أجهزة البلوتوث الأخرى القريبة."</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"عند تفعيل البلوتوث، يمكن للجهاز التواصل مع أجهزة البلوتوث الأخرى القريبة.\n\nولتحسين تجربة استخدام الجهاز، يمكن للتطبيقات والخدمات أيضًا البحث عن الأجهزة القريبة في أي وقت، حتى عند إيقاف البلوتوث. ويمكن استخدام هذا الإجراء لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي مثلاً. وبإمكانك تغيير هذا الإعداد في "<annotation id="link">"إعدادات البحث"</annotation>"."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"لتحسين دقة الموقع، سيظل بإمكان تطبيقات وخدمات النظام اكتشاف أجهزة بلوتوث. ويمكنك تغيير ذلك من خلال <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"تعذر الاتصال. يُرجى إعادة المحاولة."</string>
     <string name="device_details_title" msgid="726517818032923222">"تفاصيل الجهاز"</string>
@@ -841,7 +840,7 @@
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="8485211340349958886">"إلغاء إقران الجهاز"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="2381509181266180406">"الاتصال بـ…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت الوسائط."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="8384028101155317339">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت السماعة بدون لمس الجهاز."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8384028101155317339">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من صوت السماعة بدون تلامس الأجهزة."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="6964226087090465662">"سيتم إلغاء توصيل <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من جهاز الإرسال."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"سيتم قطع الدخول إلى الإنترنت عبر <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8145126793699232403">"سيتم قطع اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> من مشاركة اتصال الإنترنت على هذا الجهاز اللوحي."</string>
@@ -879,14 +878,14 @@
     <string name="wifi_tap_to_sign_in" msgid="1075925570550560453">"انقر هنا لتسجيل الدخول إلى الشبكة."</string>
     <string name="tx_link_speed" msgid="4557508597788146162">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> ميغابت في الثانية"</string>
     <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> ميغابت في الثانية"</string>
-    <string name="wifi_ask_enable" msgid="925862998663619616">"يريد <xliff:g id="REQUESTER">%s</xliff:g> تشغيل Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="925862998663619616">"يريد <xliff:g id="REQUESTER">%s</xliff:g> تفعيل Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="2146839060110412974">"يريد <xliff:g id="REQUESTER">%s</xliff:g> إيقاف Wi-Fi"</string>
     <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"تحقُّق من رمز بايت لتطبيقات يمكن تصحيحها"</string>
     <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"تمكين ART من التحقُّق من رمز البايت للتطبيقات القابلة للتصحيح"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"الاتصالات قصيرة المدى (NFC)"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
-    <string name="nfc_disclaimer_title" msgid="4860231267351602970">"تشغيل NFC"</string>
+    <string name="nfc_disclaimer_title" msgid="4860231267351602970">"تفعيل NFC"</string>
     <string name="nfc_disclaimer_content" msgid="3066113577854565782">"يتم من خلال تقنية الاتصال بالحقل القريب (NFC) تبادل البيانات بين هذا الجهاز والأجهزة أو الأهداف المجاورة الأخرى، مثل محطات الدفع وبرامج قراءة الوصول والعلامات أو الإعلانات التفاعلية."</string>
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"تأمين الاتصال بالحقل القريب (NFC)"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"السماح باستخدام \"الدفع والتقل عبر تقنية NFC\" فقط عندما تكون الشاشة مفتوحة"</string>
@@ -897,23 +896,23 @@
     <string name="android_beam_label" msgid="5340299879556025708">"شعاع Android"</string>
     <string name="android_beam_explained" msgid="4501176353247859329">"عند تفعيل هذه الميزة، يمكنك إرسال محتوى التطبيق إلى جهاز به اتصال NFC عن طريق الإمساك بالجهازين بالقرب من بعضهما. ويمكنك على سبيل المثال إرسال صفحات ويب وفيديوهات YouTube وجهات اتصال وغيرها.\n\nما عليك سوى تقريب الجهازين لبعضهما بعضًا (من الخلف عادةً) والنقر على الشاشة وسيحدّد التطبيق ما يتم إرساله."</string>
     <string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"تشغيل شبكة Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"تفعيل شبكة Wi-Fi"</string>
     <string name="wifi_settings" msgid="7486492317310514109">"Wi‑Fi"</string>
     <string name="wifi_settings_master_switch_title" msgid="3917916944694253946">"استخدام Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="9094716747565527901">"إعدادات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="5265554991622344805">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="7117267255799892820">"إعداد وإدارة نقاط الدخول اللاسلكية"</string>
     <string name="wifi_select_network" msgid="2541598480767312831">"تحديد Wi-Fi"</string>
-    <string name="wifi_starting" msgid="1299466156783469023">"جارٍ تشغيل Wi-Fi..."</string>
+    <string name="wifi_starting" msgid="1299466156783469023">"جارٍ تفعيل Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="413711069039939520">"إيقاف Wi-Fi…"</string>
     <string name="wifi_error" msgid="5605801874484465557">"خطأ"</string>
     <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"لا يتوفر التردد ٥ غيغاهرتز في هذا البلد"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"في وضع الطائرة"</string>
     <string name="wifi_notify_open_networks" msgid="4782239203624619655">"الإشعار بوجود شبكات مفتوحة"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"الإشعار عند توفر شبكة عامة عالية الجودة"</string>
-    <string name="wifi_wakeup" msgid="4963732992164721548">"تشغيل اتّصال Wi‑Fi تلقائيًا"</string>
-    <string name="wifi_wakeup_summary" msgid="1152699417411690">"إعادة تشغيل اتّصال Wi‑Fi بالقرب من الشبكات المحفوظة العالية الجودة، مثل الشبكة المنزلية"</string>
-    <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"غير متاحة نظرًا لإيقاف خدمة الموقع. شغّل خدمة "<annotation id="link">"الموقع"</annotation>"."</string>
+    <string name="wifi_wakeup" msgid="4963732992164721548">"تفعيل اتّصال Wi‑Fi تلقائيًا"</string>
+    <string name="wifi_wakeup_summary" msgid="1152699417411690">"إعادة تفعيل اتّصال Wi‑Fi بالقرب من الشبكات المحفوظة العالية الجودة، مثل الشبكة المنزلية"</string>
+    <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"غير متاحة نظرًا لإيقاف خدمة الموقع. فعِّل خدمة "<annotation id="link">"الموقع"</annotation>"."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="6820040651529910914">"غير متاح لأن ميزة \"البحث عن شبكات Wi‑Fi\" غير مفعّلة"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"تجنب الاتصالات الضعيفة"</string>
@@ -928,19 +927,19 @@
     <string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"لتحسين دقة تحديد الموقع الجغرافي، يمكنك تفعيل ميزة \"البحث عن شبكات Wi-Fi\" من خلال <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="1235445971400237444">"عدم الإظهار مرة أخرى"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"احتفاظ بـ Wi-Fi في وضع السكون"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="856670183023402715">"تشغيل Wi‑Fi أثناء وضع السكون"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="856670183023402715">"تفعيل Wi-Fi أثناء وضع السكون"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="9029652631829560733">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
     <string name="wifi_suspend_efficiency_title" msgid="5292408676086580527">"تحسين الفعالية"</string>
     <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"تحسين Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"تقليل استخدام البطارية إلى الحد الأدنى عند تشغيل Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"تقليل استخدام البطارية إلى الحد الأدنى عند تفعيل Wi-Fi"</string>
     <string name="wifi_limit_optimizations_summary" msgid="1192849485764156570">"تقييد طاقة البطارية لاتصال Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"التبديل إلى بيانات الجوّال في حالة انقطاع اتصال شبكة Wi‑Fi بالإنترنت."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="5067241930716252665">"التبديل إلى بيانات الجوال تلقائيًا"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"يمكنك استخدام بيانات شبكة الجوّال إذا تعذّر الدخول إلى الإنترنت عبر شبكة Wi‑Fi، وقد يتم فرض رسوم على استخدام البيانات."</string>
     <string name="wifi_add_network" msgid="4094957940791876640">"إضافة شبكة"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"إعدادات Wi-Fi"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"ستتم إعادة تشغيل شبكة Wi‑Fi تلقائيًا"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="286904094152909651">"لن تتم إعادة تشغيل اتّصال Wi‑Fi تلقائيًا"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"ستتم إعادة تفعيل شبكة Wi‑Fi تلقائيًا"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="286904094152909651">"لن تتم إعادة تفعيل اتّصال Wi‑Fi تلقائيًا"</string>
     <string name="wifi_access_points" msgid="1647976498906871869">"شبكات Wi-Fi"</string>
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"مزيد من الخيارات"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"اتصال Wi-Fi مباشر"</string>
@@ -951,13 +950,13 @@
     <string name="wifi_menu_remember" msgid="717257200269700641">"تذكر الشبكة"</string>
     <string name="wifi_menu_forget" msgid="7561140554450163075">"حذف الشبكة"</string>
     <string name="wifi_menu_modify" msgid="4080178040721021101">"تعديل الشبكة"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"لمعرفة الشبكات المتاحة، يُرجى تشغيل Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"لمعرفة الشبكات المتاحة، يُرجى تفعيل Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"جارٍ البحث عن شبكات Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"ليس لديك إذن لتغيير شبكة Wi‑Fi."</string>
     <string name="wifi_more" msgid="3538241640407382185">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="6730131677695521321">"الإعداد التلقائي (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"هل تريد تفعيل ميزة \"البحث عن شبكات Wi‑Fi\"؟"</string>
-    <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"لتشغيل Wi‑Fi تلقائيًا، يجب أولاً تفعيل ميزة \"البحث عن شبكات Wi‑Fi\"."</string>
+    <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"لتفعيل Wi‑Fi تلقائيًا، يجب أولاً تفعيل ميزة \"البحث عن شبكات Wi‑Fi\"."</string>
     <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"تتيح ميزة \"البحث عن شبكات Wi‑Fi\" للتطبيقات والخدمات إمكانية البحث عن شبكات Wi‑Fi في أي وقت، حتى في حال عدم تفعيل Wi‑Fi. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="4327570180594277049">"تفعيل"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="3336102100425307040">"ميزة \"البحث عن شبكات Wi‑Fi\" مفعّلة"</string>
@@ -1043,7 +1042,7 @@
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPS متاح)"</string>
     <string name="wifi_carrier_connect" msgid="7202618367339982884">"شبكة Wi‑Fi لمشغِّل شبكة الجوّال"</string>
     <string name="wifi_carrier_content" msgid="3467402515071949783">"الاتصال عبر <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تفعيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"لإيقاف هذا، يمكنك الانتقال إلى \"متقدم\" في القائمة الكاملة."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="8857664849515496237">"سماح"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"رفض"</string>
@@ -1127,10 +1126,10 @@
     <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"لا تتم مشاركة اتصال الإنترنت أو المحتوى مع الأجهزة الأخرى"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"تتم مشاركة اتصال الإنترنت على هذا الجهاز اللوحي عبر نقطة الاتصال"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"تتم مشاركة اتصال الإنترنت على هذا الهاتف عبر نقطة الاتصال"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تشغيلها."</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تفعيلها."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="5400500962974373706">"لم يتم تعيين كلمة مرور"</string>
     <string name="wifi_hotspot_name_title" msgid="6572202165400226127">"اسم نقطة الاتصال"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="5176787959408511889">"جارٍ تشغيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="5176787959408511889">"جارٍ تفعيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"كلمة مرور نقطة الاتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"نطاق نقطة الوصول"</string>
@@ -1138,7 +1137,7 @@
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"إيقاف نقطة الاتصال تلقائيًا"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"سيتم إيقاف نقطة اتصال Wi‑Fi في حال عدم اتصال أي أجهزة."</string>
-    <string name="wifi_tether_starting" msgid="7676952148471297900">"جارٍ تشغيل نقطة الاتصال…"</string>
+    <string name="wifi_tether_starting" msgid="7676952148471297900">"جارٍ تفعيل نقطة الاتصال…"</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"جارٍ إيقاف نقطة الاتصال…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7534760116478734006">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> نشطة"</string>
     <string name="wifi_tether_failed_subtext" msgid="3501001612207106">"خطأ في نقطة اتصال Wi-Fi المحمولة"</string>
@@ -1160,8 +1159,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"الجوّال"</item>
+    <item msgid="6007360612667098926">"Wi-Fi فقط"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1170,14 +1172,14 @@
     <string name="wifi_calling_mode_wifi_preferred_summary" msgid="8298294808362169798">"إذا لم تكن شبكة Wi-Fi متاحة، يمكنك استخدام شبكة الجوّال."</string>
     <string name="wifi_calling_mode_cellular_preferred_summary" msgid="4906499810156794061">"إذا لم تكن شبكة الجوّال متاحة، يمكنك استخدام شبكة Wi-Fi."</string>
     <string name="wifi_calling_mode_wifi_only_summary" msgid="6928556021002500522">"يمكنك الاتصال عبر شبكة Wi-Fi. وإذا لم تكن متوفرة، سيتم إنهاء المكالمة."</string>
-    <string name="wifi_calling_off_explanation" msgid="1653424723742898015">"عند تشغيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكة Wi-Fi أو عبر مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تفعيل هذه الميزة، يُرجى مراجعة الرسوم  والتفاصيل الأخرى مع مشغّل شبكة الجوّال.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
+    <string name="wifi_calling_off_explanation" msgid="1653424723742898015">"عند تفعيل الاتصال عبر Wi-Fi، يمكن للهاتف توجيه المكالمات عبر شبكة Wi-Fi أو عبر مشغّل شبكة الجوّال، حسب تفضيلك وحسب الإشارة الأقوى. وقبل تفعيل هذه الميزة، يُرجى مراجعة الرسوم  والتفاصيل الأخرى مع مشغّل شبكة الجوّال.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
     <string name="wifi_calling_off_explanation_2" msgid="8648609693875720408"></string>
     <string name="emergency_address_title" msgid="5779915349686787024">"عنوان الطوارئ"</string>
     <string name="emergency_address_summary" msgid="478668478569851714">"يتم اعتباره موقعك الجغرافي عند إجراء مكالمة طوارئ عبر Wi‑Fi"</string>
     <string name="private_dns_help_message" msgid="7633526525131196650"><annotation id="url">"مزيد من المعلومات"</annotation>" عن ميزات نظام أسماء النطاقات الخاص"</string>
     <string name="wifi_calling_pref_managed_by_carrier" msgid="5458050015417972072">"الإعداد تحت إدارة مشغّل شبكة الجوّال"</string>
     <string name="wifi_calling_settings_activation_instructions" msgid="2863642668648110908">"تفعيل الاتصال عبر Wi‑Fi"</string>
-    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"تشغيل الاتصال عبر Wi-Fi"</string>
+    <string name="wifi_calling_turn_on" msgid="1212277809455062043">"تفعيل الاتصال عبر Wi-Fi"</string>
     <string name="wifi_calling_not_supported" msgid="216781767605669775">"لا يوفّر مشغِّل شبكة الجوّال %1$s ميزة \"الاتصال عبر Wi-Fi\""</string>
     <string name="carrier" msgid="3413463182542176886">"مشغّل شبكة جوّال"</string>
     <string name="display_settings_title" msgid="1243571562133261601">"العرض"</string>
@@ -1185,7 +1187,7 @@
     <string name="all_volume_title" msgid="1750261506951315423">"مستويات الصوت"</string>
     <string name="musicfx_title" msgid="6456079041566773649">"تأثيرات موسيقية"</string>
     <string name="ring_volume_title" msgid="5874791723449821646">"مستوى صوت الرنين"</string>
-    <string name="vibrate_in_silent_title" msgid="2314667015729841220">"اهتزاز عند تشغيل الوضع صامت"</string>
+    <string name="vibrate_in_silent_title" msgid="2314667015729841220">"اهتزاز عند تفعيل الوضع صامت"</string>
     <string name="notification_sound_title" msgid="6812164482799723931">"الصوت التلقائي للإشعارات"</string>
     <string name="incoming_call_volume_title" msgid="4736570528754310450">"نغمة الرنين"</string>
     <string name="notification_volume_title" msgid="6022562909288085275">"التنبيه"</string>
@@ -1263,13 +1265,13 @@
     <string name="auto_brightness_subtitle" msgid="8516999348793100665">"مستوى السطوع المفضل بالنسبة لك"</string>
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"عدم ضبط السطوع بحسب الإضاءة المتاحة"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"زيادة استخدام البطارية"</string>
-    <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"يمكنك تحسين مستوى السطوع حسب الإضاءة. وعند تشغيل هذه الميزة، سيظل بإمكانك ضبط السطوع مؤقتًا."</string>
+    <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"يمكنك تحسين مستوى السطوع حسب الإضاءة. وعند تفعيل هذه الميزة، سيظل بإمكانك ضبط السطوع مؤقتًا."</string>
     <string name="auto_brightness_description" msgid="8209140379089535411">"سيتم ضبط سطوع الشاشة تلقائيًا حسب البيئة المحيطة والأنشطة. ويمكنك تحريك شريط التمرير يدويًا لضبط السطوع التكيُّفي حسبما تفضّل."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"موازنة اللون الأبيض للشاشة"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Screen aware"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"تفعيل / لن يتم إيقاف الشاشة إذا كنت تنظر إليها."</string>
-    <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"موقوف"</string>
-    <string name="adaptive_sleep_description" msgid="812673735459170009">"لمنع إيقاف الشاشة إذا كنت تنظر إليها."</string>
+    <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"غير مفعّل"</string>
+    <string name="adaptive_sleep_description" msgid="812673735459170009">"منع إطفاء الشاشة إذا كنت تنظر إليها"</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"يستخدم إعداد Screen aware الكاميرا الأمامية لمعرفة ما إذا كان أحد ينظر إلى الشاشة. يعمل هذا الإعداد على الجهاز، لكن لن يتم تخزين أي صور أو إرسالها إلى Google."</string>
     <string name="night_display_title" msgid="1305002424893349814">"الإضاءة الليلية"</string>
     <string name="night_display_text" msgid="5330502493684652527">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني الخفيف، ما يسهّل النظر إلى الشاشة في الإضاءة الخافتة ويمكن أن يساعدك على الشعور بالنعاس أيضًا."</string>
@@ -1283,8 +1285,8 @@
     <string name="night_display_temperature_title" msgid="8375126629902616296">"الكثافة"</string>
     <string name="night_display_summary_off" msgid="8850539785332228069">"غير مفعّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"لن يتم تفعيل الميزة تلقائيًا على الإطلاق"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"سيتم التشغيل تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"سيتم التشغيل تلقائيًا عند غروب الشمس"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"سيتم التفعيل تلقائيًا في <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"سيتم التفعيل تلقائيًا عند غروب الشمس"</string>
     <string name="night_display_summary_on" msgid="6580571388791426596">"تم التشغيل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5461580863060506687">"لن يتم الإيقاف تلقائيًا مطلقًا"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2200631112239399233">"سيتم الإيقاف تلقائيًا عند الساعة <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1329,10 +1331,10 @@
     <string name="title_font_size" msgid="5021464556860010851">"حجم الخط"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"يمكنك تكبير النص أو تصغيره."</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"إعدادات قفل شريحة SIM"</string>
-    <string name="sim_lock_settings_category" msgid="1126759898277681516">"تأمين شريحة SIM"</string>
+    <string name="sim_lock_settings_category" msgid="1126759898277681516">"قفل شريحة SIM"</string>
     <string name="sim_lock_settings_summary_off" msgid="348656447968142307">"تم الإيقاف"</string>
     <string name="sim_lock_settings_summary_on" msgid="3440707542514810045">"تم القفل"</string>
-    <string name="sim_lock_settings_title" msgid="877336472752342977">"تأمين شريحة SIM"</string>
+    <string name="sim_lock_settings_title" msgid="877336472752342977">"قفل شريحة SIM"</string>
     <string name="sim_pin_toggle" msgid="2026507420678167488">"قفل شريحة SIM"</string>
     <string name="sim_lock_on" product="tablet" msgid="3917977767884071323">"يلزم إدخال رمز PIN لاستخدام الجهاز اللوحي"</string>
     <string name="sim_lock_on" product="default" msgid="1363159192182487883">"يتطلّب إدخال رقم التعريف الشخصي لاستخدام الهاتف"</string>
@@ -1341,7 +1343,7 @@
     <string name="sim_pin_change" msgid="5615972926944053213">"تغيير رقم التعريف الشخصي لشريحة SIM"</string>
     <string name="sim_enter_pin" msgid="149201344579560481">"رقم التعريف الشخصي لشريحة SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4478794975656337476">"قفل شريحة SIM"</string>
-    <string name="sim_disable_sim_lock" msgid="394864376519820956">"إلغاء قفل شريحة SIM"</string>
+    <string name="sim_disable_sim_lock" msgid="394864376519820956">"فتح قفل شريحة SIM"</string>
     <string name="sim_enter_old" msgid="8984991229691526849">"رقم التعريف الشخصي القديم لشريحة SIM"</string>
     <string name="sim_enter_new" msgid="1720792957661107585">"رقم تعريف شخصي جديد لبطاقة SIM"</string>
     <string name="sim_reenter_new" msgid="5692585822458989725">"إعادة كتابة رقم التعريف الشخصي الجديد"</string>
@@ -1353,7 +1355,7 @@
     <string name="sim_lock_failed" msgid="7949781515066772755">"لا يمكن تغيير حالة تأمين شريحة SIM.\nيُحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
     <string name="sim_pin_disable_failed" msgid="6780973900290546751">"يتعذَّر إيقاف رقم التعريف الشخصي."</string>
     <string name="sim_pin_enable_failed" msgid="804897359922298792">"يتعذَّر تفعيل رقم التعريف الشخصي."</string>
-    <string name="sim_enter_ok" msgid="5103626479976731229">"موافق"</string>
+    <string name="sim_enter_ok" msgid="5103626479976731229">"حسنًا"</string>
     <string name="sim_enter_cancel" msgid="2806801210236824592">"إلغاء"</string>
     <string name="sim_multi_sims_title" msgid="8816212852512189781">"تم العثور على بطاقات SIM متعددة"</string>
     <string name="sim_multi_sims_summary" msgid="8237021982527032257">"اختر شريحة SIM المفضلة لبيانات الجوّال."</string>
@@ -1394,8 +1396,8 @@
     <string name="storage_settings_for_app" msgid="3028887232073069965">"التخزين وذاكرة التخزين المؤقت"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"التخزين"</string>
     <string name="storage_settings_title" msgid="7348362600789024415">"إعدادات وحدة التخزين"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"إلغاء تركيب وحدة تخزين USB، وعرض مساحة التخزين المتاحة"</string>
-    <string name="storage_settings_summary" product="default" msgid="6233147555590816245">"إلغاء تحميل بطاقة SD، عرض مساحة التخزين المتاحة"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"إلغاء تثبيت وحدة تخزين USB، وعرض مساحة التخزين المتاحة"</string>
+    <string name="storage_settings_summary" product="default" msgid="6233147555590816245">"إلغاء تثبيت بطاقة SD، عرض مساحة التخزين المتاحة"</string>
     <string name="imei_multi_sim" msgid="6462221220123699987">"IMEI (المنفذ %1$d لشريحة SIM)"</string>
     <string name="status_number" product="tablet" msgid="1594311542611046121">"MDN (رقم دليل الجوال)"</string>
     <string name="status_number" product="default" msgid="6404365757066475145">"رقم الهاتف"</string>
@@ -1436,16 +1438,16 @@
     <string name="memory_calculating_size" msgid="8407591625479256510">"جارٍ الحساب..."</string>
     <string name="memory_apps_usage" msgid="1886814780760368266">"التطبيقات وبيانات التطبيقات"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"الوسائط"</string>
-    <string name="memory_downloads_usage" msgid="7039979723012065168">"التنزيلات"</string>
+    <string name="memory_downloads_usage" msgid="7039979723012065168">"المحتوى الذي تم تنزيله"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"صور وفيديوهات"</string>
     <string name="memory_music_usage" msgid="809605300042546279">"ملفات صوتية (موسيقى ونغمات رنين ووسائط، إلخ.)"</string>
     <string name="memory_media_misc_usage" msgid="6258827529046910705">"ملفات أخرى"</string>
     <string name="memory_media_cache_usage" msgid="1307620682751377717">"البيانات المؤقتة"</string>
-    <string name="sd_eject" product="nosdcard" msgid="3016608823130472449">"إلغاء تركيب وحدة التخزين المشتركة"</string>
-    <string name="sd_eject" product="default" msgid="4943338855474925396">"إلغاء تحميل بطاقة SD"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="8571017212318899178">"إلغاء تركيب وحدة تخزين USB الداخلية"</string>
-    <string name="sd_eject_summary" product="default" msgid="6862319750744376533">"إلغاء تركيب بطاقة SD كي تتمكن من إزالتها بشكل آمن"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="6192416378231939330">"إدراج وحدة تخزين USB للتركيب"</string>
+    <string name="sd_eject" product="nosdcard" msgid="3016608823130472449">"إلغاء تثبيت وحدة التخزين المشتركة"</string>
+    <string name="sd_eject" product="default" msgid="4943338855474925396">"إلغاء تثبيت بطاقة SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="8571017212318899178">"إلغاء تثبيت وحدة تخزين USB الداخلية"</string>
+    <string name="sd_eject_summary" product="default" msgid="6862319750744376533">"إلغاء تثبيت بطاقة SD كي تتمكن من إزالتها بشكل آمن"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="6192416378231939330">"إدراج وحدة تخزين USB للتثبيت"</string>
     <string name="sd_insert_summary" product="default" msgid="2977039502204165858">"إدراج بطاقة SD للتحميل"</string>
     <string name="sd_mount" product="nosdcard" msgid="5935852779173473289">"تثبيت وحدة تخزين USB"</string>
     <string name="sd_mount" product="default" msgid="2909681528683834308">"تثبيت بطاقة SD"</string>
@@ -1459,17 +1461,17 @@
     <string name="memory_clear_cache_message" msgid="6723120398411410031">"يؤدي ذلك إلى محو البيانات المؤقتة لكل التطبيقات."</string>
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"وظيفة MTP أو PTP نشطة"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"إلغاء تثبيت وحدة تخزين USB؟"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="4400426555375434431">"هل تريد إلغاء تحميل بطاقة SD؟"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="4400426555375434431">"هل تريد إلغاء تثبيت بطاقة SD؟"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"في حالة إلغاء تثبيت وحدة تخزين USB، ستتوقف بعض التطبيقات التي تستخدمها وربما لا يتم توفيرها حتى يتم إعادة تثبيت وحدة تخزين USB."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"في حالة إلغاء تحميل بطاقة SD، ستتوقف بعض التطبيقات التي تستخدمها وربما لا تتوفر حتى يتم إعادة تحميل بطاقة SD."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"في حالة إلغاء تثبيت بطاقة SD، ستتوقف بعض التطبيقات التي تستخدمها وربما لا تتوفر حتى يتم إعادة تثبيت بطاقة SD."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"تعذر إلغاء تثبيت وحدة تخزين USB. أعد المحاولة لاحقًا."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"تعذر إلغاء تحميل بطاقة SD. أعد المحاولة لاحقًا."</string>
-    <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"سيتم إلغاء تركيب وحدة تخزين USB."</string>
-    <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"سيتم إلغاء تركيب بطاقة SD."</string>
-    <string name="sd_ejecting_title" msgid="595074246815112145">"إلغاء التحميل"</string>
-    <string name="sd_ejecting_summary" msgid="5708943172014003213">"إلغاء التحميل قيد التقدم"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"تعذر إلغاء تثبيت بطاقة SD. أعد المحاولة لاحقًا."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"سيتم إلغاء تثبيت وحدة تخزين USB."</string>
+    <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"سيتم إلغاء تثبيت بطاقة SD."</string>
+    <string name="sd_ejecting_title" msgid="595074246815112145">"إلغاء التثبيت"</string>
+    <string name="sd_ejecting_summary" msgid="5708943172014003213">"إلغاء التثبيت قيد التقدم"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"مساحة التخزين منخفضة"</string>
     <string name="storage_low_summary" msgid="4475275204869514141">"قد لا تعمل بعض ميزات النظام، مثل المزامنة بشكل صحيح. حاول تفريغ مساحة من خلال حذف عناصر أو إلغاء تثبيتها، مثل التطبيقات أو محتوى الوسائط."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"إعادة تسمية"</string>
@@ -1522,7 +1524,7 @@
     <string name="storage_detail_other" msgid="9164851767437306618">"غير ذلك"</string>
     <string name="storage_detail_system" msgid="6784247618772153283">"النظام"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها من مواقع الإنترنت أو عبر البلوتوث وملفات Android وما إلى ذلك. \n\nللاطلاع على المحتويات المرئية على بطاقة <xliff:g id="NAME">^1</xliff:g> هذه، انقر على \"استكشاف\"."</string>
+    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها من مواقع الإنترنت أو عبر البلوتوث وملفات Android وما إلى ذلك. \n\nللاطلاع على المحتوى المرئي على بطاقة <xliff:g id="NAME">^1</xliff:g> هذه، انقر على \"استكشاف\"."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"يتضمّن النظام الملفات المستخدمة لتشغيل إصدار Android <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="1663117417635010371">"ربما يكون لدى <xliff:g id="USER_0">^1</xliff:g> صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1551,7 +1553,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="2258287496678469217">"تعمل <xliff:g id="NAME">^1</xliff:g> الجديدة. \n\nلنقل الصور والملفات وبيانات التطبيقات إلى هذا الجهاز، انتقل إلى الإعدادات &gt; التخزين."</string>
     <string name="storage_wizard_move_confirm_title" msgid="7362472162039287488">"نقل <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="502315190416551319">"لن يستغرق نقل <xliff:g id="APP">^1</xliff:g> والبيانات التابعة له إلى <xliff:g id="NAME_0">^2</xliff:g> سوى بضع دقائق. ولن تتمكن من استخدام التطبيق حتى الانتهاء من عملية النقل. \n\nلا تزِل <xliff:g id="NAME_1">^2</xliff:g> أثناء عملية النقل."</string>
-    <string name="storage_wizard_move_unlock" msgid="7978193904519827600">"لنقل البيانات، يجب إلغاء قفل المستخدم <xliff:g id="APP">^1</xliff:g>."</string>
+    <string name="storage_wizard_move_unlock" msgid="7978193904519827600">"لنقل البيانات، يجب فتح قفل المستخدم <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="5250929161803336592">"جارٍ نقل <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="1713792142250410169">"لا تزِل <xliff:g id="NAME">^1</xliff:g> أثناء عملية النقل. \n\nولن يكون التطبيق <xliff:g id="APP">^2</xliff:g> على هذا الجهاز متاحًا حتى الانتهاء من عملية النقل."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="9047521329704060401">"إلغاء عملية النقل"</string>
@@ -1632,7 +1634,7 @@
     <string name="error_adding_apn_type" msgid="671634520340569678">"لا يسمح مشغّل شبكة الجوّال بإضافة APN من النوع %s."</string>
     <string name="restore_default_apn" msgid="7195266404077471007">"جارٍ استعادة إعدادات APN التلقائية."</string>
     <string name="menu_restore" msgid="3799288817317293115">"إعادة الضبط على الإعداد التلقائي"</string>
-    <string name="restore_default_apn_completed" msgid="5671734152740058937">"اكتملت إعادة تعيين إعدادات APN التلقائية."</string>
+    <string name="restore_default_apn_completed" msgid="5671734152740058937">"اكتملت إعادة ضبط إعدادات APN التلقائية."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"خيارات إعادة الضبط"</string>
     <string name="reset_dashboard_summary" msgid="8778383341461126642">"يمكن إعادة ضبط الشبكة أو التطبيقات أو الجهاز"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"إعادة ضبط شبكة Wi-Fi والجوّال والبلوتوث"</string>
@@ -1645,7 +1647,7 @@
     <string name="reset_network_final_button_text" msgid="345255333127794393">"إعادة ضبط الإعدادات"</string>
     <string name="reset_network_confirm_title" msgid="2432145031070536008">"هل تريد إعادة الضبط؟"</string>
     <string name="network_reset_not_available" msgid="6146655531868016281">"إعادة ضبط الشبكة ليست متاحة لهذا المستخدم"</string>
-    <string name="reset_network_complete_toast" msgid="128225929536005495">"تمت إعادة تعيين إعدادات الشبكة"</string>
+    <string name="reset_network_complete_toast" msgid="128225929536005495">"تمت إعادة ضبط إعدادات الشبكة"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"يتعذّر محو بيانات شرائح SIM"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"يتعذّر محو بيانات شرائح التي تم تنزيلها بسبب خطأ.\n\nيمكنك إعادة تشغيل الجهاز وإعادة المحاولة."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
@@ -1658,7 +1660,7 @@
     <string name="master_clear_desc_also_erases_esim" msgid="4497260499055258773"><li>"شرائح eSIM"</li></string>
     <string name="master_clear_desc_no_cancel_mobile_plan" msgid="6072668588881679461">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="2723272952715259307">\n\n"لمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"لمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب مسح "<b>"بطاقة SD"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"لمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"بطاقة SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="194249742376770215">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"محو جميع البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى أو الصور"</string>
@@ -1670,7 +1672,7 @@
     <string name="master_clear_final_button_text" msgid="866772743886027768">"مسح كل شيء"</string>
     <string name="master_clear_failed" msgid="7588397453984229892">"لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"هل تريد محو جميع البيانات؟"</string>
-    <string name="master_clear_not_available" msgid="4676613348163652454">"لا تتوفر إمكانية إعادة تعيين إعدادات المصنع لهذا المستخدم"</string>
+    <string name="master_clear_not_available" msgid="4676613348163652454">"لا تتوفر إمكانية إعادة الضبط على الإعدادات الأصلية لهذا المستخدم"</string>
     <string name="master_clear_progress_title" msgid="378953167274114857">"جارٍ محو البيانات"</string>
     <string name="master_clear_progress_text" msgid="5418958116008976218">"يرجى الانتظار..."</string>
     <string name="call_settings_title" msgid="5033906789261282752">"اعدادات المكالمات"</string>
@@ -1683,7 +1685,7 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"تم تفعيل نقطة الاتصال وإعداد التوصيل"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"تم تفعيل نقطة الاتصال"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"تم تفعيل إعداد التوصيل"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"يتعذر توصيل نقاط الاتصال المحمولة أو استخدامها أثناء تشغيل توفير البيانات"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"يتعذر توصيل نقاط الاتصال المحمولة أو استخدامها أثناء تفعيل توفير البيانات"</string>
     <string name="usb_title" msgid="7480927657535578688">"USB"</string>
     <string name="usb_tethering_button_text" msgid="6242228383142012332">"التوصيل عبر USB"</string>
     <string name="usb_tethering_subtext" product="default" msgid="1573513260339548671">"مشاركة اتصال الإنترنت على الهاتف عبر USB"</string>
@@ -1742,7 +1744,7 @@
     <string name="location_street_level" product="tablet" msgid="4459804798444296650">"السماح للتطبيقات باستخدام GPS على جهازك اللوحي لتحديد موقعك"</string>
     <string name="location_street_level" product="default" msgid="7407688345675450051">"السماح للتطبيقات باستخدام GPS على هاتفك لتحديد موقعك"</string>
     <string name="assisted_gps" msgid="5411780261117055175">"استخدام نظام GPS المساعد"</string>
-    <string name="assisted_gps_enabled" msgid="2561022181775725369">"استخدام الخادم لمساعدة GPS (إلغاء التحديد لتقليل استخدام الشبكة)"</string>
+    <string name="assisted_gps_enabled" msgid="2561022181775725369">"استخدام الخادم لمساعدة GPS (إلغاء الاختيار لتقليل استخدام الشبكة)"</string>
     <string name="assisted_gps_disabled" msgid="6448758788217415937">"استخدام الخادم لمساعدة GPS (ألغِ التحديد لتحسين أداء GPS)"</string>
     <string name="use_location_title" msgid="7724788634359496634">"الموقع وبحث Google"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"السماح لـ Google باستخدام الموقع لتحسين نتائج البحث والخدمات الأخرى"</string>
@@ -1788,7 +1790,7 @@
     <string name="lockpassword_confirm_passwords_dont_match" msgid="1783767008133345784">"كلمات المرور غير متطابقة"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="5444357293637748942">"أرقام التعريف الشخصي غير متطابقة"</string>
     <string name="lockpassword_draw_your_pattern_again_header" msgid="9017394036814402348">"ارسم النقش مرة أخرى"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="4418423132980560119">"تحديد طريقة إلغاء القفل"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="4418423132980560119">"تحديد طريقة فتح القفل"</string>
     <string name="lockpassword_password_set_toast" msgid="601928982984489868">"تم تعيين كلمة المرور"</string>
     <string name="lockpassword_pin_set_toast" msgid="172594825722240059">"تم تعيين رمز PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6923260369475481406">"تم تعيين النقش"</string>
@@ -1807,9 +1809,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6861154706098327320">"استخدام نقش للملف الشخصي للعمل لزيادة الأمان"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="6306902249365524526">"إدخال رقم تعريف شخصي للملف الشخصي للعمل لزيادة الأمان"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="2917338218971012776">"إدخال كلمة مرور للملف الشخصي للعمل لزيادة الأمان"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"تم إعادة تعيين هاتفك على إعدادات المصنع. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="1085862410379709928">"تم إعادة ضبط هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل النقش السابق."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="6849889353126558761">"تم إعادة ضبط هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل رقم التعريف الشخصي السابق."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="3239944795659418737">"تم إعادة ضبط هاتفك على الإعدادات الأصلية. لاستخدام هذا الهاتف، أدخل كلمة المرور السابقة."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="3290569334665839860">"التحقق من النقش"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8520474869079710782">"التحقق من رقم التعريف الشخصي"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7326670978891793470">"التحقق من كلمة المرور"</string>
@@ -1898,7 +1900,7 @@
     <string name="install_text" msgid="2798092278891807849">"تثبيت"</string>
     <string name="disable_text" msgid="5065834603951474397">"إيقاف"</string>
     <string name="enable_text" msgid="7179141636849225884">"تفعيل"</string>
-    <string name="clear_user_data_text" msgid="8894073247302821764">"مسح مساحة التخزين"</string>
+    <string name="clear_user_data_text" msgid="8894073247302821764">"محو مساحة التخزين"</string>
     <string name="app_factory_reset" msgid="8718986000278776272">"إزالة التحديثات"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"لقد اخترت تشغيل هذا التطبيق بشكل تلقائي لبعض الإجراءات."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
@@ -1935,11 +1937,11 @@
     <string name="recompute_size" msgid="4290692197892743928">"جارٍ إعادة حساب الحجم..."</string>
     <string name="clear_data_dlg_title" msgid="7388024498687029597">"هل تريد حذف بيانات التطبيق؟"</string>
     <string name="clear_data_dlg_text" msgid="6849657743695013414">"سيتم حذف جميع بيانات هذا التطبيق نهائيًا. ويشمل ذلك جميع الملفات والإعدادات والحسابات وقواعد البيانات وما إلى ذلك."</string>
-    <string name="dlg_ok" msgid="4666570206507476557">"موافق"</string>
+    <string name="dlg_ok" msgid="4666570206507476557">"حسنًا"</string>
     <string name="dlg_cancel" msgid="2434951039156262467">"إلغاء"</string>
     <string name="app_not_found_dlg_title" msgid="394147475018718483"></string>
     <string name="app_not_found_dlg_text" msgid="8807428608938210212">"لم يتم العثور على التطبيق في قائمة التطبيقات المثبتة."</string>
-    <string name="clear_failed_dlg_text" msgid="8072859778950498232">"تعذّر مسح مساحة تخزين للتطبيق."</string>
+    <string name="clear_failed_dlg_text" msgid="8072859778950498232">"تعذّر محو مساحة تخزين للتطبيق."</string>
     <string name="join_two_items" msgid="3833831843199356403">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> و<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="8257688498236358394">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> و<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="2234106107535318136">"جارٍ الحساب..."</string>
@@ -2066,7 +2068,7 @@
     <string name="user_dict_settings_add_screen_title" msgid="8164998107273393830">"عبارة"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="577584009496650183">"خيارات أكثر"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="5678408488188525719">"خيارات أقل"</string>
-    <string name="user_dict_settings_add_dialog_confirm" msgid="7279673661732968137">"موافق"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="7279673661732968137">"حسنًا"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="5310204485783762787">"الكلمة:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="1494012163016712256">"الاختصار:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="6589803829089582686">"اللغة:"</string>
@@ -2131,8 +2133,8 @@
     <string name="accessibility_preference_magnification_summary" msgid="753307741814376312">"التكبير على الشاشة"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"انقر ٣ مرات للتكبير."</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"انقر على أحد الأزرار للتكبير"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"للتكبير/التصغير"</b>"، انقر على الشاشة 3 مرات بسرعة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير/التصغير مؤقتًا"</b>"، انقر على الشاشة 3 مرات بسرعة واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"عند تشغيل ميزة التكبير، استخدم زر إمكانية الوصول في أسفل الشاشة للتكبير بسرعة.\n\n"<b>"للتكبير/التصغير"</b>"، انقر على زر إمكانية الوصول، ثم انقر في أي مكان على الشاشة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير/التصغير مؤقتًا"</b>"، انقر على زر إمكانية الوصول، ثم المس أي موضع على الشاشة مع الاستمرار.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"للتكبير أو التصغير"</b>"، انقر على الشاشة 3 مرات بسرعة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير أو التصغير مؤقتًا"</b>"، انقر على الشاشة 3 مرات بسرعة واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"عند تفعيل ميزة التكبير، استخدم زر إمكانية الوصول في أسفل الشاشة للتكبير بسرعة.\n\n"<b>"للتكبير أو التصغير"</b>"، انقر على زر إمكانية الوصول، ثم انقر في أي مكان على الشاشة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير أو التصغير مؤقتًا"</b>"، انقر على زر إمكانية الوصول، ثم المس أي موضع على الشاشة مع الاستمرار.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"تم تعيين زر إمكانية الوصول لخدمة <xliff:g id="SERVICE">%1$s</xliff:g>. لاستخدام التكبير، المس زر إمكانية الوصول مع الاستمرار ثم اختر التكبير."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"مفتاح الاختصار لمستوى الصوت"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"خدمة الاختصار"</string>
@@ -2158,7 +2160,7 @@
     <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"وقت اتخاذ الإجراء"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"اختَر مدة عرض الرسائل التي تحتاج إلى قراءتها، علمًا بأنّ عرضها يقتصر على فترة مؤقتة.\n\nلا تتوافق بعض التطبيقات مع هذا الإعداد."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"اختَر مدة عرض الرسائل التي تطلب منك اتخاذ إجراء، ولكن يقتصر عرضها على فترة مؤقتة.\n\nلا تتوافق بعض التطبيقات مع هذا الإعداد."</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"مهلة اللمس مع الاستمرار"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"مهلة النقر مع الاستمرار"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"عكس اللون"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"قد يؤثر في الأداء"</string>
     <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"فترة الثبات"</string>
@@ -2277,14 +2279,14 @@
     <string name="enable_service_title" msgid="2746143093464928251">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
-    <string name="enable_service_encryption_warning" msgid="3580275420826492351">"في حالة تفعيل <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات."</string>
-    <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات، وذلك لأنك قد مكّنت إحدى خدمات إمكانية الوصول."</string>
-    <string name="enable_service_pattern_reason" msgid="7415969807374459848">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد النقش."</string>
-    <string name="enable_service_pin_reason" msgid="2899057249007636608">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
-    <string name="enable_service_password_reason" msgid="5210815233227388083">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد كلمة المرور."</string>
+    <string name="enable_service_encryption_warning" msgid="3580275420826492351">"في حالة تفعيل <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين ترميز البيانات."</string>
+    <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين ترميز البيانات، وذلك لأنك قد فعّلت إحدى خدمات إمكانية الوصول."</string>
+    <string name="enable_service_pattern_reason" msgid="7415969807374459848">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد النقش."</string>
+    <string name="enable_service_pin_reason" msgid="2899057249007636608">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
+    <string name="enable_service_password_reason" msgid="5210815233227388083">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في ترميز البيانات، يجب تأكيد كلمة المرور."</string>
     <string name="accessibility_service_warning" msgid="345702253188068806">"تطلب خدمة <xliff:g id="SERVICE">%1$s</xliff:g> الحصول على تحكم كامل في هذا الجهاز. ويمكن للخدمة قراءة الشاشة والتصرف بالنيابة عن المستخدمين ذوي الاحتياجات المتعلقة بإمكانية الوصول. ولا يناسب هذا المستوى من التحكم معظم التطبيقات."</string>
     <string name="disable_service_title" msgid="6234243399949005825">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="disable_service_message" msgid="4250593674885651779">"يؤدي النقر على \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="4250593674885651779">"يؤدي النقر على \"حسنًا\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="6979918129976547334">"لم يتم تثبيت أي خدمات"</string>
     <string name="accessibility_no_service_selected" msgid="3909390566736834080">"لم يتم اختيار أي خدمة"</string>
     <string name="accessibility_service_default_description" msgid="857921874644864502">"لم يتم تقديم أي وصف."</string>
@@ -2338,13 +2340,13 @@
     <string name="power_usage_level_and_status" msgid="8873534076894160727">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="3461915627093471868">"الوقت المتبقي: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="2730510256218879651">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> للشحن"</string>
-    <string name="background_activity_title" msgid="7207836362312111483">"تقييد الخلفية"</string>
+    <string name="background_activity_title" msgid="7207836362312111483">"حظر العمل في الخلفية"</string>
     <string name="background_activity_summary" msgid="582372194738538145">"السماح بتشغيل التطبيق في الخلفية"</string>
     <string name="background_activity_summary_disabled" msgid="457944930942085876">"غير مسموح بتشغيل التطبيق في الخلفية"</string>
     <string name="background_activity_summary_whitelisted" msgid="4713321059375873828">"يتعذر تقييد استخدام الخلفية."</string>
     <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"هل تريد وضع حد لنشاط التطبيق في الخلفية؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</string>
-    <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، شغِّل ميزة تحسين البطارية أولاً."</string>
+    <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، فعِّل ميزة تحسين البطارية أولاً."</string>
     <string name="device_screen_usage" msgid="4470485475363132750">"استخدام الشاشة منذ اكتمال الشحن"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"استخدام البطارية فور اكتمال الشحن"</string>
     <string name="screen_usage_summary" msgid="263396144684078341">"مقدار وقت تشغيل الشاشة منذ الشحن الكامل"</string>
@@ -2354,9 +2356,9 @@
     <string name="battery_stats_on_battery" msgid="2644055304085279716">"<xliff:g id="TIME">%1$s</xliff:g> على البطارية"</string>
     <string name="battery_stats_duration" msgid="4867858933068728005">"<xliff:g id="TIME">%1$s</xliff:g> منذ عدم التوصيل"</string>
     <string name="battery_stats_charging_label" msgid="3156586822576998231">"جارٍ الشحن"</string>
-    <string name="battery_stats_screen_on_label" msgid="1223495366609581497">"الشاشة قيد التشغيل"</string>
+    <string name="battery_stats_screen_on_label" msgid="1223495366609581497">"الشاشة قيد التفعيل"</string>
     <string name="battery_stats_gps_on_label" msgid="3944533098574423359">"GPS (نظام تحديد المواقع العالمي) على"</string>
-    <string name="battery_stats_camera_on_label" msgid="557892808497848886">"تشغيل الكاميرا"</string>
+    <string name="battery_stats_camera_on_label" msgid="557892808497848886">"تفعيل الكاميرا"</string>
     <string name="battery_stats_flashlight_on_label" msgid="162279812156241905">"تشغيل ضوء الفلاش"</string>
     <string name="battery_stats_wifi_running_label" msgid="3223557320252465826">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="670884103452713535">"في الوضع النشط"</string>
@@ -2364,8 +2366,8 @@
     <!-- no translation found for battery_stats_last_duration (8190573267292309839) -->
     <skip />
     <string name="awake" msgid="8956720170442161285">"وقت الوضع النشط للجهاز"</string>
-    <string name="wifi_on_time" msgid="2487820618265936068">"وقت تشغيل Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6400569492287292639">"وقت تشغيل Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="2487820618265936068">"وقت تفعيل Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6400569492287292639">"وقت تفعيل Wi-Fi"</string>
     <string name="advanced_battery_title" msgid="5026866913848464170">"استخدام البطارية"</string>
     <string name="history_details_title" msgid="8608193822257799936">"تفاصيل السجل"</string>
     <string name="battery_details_title" msgid="5358230551490703067">"استخدام البطارية"</string>
@@ -2437,7 +2439,7 @@
     <string name="battery_tip_restrict_app_dialog_message" msgid="6905822297507947381">"لتوفير شحن البطارية، أوقف <xliff:g id="APP">%1$s</xliff:g> عن استخدام البطارية في الخلفية علمًا بأن هذا التطبيق قد لا يعمل على نحو صحيح وقد تتأخر الإشعارات."</string>
     <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"لتوفير شحن البطارية، أوقف هذه التطبيقات عن استخدام البطارية في الخلفية علمًا بأن التطبيقات المقيدة قد لا تعمل على نحو صحيح وقد تتأخر الإشعارات.\n\nالتطبيقات:"</string>
     <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"لتوفير شحن البطارية، أوقف هذه التطبيقات عن استخدام البطارية في الخلفية علمًا بأن التطبيقات المقيدة قد لا تعمل على نحو صحيح وقد تتأخر الإشعارات.\n\nالتطبيقات:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
-    <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"تقييد"</string>
+    <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"حظر التشغيل"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"هل تريد إزالة التقييد؟"</string>
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"سيتمكّن هذا التطبيق من استخدام البطارية في الخلفية، وقد يؤدي ذلك إلى نفاد شحنها قبل الوقت المتوقع."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"إزالة"</string>
@@ -2575,12 +2577,12 @@
     <string name="menu_stats_unplugged" msgid="774132771877485277">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> منذ عدم التوصيل"</string>
     <string name="menu_stats_last_unplugged" msgid="197591229866380225">"أثناء آخر فترة من عدم التوصيل بـ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="2270006562448894071">"إجمالي الاستخدام"</string>
-    <string name="menu_stats_refresh" msgid="9017362786647223203">"تحديث"</string>
+    <string name="menu_stats_refresh" msgid="9017362786647223203">"إعادة تحميل"</string>
     <string name="process_kernel_label" msgid="4175060316414593760">"نظام التشغيل Android"</string>
     <string name="process_mediaserver_label" msgid="8591722404282619153">"خادم الوسائط"</string>
     <string name="process_dex2oat_label" msgid="8249082119748556085">"تحسين التطبيقات"</string>
     <string name="battery_saver" msgid="3989710213758938398">"توفير شحن البطارية"</string>
-    <string name="battery_saver_auto_title" msgid="4158659069641849952">"تشغيل الميزة تلقائيًا"</string>
+    <string name="battery_saver_auto_title" msgid="4158659069641849952">"تفعيل الميزة تلقائيًا"</string>
     <string name="battery_saver_auto_no_schedule" msgid="739814529432092706">"بلا جدول زمني"</string>
     <string name="battery_saver_auto_routine" msgid="886514412067906980">"مستند إلى روتين الشحن"</string>
     <string name="battery_saver_auto_percentage" msgid="5791982309331921556">"مستند إلى النسبة المئوية"</string>
@@ -2595,12 +2597,12 @@
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"تفعيل"</string>
     <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"استخدام الوضع \"توفير شحن البطارية\""</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"التشغيل تلقائيًا"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"التفعيل تلقائيًا"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"أبدًا"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"البطارية عند مستوى <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_percentage" msgid="7782252476471033843">"نسبة شحن البطارية"</string>
     <string name="battery_percentage_description" msgid="9219875229166700610">"عرض نسبة شحن البطارية في شريط الحالة"</string>
-    <string name="process_stats_summary_title" msgid="9189588417488537954">"إحصائيات العمليات"</string>
+    <string name="process_stats_summary_title" msgid="9189588417488537954">"إحصاءات العمليات"</string>
     <string name="process_stats_summary" msgid="8077998499161221885">"الإحصائيات التقنية حول العمليات الجارية"</string>
     <string name="app_memory_use" msgid="5126237308545653706">"استخدام الذاكرة"</string>
     <string name="process_stats_total_duration" msgid="4013432468516155868">"تم استخدام <xliff:g id="USEDRAM">%1$s</xliff:g> من إجمالي <xliff:g id="TOTALRAM">%2$s</xliff:g> خلال آخر <xliff:g id="TIMEDURATION">%3$s</xliff:g>"</string>
@@ -2641,7 +2643,7 @@
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"خدمات الإدخال الصوتي"</string>
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"كلمات مهمة وتفاعل كامل"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"تحويل النص إلى كلام ببساطة"</string>
-    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"سيكون بمقدور خدمة الإدخال الصوتي هذه أداء مراقبة صوتية دائمة، علاوة على التحكم في التطبيقات الممكن بها ميزة الصوت نيابة عنك. وتتبع هذه الخدمة تطبيق <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. هل ترغب في تفعيل استخدام هذه الخدمة؟"</string>
+    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"سيكون بمقدور خدمة الإدخال الصوتي هذه أداء مراقبة صوتية دائمة، علاوة على التحكم في التطبيقات المُفعّلة بها ميزة الصوت نيابة عنك. وتتبع هذه الخدمة تطبيق <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. هل ترغب في تفعيل استخدام هذه الخدمة؟"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"المحرّك المفضّل"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"إعدادات المحرك"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"معدل سرعة الكلام وطبقة الصوت"</string>
@@ -2696,7 +2698,7 @@
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
     <string name="backup_erase_dialog_message" msgid="8767843355330070902">"هل تريد إيقاف النسخ الاحتياطي لكلمات مرور Wi-Fi والإشارات المرجعية والإعدادات الأخرى وبيانات التطبيقات ومحو جميع النُسخ على خوادم Google؟"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"هل تريد إيقاف الاحتفاظ بنسخة احتياطية من بيانات الجهاز (مثل كلمات مرور Wi-Fi وسجل المكالمات) وبيانات التطبيقات (مثل الإعدادات والملفات التي تخزنها التطبيقات) بالإضافة إلى محو بيانات جميع النسخ الموجودة على الخوادم البعيدة؟"</string>
-    <string name="fullbackup_data_summary" msgid="406274198094268556">"بإمكانك الاحتفاظ تلقائيًا بنسخة احتياطية من بيانات الجهاز (مثل كلمات مرور Wi-Fi وسجل المكالمات) وبيانات التطبيقات (مثل الإعدادات والملفات التي تخزنها التطبيقات) عن بُعد.\n\nعند تشغيل الاحتفاظ التلقائي بنسخة احتياطية، يتم بشكل دوري حفظ بيانات الجهاز وبيانات التطبيقات عن بُعد. ويمكن أن تكون بيانات التطبيقات أي بيانات تم حفظها في التطبيق (استنادًا إلى إعدادات مطور التطبيق) بما في ذلك البيانات المحتمل أن تكون حساسة مثل جهات الاتصال والرسائل والصور."</string>
+    <string name="fullbackup_data_summary" msgid="406274198094268556">"بإمكانك الاحتفاظ تلقائيًا بنسخة احتياطية من بيانات الجهاز (مثل كلمات مرور Wi-Fi وسجل المكالمات) وبيانات التطبيقات (مثل الإعدادات والملفات التي تخزنها التطبيقات) عن بُعد.\n\nعند تفعيل الاحتفاظ التلقائي بنسخة احتياطية، يتم بشكل دوري حفظ بيانات الجهاز وبيانات التطبيقات عن بُعد. ويمكن أن تكون بيانات التطبيقات أي بيانات تم حفظها في التطبيق (استنادًا إلى إعدادات مطور التطبيق) بما في ذلك البيانات المحتمل أن تكون حساسة مثل جهات الاتصال والرسائل والصور."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"إعدادات مشرف الجهاز"</string>
     <string name="active_device_admin_msg" msgid="6929247869516924549">"تطبيق مشرف الجهاز"</string>
     <string name="remove_device_admin" msgid="4413438593788336400">"إيقاف تطبيق مشرف الجهاز"</string>
@@ -2740,7 +2742,7 @@
     <string name="background_data_dialog_title" msgid="8306650658158895976">"إيقاف بيانات الخلفية؟"</string>
     <string name="background_data_dialog_message" msgid="8126774244911656527">"يؤدي إيقاف بيانات الخلفية إلى إطالة عمر البطارية وتقليل استخدام البيانات. قد يكون هناك بعض التطبيقات التي ما زالت تستخدم اتصال بيانات الخلفية."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"مزامنة تلقائية لبيانات"</string>
-    <string name="sync_enabled" msgid="535172627223336983">"المزامنة قيد التشغيل"</string>
+    <string name="sync_enabled" msgid="535172627223336983">"المزامنة قيد التفعيل"</string>
     <string name="sync_disabled" msgid="713721807204805062">"المزامنة متوقفة"</string>
     <string name="sync_error" msgid="988155155932442765">"خطأ في المزامنة"</string>
     <string name="last_synced" msgid="4511434057768999129">"تاريخ آخر مزامنة: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
@@ -2767,7 +2769,7 @@
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"ستؤدي إزالة هذا الحساب إلى إزالة جميع رسائله وجهات الاتصال الخاصة به وبياناته الأخرى من الجهاز."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"لا يسمح المشرف بإجراء هذا التغيير"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"لا يمكن المزامنة يدويًا"</string>
-    <string name="cant_sync_dialog_message" msgid="3467126947262857534">"مزامنة هذا العنصر غير مفعّلة في الوقت الحالي. لتغيير هذا الإعداد، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
+    <string name="cant_sync_dialog_message" msgid="3467126947262857534">"مزامنة هذا العنصر غير مفعّلة في الوقت الحالي. لتغيير هذا الإعداد، فعِّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
     <string name="enter_password" msgid="2963496904625715235">"لبدء تشغيل Android، أدخل كلمة المرور"</string>
     <string name="enter_pin" msgid="7140938268709546890">"لبدء تشغيل Android، أدخل رقم التعريف الشخصي"</string>
     <string name="enter_pattern" msgid="1653841963422825336">"لبدء تشغيل Android، ارسم النقش"</string>
@@ -2780,7 +2782,7 @@
     <string name="misc_files" msgid="1012397035001764693">"ملفات متنوعة"</string>
     <string name="misc_files_selected_count" msgid="1434146080729502726">"تم تحديد <xliff:g id="NUMBER">%1$d</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="NUMBER">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="select_all" msgid="452240217913675728">"تحديد الكل"</string>
+    <string name="select_all" msgid="452240217913675728">"اختيار الكل"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"استخدام البيانات"</string>
     <string name="data_usage_app_summary_title" msgid="8277327968906074983">"بيانات الجوّال وWi‑Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"قد تختلف طريقة احتساب بيانات مشغّل شبكة الجوّال عن طريقة الاحتساب على جهازك."</string>
@@ -2811,7 +2813,7 @@
     <string name="data_usage_label_foreground" msgid="2471091128648754601">"المقدمة"</string>
     <string name="data_usage_label_background" msgid="1618794447370396845">"الخلفية"</string>
     <string name="data_usage_app_restricted" msgid="7569077654579299326">"مقيَّد"</string>
-    <string name="data_usage_disable_mobile" msgid="4125335076749119451">"هل تريد إيقاف تشغيل بيانات الجوّال؟"</string>
+    <string name="data_usage_disable_mobile" msgid="4125335076749119451">"هل تريد إيقاف بيانات الجوّال؟"</string>
     <string name="data_usage_disable_mobile_limit" msgid="1937796699758613667">"تعيين حد لبيانات الجوال"</string>
     <string name="data_usage_disable_4g_limit" msgid="7131367986548147266">"تعيين حد بيانات لـ 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="6746819313032692220">"تعيين حد لبيانات 2G-3G"</string>
@@ -2862,10 +2864,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الجهاز اللوحي. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="3504412681869806383">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الهاتف. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_metered_title" msgid="6827619643999794429">"قيود الشبكات"</string>
-    <string name="data_usage_metered_body" msgid="1342905101297753439">"يتم التعامل مع الشبكات الخاضعة للقياس مثل التعامل مع شبكات الجوّال عند تقييد بيانات الخلفية. وقد يردك تحذير من التطبيقات قبل استخدام هذه الشبكات مع التنزيلات الكبيرة."</string>
+    <string name="data_usage_metered_body" msgid="1342905101297753439">"يتم التعامل مع الشبكات الخاضعة للقياس مثل التعامل مع شبكات الجوّال عند تقييد بيانات الخلفية. وقد يردك تحذير من التطبيقات قبل استخدام هذه الشبكات لتنزيل المحتوى الكبير الحجم."</string>
     <string name="data_usage_metered_mobile" msgid="3675591449158207593">"شبكات الجوال"</string>
     <string name="data_usage_metered_wifi" msgid="2955256408132426720">"شبكات Wi-Fi الخاضعة للقياس"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"لاختيار شبكات خاضعة للقياس، يُرجى تشغيل Wi-Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"لاختيار شبكات خاضعة للقياس، يُرجى تفعيل Wi-Fi."</string>
     <string name="data_usage_metered_auto" msgid="7924116401382629319">"تلقائي"</string>
     <string name="data_usage_metered_yes" msgid="7333744880035386073">"تفرض تكلفة استخدام"</string>
     <string name="data_usage_metered_no" msgid="1961524615778610008">"بدون قياس"</string>
@@ -2911,18 +2913,18 @@
     <string name="vpn_forget_long" msgid="8457511440635534478">"نسيان الشبكة الافتراضية الخاصة"</string>
     <string name="vpn_replace_vpn_title" msgid="8517436922021598103">"هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟"</string>
     <string name="vpn_set_vpn_title" msgid="6483554732067951052">"هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="7050017738816963855">"عند تشغيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7050017738816963855">"عند تفعيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
     <string name="vpn_replace_always_on_vpn_enable_message" msgid="4149931501300203205">"سيتم استبدال شبكتك الافتراضية الخاصة (VPN) الحالية ولن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="4924947523200883088">"أنت متصل حاليًا بشبكة افتراضية خاصة (VPN) مضبوطة على وضع التشغيل الدائم. وإذا اتصلت بشبكة افتراضية خاصة أخرى، فسيتم استبدال شبكتك الافتراضية الخاصة الحالية، كما سيتم إيقاف وضع التشغيل الدائم."</string>
     <string name="vpn_replace_vpn_message" msgid="8009433728523145393">"أنت متصل حاليًا بشبكة افتراضية خاصة (VPN). وإذا اتصلت بشبكة افتراضية خاصة أخرى، فسيتم استبدال شبكتك الافتراضية الخاصة الحالية."</string>
-    <string name="vpn_turn_on" msgid="2334736319093953055">"تشغيل"</string>
+    <string name="vpn_turn_on" msgid="2334736319093953055">"تفعيل"</string>
     <string name="vpn_cant_connect_title" msgid="5803347131129293771">"يتعذر الاتصال بـ <xliff:g id="VPN_NAME">%1$s</xliff:g>"</string>
     <string name="vpn_cant_connect_message" msgid="7729125036551401236">"لا يتوافق هذا التطبيق مع الشبكة الافتراضية الخاصة (VPN) التي يتم تشغيلها دائمًا"</string>
     <string name="vpn_title" msgid="7801918186865029203">"الشبكات الافتراضية الخاصة"</string>
     <string name="vpn_create" msgid="2477570636472897359">"إضافة ملف شخصي لشبكة افتراضية خاصة (VPN)"</string>
     <string name="vpn_menu_edit" msgid="8061437799373333593">"تعديل الملف الشخصي"</string>
     <string name="vpn_menu_delete" msgid="4128305800374946877">"حذف الملف الشخصي"</string>
-    <string name="vpn_menu_lockdown" msgid="6951452279924808089">"شبكة افتراضية خاصة (VPN) دائمة التشغيل"</string>
+    <string name="vpn_menu_lockdown" msgid="6951452279924808089">"شبكة افتراضية خاصة (VPN) دائمة التفعيل"</string>
     <string name="vpn_no_vpns_added" msgid="6616183541896197147">"لم تتم إضافة أي شبكات افتراضية خاصة (VPN)"</string>
     <string name="vpn_always_on_summary" msgid="3639994551631437397">"متابعة الاتصال بشبكة VPN في جميع الأوقات"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="9077720997795965133">"عدم التوافق مع هذا التطبيق"</string>
@@ -2931,7 +2933,7 @@
     <string name="vpn_require_connection_title" msgid="8361434328767853717">"أيتطلب الأمر اتصالاً بشبكة افتراضية خاصة؟"</string>
     <string name="vpn_lockdown_summary" msgid="6770030025737770861">"حدد ملفًا شخصيًا للشبكة الافتراضية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الافتراضية الخاصة."</string>
     <string name="vpn_lockdown_none" msgid="3789288793603394679">"بدون"</string>
-    <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"تتطلب الشبكة الافتراضية الخاصة (VPN) دائمة التشغيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
+    <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"تتطلب الشبكة الافتراضية الخاصة (VPN) دائمة التفعيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
     <string name="vpn_no_network" msgid="8313250136194588023">"ليس هناك اتصال بالشبكة. يُرجى إعادة المحاولة لاحقًا."</string>
     <string name="vpn_disconnected" msgid="4597953053220332539">"تم قطع الاتصال بالشبكة الافتراضية الخاصة"</string>
     <string name="vpn_disconnected_summary" msgid="3784118965271376808">"غير متّصل بشبكة"</string>
@@ -3031,7 +3033,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5993561303748749097">"لا يمكن للملفات الشخصية إضافة حسابات"</string>
     <string name="user_remove_user_menu" msgid="3505139157217459864">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> من هذا الجهاز"</string>
     <string name="user_lockscreen_settings" msgid="3820813814848394568">"إعدادات شاشة التأمين"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="5211604808199585774">"إضافة المستخدمين من شاشة التأمين"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="5211604808199585774">"إضافة المستخدمين من شاشة القفل"</string>
     <string name="user_new_user_name" msgid="3880395219777884838">"مستخدم جديد"</string>
     <string name="user_new_profile_name" msgid="3074939718101489937">"ملف شخصي جديد"</string>
     <string name="user_confirm_remove_self_title" msgid="6739480453680217543">"هل تريد حذف نفسك؟"</string>
@@ -3052,7 +3054,7 @@
     <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"إزالة"</string>
     <string name="user_enable_calling" msgid="864760054792249503">"تفعيل المكالمات الهاتفية"</string>
-    <string name="user_enable_calling_sms" msgid="3450252891736718793">"تشغيل المكالمات الهاتفية والرسائل القصيرة SMS"</string>
+    <string name="user_enable_calling_sms" msgid="3450252891736718793">"تفعيل المكالمات الهاتفية والرسائل القصيرة SMS"</string>
     <string name="user_remove_user" msgid="3687544420125911166">"حذف حساب المستخدم"</string>
     <string name="user_enable_calling_confirm_title" msgid="1141612415529158542">"هل تريد تفعيل المكالمات الهاتفية؟"</string>
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"ستتم مشاركة سجل المكالمات مع هذا المستخدم."</string>
@@ -3074,7 +3076,7 @@
     <string name="nfc_payment_favor_open" msgid="3739055715000436749">"إلا إذا كان هناك تطبيق دفع آخر مفتوحًا"</string>
     <string name="nfc_payment_pay_with" msgid="8412558374792061266">"عند أحد أجهزة انقر وادفع الطرفية، يمكنك الدفع باستخدام:"</string>
     <string name="nfc_how_it_works_title" msgid="6531433737926327904">"الدفع عند الجهاز الطرفي"</string>
-    <string name="nfc_how_it_works_content" msgid="9174575836302449343">"يمكنك إعداد تطبيق للدفع، وبعد ذلك لن يلزمك سوى توصيل الجزء الخلفي من الهاتف بأي جهاز طرفي يحتوي على رمز عدم التلامس."</string>
+    <string name="nfc_how_it_works_content" msgid="9174575836302449343">"يمكنك إعداد تطبيق للدفع، وبعد ذلك لن يلزمك سوى توصيل الجزء الخلفي من الهاتف بأي جهاز طرفي يحتوي على رمز عدم لمس الجهاز."</string>
     <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"حسنًا"</string>
     <string name="nfc_more_title" msgid="2825856411836382264">"المزيد..."</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"هل تريد تعيينه كتفضيل؟"</string>
@@ -3224,11 +3226,11 @@
     <string name="keywords_storage" msgid="7704519289838065803">"مسافة، قرص، محرك أقراص ثابتة، استخدام جهاز"</string>
     <string name="keywords_battery" msgid="3860198379310375112">"استخدام الطاقة، شحن"</string>
     <string name="keywords_spell_checker" msgid="6032411442958278879">"تهجئة، قاموس، تدقيق إملائي، تصحيح تلقائي"</string>
-    <string name="keywords_voice_input" msgid="569012518085308407">"أداة تعرف، إدخال، تحدث، نطق، لغة، بدون لمس الجهاز، تعرف، بدون لمس الجهاز، كلمة، مسيئة، صوت، سجل، سماعة رأس بلوتوث"</string>
+    <string name="keywords_voice_input" msgid="569012518085308407">"أداة تعرف، إدخال، تحدث، قول، لغة، بدون تلامس الأجهزة، تعرف، بدون تلامس الأجهزة، كلمة، مسيئة، صوت، سجل، سماعة رأس بلوتوث"</string>
     <string name="keywords_text_to_speech_output" msgid="1337378060761399890">"تقييم، لغة، تلقائي، يتحدث، تحدث، تحويل نص إلى كلام، إمكانية الوصول، قارئ شاشة، مكفوف"</string>
     <string name="keywords_date_and_time" msgid="4434079919474174978">"ساعة، عسكرية"</string>
     <string name="keywords_network_reset" msgid="2064330046866583215">"إعادة ضبط، استرداد، المصنع"</string>
-    <string name="keywords_factory_data_reset" msgid="5865739790670615499">"مسح، حذف، استعادة، محو، إزالة، إعادة الضبط بحسب إعدادات المصنع"</string>
+    <string name="keywords_factory_data_reset" msgid="5865739790670615499">"محو، حذف، استعادة، محو، إزالة، إعادة الضبط على الإعدادات الأصلية"</string>
     <string name="keywords_printing" msgid="8499167841024606451">"طابعة"</string>
     <string name="keywords_sounds" msgid="9155626618185269312">"صفارة مكبر الصوت، مكبر صوت، مستوى الصوت، كتم الصوت، صامت، صوت، موسيقى"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="7106220678170229900">"ممنوع الإزعاج، ممنوع، المقاطعة، مقاطعة"</string>
@@ -3237,12 +3239,12 @@
     <string name="keywords_accounts" msgid="5908945725229306088">"الحساب"</string>
     <string name="keywords_users" msgid="5880705776023155640">"تقييد، يقيد، مقيد"</string>
     <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"تصحيح نص، تصحيح، صوت، اهتزاز، تلقائي، لغة، إيماءة، اقتراح، يقترح، مظهر، مسيء، كلمة، نوع، رمز تعبيري، دولي"</string>
-    <string name="keywords_reset_apps" msgid="2645701455052020435">"إعادة ضبط، تفضيلات، تلقائي"</string>
+    <string name="keywords_reset_apps" msgid="2645701455052020435">"إعادة ضبط، إعدادات مفضّلة، تلقائي"</string>
     <string name="keywords_all_apps" msgid="846444448435698930">"تطبيقات، تنزيل، التطبيقات، نظام"</string>
     <string name="keywords_app_permissions" msgid="8539841019997048500">"تطبيقات، أذونات، أمان"</string>
     <string name="keywords_default_apps" msgid="7435952699323965532">"تطبيقات، تلقائي"</string>
     <string name="keywords_ignore_optimizations" msgid="9127632532176249438">"تاجه التخصيصات، قيلولة، تطبيقات وضع الاستعداد"</string>
-    <string name="keywords_color_mode" msgid="8893345199519181751">"نابض بالحياة، نموذج أحمر أخضر أزرق، srgb، لون، طبيعي، قياسي"</string>
+    <string name="keywords_color_mode" msgid="8893345199519181751">"نابض بالحياة، نموذج أحمر أخضر أزرق، srgb، لون، طبيعي، عادي"</string>
     <string name="keywords_color_temperature" msgid="2255253972992035046">"درجة حرارة الألوان، D65، ‏D73، أبيض، أصفر، أزرق، دافئ، بارد"</string>
     <string name="keywords_lockscreen" msgid="4936846554280830394">"مرر لإلغاء التأمين، كلمة مرور، نقش، رقم تعريف شخصي"</string>
     <string name="keywords_profile_challenge" msgid="8653718001253979611">"المنافسة في العمل، عمل، ملف شخصي"</string>
@@ -3326,7 +3328,7 @@
       <item quantity="one">تم تفعيل قاعدة واحدة.</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="3425263414594779244">"وضع \"عدم الإزعاج\""</string>
-    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"تشغيل وضع \"الرجاء عدم الإزعاج\""</string>
+    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"تفعيل وضع \"الرجاء عدم الإزعاج\""</string>
     <string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"الاستثناءات"</string>
     <string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"المدة التلقائية"</string>
     <string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"السماح بالأصوات والاهتزازات من"</string>
@@ -3386,7 +3388,7 @@
     <string name="zen_mode_no_exceptions" msgid="3099578343994492857">"بدون"</string>
     <string name="zen_mode_other_options" msgid="7216192179063769057">"خيارات أخرى"</string>
     <string name="zen_mode_add" msgid="2533484377786927366">"إضافة"</string>
-    <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"تشغيل"</string>
+    <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"تفعيل"</string>
     <string name="zen_mode_button_turn_on" msgid="1097964136225943415">"التفعيل الآن"</string>
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"الإيقاف الآن"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"وضع \"الرجاء عدم الإزعاج\" مفعَّل حتى <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
@@ -3461,7 +3463,7 @@
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"الأصوات والاهتزازات الأخرى"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"الإشعارات"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"تم إرسالها مؤخرًا"</string>
-    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"عرض الكل من آخر 7 أيام"</string>
+    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"عرض كل التطبيقات من آخر 7 أيام"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"إعدادات متقدّمة"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"إشعارات العمل"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"إعداد أولوية الإشعارات التلقائية"</string>
@@ -3631,9 +3633,9 @@
     <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"لا يمكن تغيير هذه الإعدادات الآن. لقد اختار أحد التطبيقات تفعيل وضع \"الرجاء عدم الإزعاج\" تلقائيًا مع سلوك مخصّص."</string>
     <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"لا يمكن تغيير هذه الإعدادات الآن. تم تفعيل وضع \"الرجاء عدم الإزعاج\" يدويًا مع سلوك مخصّص."</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"وقت"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"تم ضبط القاعدة التلقائية على تشغيل وضع \"عدم الإزعاج\" أثناء أوقات محددة"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"تم ضبط القاعدة التلقائية على تفعيل وضع \"عدم الإزعاج\" أثناء أوقات محددة"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"حدث"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"تم ضبط القاعدة التلقائية على تشغيل وضع \"عدم الإزعاج\" أثناء أحداث محددة"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"تم ضبط القاعدة التلقائية على تفعيل وضع \"عدم الإزعاج\" أثناء أحداث محددة"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"أثناء الأحداث لـ"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"أثناء الأحداث للتقويم <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"أي تقويم"</string>
@@ -3714,7 +3716,7 @@
     <string name="zen_mode_calls_summary_two" msgid="9017678770532673578">"السماح بالمكالمات من <xliff:g id="CALLER_TYPE">%1$s</xliff:g> و<xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="1752513516040525545">"في حال اتصال الشخص نفسه للمرة الثانية في غضون <xliff:g id="MINUTES">%d</xliff:g> دقيقة"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="3909532602640130841">"مخصص"</string>
-    <string name="zen_mode_when" msgid="7835420687948416255">"تشغيل تلقائي"</string>
+    <string name="zen_mode_when" msgid="7835420687948416255">"تفعيل تلقائي"</string>
     <string name="zen_mode_when_never" msgid="4506296396609224524">"مطلقًا"</string>
     <string name="zen_mode_when_every_night" msgid="3942151668791426194">"كل ليلة"</string>
     <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"ليالي الأسبوع"</string>
@@ -3740,13 +3742,13 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"التغيير إلى التنبيهات فقط حتى <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"تغيير إلى المقاطعة دائمًا"</string>
-    <string name="zen_mode_screen_on" msgid="7098470659072167219">"عندما تكون الشاشة قيد التشغيل"</string>
+    <string name="zen_mode_screen_on" msgid="7098470659072167219">"عندما تكون الشاشة قيد التفعيل"</string>
     <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"السماح للإشعارات التي تم كتم صوتها بواسطة وضع \"الرجاء عدم الإزعاج\" بالظهور بسرعة على الشاشة وعرض رمز شريط الحالة"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"عندما تكون الشاشة متوقفة"</string>
     <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة وإحداث وميض ضوئي"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"السماح للإشعارات التي يتجاهلها وضع \"الرجاء عدم الإزعاج\" بتشغيل الشاشة"</string>
     <string name="notification_app_settings_button" msgid="3651180424198580907">"إعدادات الإشعارات"</string>
-    <string name="suggestion_button_text" msgid="5783566542423813847">"موافق"</string>
+    <string name="suggestion_button_text" msgid="5783566542423813847">"حسنًا"</string>
     <string name="device_feedback" msgid="4042352891448769818">"إرسال تعليقات حول هذا الجهاز"</string>
     <string name="restr_pin_enter_admin_pin" msgid="8577847751493521230">"إدخال رقم التعريف الشخصي للمشرف"</string>
     <string name="switch_on_text" msgid="7100491749799298324">"مفعّل"</string>
@@ -3896,10 +3898,10 @@
     <string name="system_default_app" msgid="1454719098589351197">"(الإعداد التلقائي للنظام)"</string>
     <string name="apps_storage" msgid="5658466038269046038">"مساحة تخزين التطبيقات"</string>
     <string name="usage_access" msgid="2023443456361489516">"الوصول إلى بيانات الاستخدام"</string>
-    <string name="permit_usage_access" msgid="3321727608629752758">"السماح بالدخول إلى الاستخدام"</string>
-    <string name="app_usage_preference" msgid="5691545073101551727">"تفضيلات استخدام التطبيقات"</string>
+    <string name="permit_usage_access" msgid="3321727608629752758">"السماح بالوصول إلى بيانات الاستخدام"</string>
+    <string name="app_usage_preference" msgid="5691545073101551727">"الإعدادات المفضّلة لاستخدام التطبيقات"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"وقت الشاشة"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"يتيح الدخول إلى الاستخدام للتطبيق تتبع التطبيقات الأخرى التي تستخدمها ومدى تكرار استخدامها ومشغل شبكة الجوال وإعدادات اللغة بالإضافة إلى تفاصيل أخرى."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"عند السماح بالوصول إلى بيانات الاستخدام، سيتمكّن التطبيق من تتبع التطبيقات الأخرى التي تستخدمها ومدى تكرار استخدامها وكذلم تتبّع مشغّل شبكة الجوال وإعدادات اللغة بالإضافة إلى تفاصيل أخرى."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"الذاكرة"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"تفاصيل الذاكرة"</string>
     <string name="always_running" msgid="5320183445080208766">"يعمل دائمًا (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3946,8 +3948,8 @@
     <string name="additional_permissions" msgid="3142290772324571654">"أذونات إضافية"</string>
     <string name="additional_permissions_more" msgid="714264060348056246">"<xliff:g id="COUNT">%1$d</xliff:g> أخرى"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1390719492733882678">"هل تريد مشاركة تقرير الخطأ؟"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحرِّي مشكلة هذا الجهاز وإصلاحها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحرِّي مشكلة هذا الجهاز وإصلاحها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات، كما يمكن أن تبطَأ سرعة تشغيل جهازك مؤقتًا."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحديد مشكلة هذا الجهاز وحلّها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"طلب مشرف تكنولوجيا المعلومات الحصول على تقرير خطأ للمساعدة في تحديد مشكلة هذا الجهاز وحلّها؛ ويمكن أن تتم مشاركة التطبيقات والبيانات، كما يمكن أن تبطَأ سرعة تشغيل جهازك مؤقتًا."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"تتم مشاركة تقرير الخطأ هذا مع مشرف تكنولوجيا المعلومات. اتصل به للحصول على المزيد من التفاصيل."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"مشاركة"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"رفض"</string>
@@ -3984,7 +3986,7 @@
     <string name="background_check_pref" msgid="664081406854758392">"فحص الخلفية"</string>
     <string name="background_check_title" msgid="4136736684290307970">"الوصول الكامل إلى الخلفية"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"استخدام النص من الشاشة"</string>
-    <string name="assist_access_context_summary" msgid="5867997494395842785">"السماح للتطبيق المساعد بالوصول إلى محتوى الشاشة كالنص"</string>
+    <string name="assist_access_context_summary" msgid="5867997494395842785">"السماح للتطبيق المساعد بالوصول إلى محتوى الشاشة كنص"</string>
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"استخدام لقطة الشاشة"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"السماح للتطبيق المساعد بالوصول إلى صورة للشاشة"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"إظهار وميض على الشاشة"</string>
@@ -4016,8 +4018,8 @@
     <string name="memory_maximum_usage" msgid="4734981118293469479">"الاستخدام الأقصى"</string>
     <string name="no_data_usage" msgid="903383745620135746">"لم يتم استخدام أي بيانات"</string>
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"هل تسمح بوصول \"<xliff:g id="APP">%1$s</xliff:g>\" إلى إعداد \"عدم الإزعاج\"؟"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"سيكون التطبيق قادرًا على تشغيل/إيقاف ميزة \"عدم الإزعاج\" وإجراء تغييرات على الإعدادات ذات الصلة."</string>
-    <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"يجب أن يظل قيد التشغيل نظرًا لأن الوصول إلى الإشعارات قيد التشغيل"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"سيكون التطبيق قادرًا على تفعيل/إيقاف ميزة \"عدم الإزعاج\" وإجراء تغييرات على الإعدادات ذات الصلة."</string>
+    <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"يجب أن يظل قيد التفعيل نظرًا لأن الوصول إلى الإشعارات قيد التفعيل"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"هل تريد إبطال إمكانية وصول تطبيق <xliff:g id="APP">%1$s</xliff:g> إلى قواعد \"عدم الإزعاج\"؟"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"ستتم إزالة كل قواعد \"عدم الإزعاج\" التي أنشأها هذا التطبيق."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"عدم تحسين"</string>
@@ -4058,7 +4060,7 @@
     <string name="camera_gesture_title" msgid="899403310746415135">"يمكنك اللف مرتين لفتح الكاميرا"</string>
     <string name="camera_gesture_desc" msgid="7751841175916789527">"يمكنك فتح تطبيق الكاميرا من خلال لف رسغك مرتين"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="8874747801078147525">"اضغط على زر التشغيل مرتين لتشغيل الكاميرا"</string>
-    <string name="camera_double_tap_power_gesture_desc" msgid="6166349645433682873">"فتح الكاميرا سريعًا بدون إلغاء تأمين الشاشة"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="6166349645433682873">"فتح الكاميرا سريعًا بدون فتح قفل الشاشة"</string>
     <string name="screen_zoom_title" msgid="164369086350486104">"حجم العرض"</string>
     <string name="screen_zoom_short_summary" msgid="5508079362742276703">"يمكنك تكبير العناصر المعروضة على الشاشة أو تصغيرها."</string>
     <string name="screen_zoom_keywords" msgid="8358462497896524092">"عرض، كثافة، شاشة تصغير/تكبير، تغيير الحجم، ضبط الحجم"</string>
@@ -4117,16 +4119,16 @@
     <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"يمكن للمشرف مراقبة التطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك الإعدادات والأذونات والدخول إلى المؤسسة ونشاط الشبكة ومعلومات موقع الجهاز."</string>
     <string name="admin_device_owner_message" msgid="1823477572459610869">"يمكن للمشرف مراقبة التطبيقات والبيانات المرتبطة بهذا الجهاز وإدارتها، بما في ذلك الإعدادات والأذونات والدخول إلى المؤسسة ونشاط الشبكة ومعلومات موقع الجهاز."</string>
     <string name="condition_turn_off" msgid="4395150881365143558">"إيقاف"</string>
-    <string name="condition_turn_on" msgid="1699088245481841159">"تشغيل"</string>
+    <string name="condition_turn_on" msgid="1699088245481841159">"تفعيل"</string>
     <string name="condition_expand_show" msgid="4118818022763913777">"إظهار"</string>
     <string name="condition_expand_hide" msgid="1112721783024332643">"إخفاء"</string>
     <string name="condition_hotspot_title" msgid="4143299802283098506">"نقطة الاتصال مفعّلة"</string>
-    <string name="condition_airplane_title" msgid="8484582712516148433">"وضع الطائرة قيد التشغيل"</string>
+    <string name="condition_airplane_title" msgid="8484582712516148433">"وضع الطائرة قيد التفعيل"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"الشبكات غير متوفرة"</string>
     <string name="condition_zen_title" msgid="2128184708916052585">"تمّ تفعيل \"الرجاء عدم الإزعاج\""</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"تم كتم صوت الهاتف."</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"مع بعض الاستثناءات"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"تم تشغيل وضع توفير شحن البطارية"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"تم تفعيل وضع توفير شحن البطارية"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"تم تقييد الميزات."</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"تم إيقاف بيانات الجوّال"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"يتوفّر الإنترنت من خلال Wi‑Fi فقط."</string>
@@ -4210,7 +4212,7 @@
     <string name="data_usage_other_apps" msgid="7002491980141402084">"التطبيقات الأخرى المضمّنة في الاستخدام"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
       <item quantity="zero">هناك <xliff:g id="COUNT">%1$d</xliff:g> تطبيق مسموح له باستخدام البيانات بدون قيود عند تفعيل ميزة \"توفير البيانات\"</item>
-      <item quantity="two">هناك تطبيقان (<xliff:g id="COUNT">%1$d</xliff:g>) مسموح لهما باستخدام البيانات بدون قيود عند تشغيل توفير البيانات</item>
+      <item quantity="two">هناك تطبيقان (<xliff:g id="COUNT">%1$d</xliff:g>) مسموح لهما باستخدام البيانات بدون قيود عند تفعيل توفير البيانات</item>
       <item quantity="few">هناك <xliff:g id="COUNT">%1$d</xliff:g> تطبيقات مسموح لها باستخدام البيانات بدون قيود عند تفعيل ميزة \"توفير البيانات\"</item>
       <item quantity="many">هناك <xliff:g id="COUNT">%1$d</xliff:g> تطبيقًا مسموح لها باستخدام البيانات بدون قيود عند تفعيل ميزة \"توفير البيانات\"</item>
       <item quantity="other">هناك <xliff:g id="COUNT">%1$d</xliff:g> تطبيق مسموح له باستخدام البيانات بدون قيود عند تفعيل ميزة \"توفير البيانات\"</item>
@@ -4241,7 +4243,7 @@
     <string name="data_saver_title" msgid="7903308134514179256">"توفير البيانات"</string>
     <string name="unrestricted_data_saver" msgid="9139401849550738720">"الاستخدام غير المقيّد للبيانات"</string>
     <string name="restrict_background_blacklisted" msgid="7158991683849067124">"تم إيقاف بيانات الخلفية."</string>
-    <string name="data_saver_on" msgid="7281809065420480881">"قيد التشغيل"</string>
+    <string name="data_saver_on" msgid="7281809065420480881">"قيد التفعيل"</string>
     <string name="data_saver_off" msgid="7439439787358504018">"غير مفعّل"</string>
     <string name="data_saver_switch_title" msgid="8244008132112735207">"استخدام أداة توفير البيانات"</string>
     <string name="unrestricted_app_title" msgid="4390661122069905122">"الاستخدام غير المقيَّد للبيانات"</string>
@@ -4253,9 +4255,9 @@
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1058173991832208485">"رقم التعريف الشخصي مطلوب لبدء تشغيل جهازك. ويتعذر على هذا الجهاز استقبال المكالمات أو الرسائل أو الإشعارات أو التنبيهات أثناء إيقاف تشغيله."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="1266300087760553585">"كلمة المرور مطلوبة لبدء تشغيل جهازك. ويتعذر على هذا الجهاز استقبال المكالمات أو الرسائل أو الإشعارات أو التنبيهات أثناء إيقاف تشغيله."</string>
     <string name="suggestion_additional_fingerprints" msgid="3434467207282466411">"إضافة بصمة إصبع أخرى"</string>
-    <string name="suggestion_additional_fingerprints_summary" msgid="1916547587832484196">"إلغاء القفل باستخدام إصبع مختلف"</string>
+    <string name="suggestion_additional_fingerprints_summary" msgid="1916547587832484196">"فتح القفل باستخدام إصبع مختلف"</string>
     <string name="battery_saver_on_summary" msgid="6841062406467435672">"مفعّل"</string>
-    <string name="battery_saver_off_scheduled_summary" msgid="3740414764069188669">"سيتم التشغيل تلقائيًا عند الوصول إلى <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_scheduled_summary" msgid="3740414764069188669">"سيتم التفعيل تلقائيًا عند الوصول إلى <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8736555723004299721">"غير مفعّل"</string>
     <string name="battery_saver_button_turn_on" msgid="3748696527267573793">"التفعيل الآن"</string>
     <string name="battery_saver_button_turn_off" msgid="2912950982503267828">"إيقاف الميزة الآن"</string>
@@ -4315,7 +4317,7 @@
       <item quantity="one">يمكن لتطبيق واحد استخدام البيانات غير المقيّدة</item>
     </plurals>
     <string name="special_access_more" msgid="7086690625048471400">"الاطّلاع على المزيد"</string>
-    <string name="confirm_convert_to_fbe_warning" msgid="4972595831034280189">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى تشفير الملفات؟"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="4972595831034280189">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى ترميز الملفات؟"</string>
     <string name="button_confirm_convert_fbe" msgid="419832223125147297">"مسح وتحويل"</string>
     <string name="reset_shortcut_manager_throttling" msgid="1912184636360233397">"إعادة ضبط تقييد المعدّل في ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="2932990541160593632">"تمت إعادة ضبط تقييد المعدّل في ShortcutManager."</string>
@@ -4412,11 +4414,11 @@
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"الاطّلاع على الإشعارات بسرعة"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"مفعّل"</string>
     <string name="gesture_setting_off" msgid="2540159841716890511">"غير مفعّلة"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"تم إلغاء قفل برنامج التحميل مسبقاً"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"تم فتح قفل برنامج التحميل مسبقاً"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="262986780389836168">"الاتصال بالإنترنت أولاً"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="3331374502670483142">"الاتصال بالإنترنت أو الاتصال بمشغِّل شبكة الجوّال"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5223278198179877704">"عدم التوفر على الأجهزة التي يقفلها مشغل شبكة الجوال"</string>
-    <string name="oem_lock_info_message" msgid="5090850412279403901">"يُرجى إعادة تشغيل الجهاز لتمكين ميزة حماية الجهاز."</string>
+    <string name="oem_lock_info_message" msgid="5090850412279403901">"يُرجى إعادة تشغيل الجهاز لتفعيل ميزة حماية الجهاز."</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7360443072390107772">"تمت إتاحة <xliff:g id="SIZE">%1$s</xliff:g> كإجمالي\n\nتم تنفيذ العملية آخر مرة في <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4462106633708675959">"التطبيقات الفورية"</string>
     <string name="web_action_enable_summary" msgid="1729016644691793085">"فتح الروابط في التطبيقات، حتى إذا لم تكن التطبيقات مثبّتة"</string>
@@ -4431,7 +4433,7 @@
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"مزامنة بيانات العمل تلقائيًا"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"السماح للتطبيقات بتحديث البيانات تلقائيًا"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"مزامنة الحساب"</string>
-    <string name="account_sync_summary_some_on" msgid="1934556869158274053">"تم تفعيل المزامنة لـ <xliff:g id="ID_1">%1$d</xliff:g> من إجمالي <xliff:g id="ID_2">%2$d</xliff:g> عناصر"</string>
+    <string name="account_sync_summary_some_on" msgid="1934556869158274053">"تم تفعيل المزامنة لـ <xliff:g id="ID_1">%1$d</xliff:g> من إجمالي <xliff:g id="ID_2">%2$d</xliff:g> عنصر."</string>
     <string name="account_sync_summary_all_on" msgid="3634161204232431700">"تم تفعيل المزامنة لكل العناصر"</string>
     <string name="account_sync_summary_all_off" msgid="1971584632343645602">"المزامنة متوقفة لكل العناصر"</string>
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"معلومات الجهاز المُدار"</string>
@@ -4472,9 +4474,9 @@
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="5885916325874284011">"لوحة المفاتيح التلقائية"</string>
     <string name="enterprise_privacy_input_method_name" msgid="439610095825218563">"تعيين على <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
-    <string name="enterprise_privacy_always_on_vpn_device" msgid="2022700916516458213">"تم تشغيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\""</string>
-    <string name="enterprise_privacy_always_on_vpn_personal" msgid="5644065780843002044">"تم تشغيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"تم تشغيل \"شبكة افتراضية خاصة (VPN) دائمة التشغيل\" في الملف الشخصي للعمل"</string>
+    <string name="enterprise_privacy_always_on_vpn_device" msgid="2022700916516458213">"تم تفعيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التفعيل\""</string>
+    <string name="enterprise_privacy_always_on_vpn_personal" msgid="5644065780843002044">"تم تفعيل إعداد \"شبكة افتراضية خاصة (VPN) دائمة التفعيل\" في الملف الشخصي"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"تم تفعيل \"شبكة افتراضية خاصة (VPN) دائمة التفعيل\" في الملف الشخصي للعمل"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="3862135895716080830">"تم تعيين الخادم الوكيل HTTP العام"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="7715658848470643878">"بيانات الاعتماد الموثوقة"</string>
     <string name="enterprise_privacy_ca_certs_personal" msgid="1356447417193483802">"بيانات اعتماد موثوقة في ملفك الشخصي"</string>
@@ -4540,7 +4542,7 @@
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"مساحة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6924662861545958442">"مستخدمة"</string>
-    <string name="clear_instant_app_data" msgid="3673669086522890405">"مسح التطبيق"</string>
+    <string name="clear_instant_app_data" msgid="3673669086522890405">"محو التطبيق"</string>
     <string name="clear_instant_app_confirmation" msgid="1778553115373698061">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
     <string name="launch_instant_app" msgid="5251693061228352333">"فتح"</string>
     <string name="game_storage_settings" msgid="6856911551799175914">"الألعاب"</string>
@@ -4576,6 +4578,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ستؤدي إلى إبطاء هذا الهاتف."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"فرض كامل لقياسات GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"تتبّع جميع مجموعات وفترات تكرار GNSS التي لا تحتوي على دورات عمل"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"تصحيح أخطاء تبديل المستخدم"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"إظهار التفاصيل أثناء تبديل المستخدم"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"السماح ببدء الأنشطة في الخلفية"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"السماح ببدء جميع الأنشطة في الخلفية"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"عرض مربع حوار الأعطال دائمًا"</string>
@@ -4711,7 +4715,7 @@
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"اسم شريحة SIM"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"إعادة تسمية"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"استخدام شريحة SIM"</string>
-    <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"موقوف"</string>
+    <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"غير مفعّل"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"هل تريد التبديل إلى <xliff:g id="CARRIER">%1$s</xliff:g>؟"</string>
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها في آن واحد.\n\nلن يؤدي اختيار <xliff:g id="CARRIER1">%1$s</xliff:g> كبديل إلى إلغاء خدمة <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"التبديل إلى <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
diff --git a/tests/CarDeveloperOptions/res/values-as-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-as-nokeys/strings.xml
new file mode 100644
index 0000000..c4b68d6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-as-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"এপ্লিকেশ্বনবোৰ পৰিচালনা কৰক"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-as/arrays.xml b/tests/CarDeveloperOptions/res/values-as/arrays.xml
new file mode 100644
index 0000000..f31c3f4
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-as/arrays.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"আমেৰিকা"</item>
+    <item msgid="4791956477275129121">"ইউৰোপ"</item>
+    <item msgid="3812126832016254559">"আফ্ৰিকা"</item>
+    <item msgid="2765816300353408280">"এছিয়া"</item>
+    <item msgid="6683489385344409742">"অষ্ট্ৰেলিয়া"</item>
+    <item msgid="5194868215515664953">"প্ৰশান্ত মহাসাগৰীয়"</item>
+    <item msgid="7044520255415007865">"সকলো"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for screen_timeout_entries:5 (5827960506924849753) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"তৎক্ষণাৎ"</item>
+    <item msgid="2038544972632026612">"৫ ছেকেণ্ড"</item>
+    <item msgid="5558060663472279597">"১৫ ছেকেণ্ড"</item>
+    <item msgid="45341168505452037">"৩০ ছেকেণ্ড"</item>
+    <item msgid="227647485917789272">"১ মিনিট"</item>
+    <item msgid="3367011891231217504">"২ মিনিট"</item>
+    <item msgid="4376575879222393045">"৫ মিনিট"</item>
+    <item msgid="811192536981678974">"১০ মিনিট"</item>
+    <item msgid="7258394417241706272">"৩০ মিনিট"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"সংযোগ কৰা হ’ল"</item>
+    <item msgid="983792611851499732">"নিমন্ত্ৰিত"</item>
+    <item msgid="5438273405428201793">"অসফল"</item>
+    <item msgid="4646663015449312554">"উপলব্ধ"</item>
+    <item msgid="3230556734162006146">"সীমাৰ বাহিৰত"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ছিষ্টেম ডিফ\'ল্ট ব্যৱহাৰ কৰক: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"১"</item>
+    <item msgid="5318020123964299318">"২"</item>
+    <item msgid="6429260054182662738">"৩"</item>
+    <item msgid="1644506614010085798">"৪"</item>
+    <item msgid="3132506679404897150">"৫"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"যোৱা ৩০ দিন"</item>
+    <item msgid="3211287705232736964">"ডেটা ব্যৱহাৰ চক্ৰ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ব্যৱহাৰৰ সময়"</item>
+    <item msgid="2784401352592276015">"অন্তিমবাৰ ব্যৱহাৰ হৈছে"</item>
+    <item msgid="249854287216326349">"এপৰ নাম"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"পিইএপি"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"নাই"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"নাই"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ছিম"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"নাই"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"নাই"</item>
+    <item msgid="1464741437353223198">"মেনুএল"</item>
+    <item msgid="5793600062487886090">"প্ৰক্সি স্বয়ং-কনফিগাৰেশ্বন"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"নাই"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP বা CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+    <!-- no translation found for bearer_entries:0 (5231094118929435723) -->
+    <!-- no translation found for bearer_entries:9 (7246853278334311652) -->
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"নাই"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"আভ্যন্তৰীণ ডিভাইচ সঞ্চয়াগাৰ"</item>
+    <item msgid="3186681694079967527">"গুচাব পৰা SD কাৰ্ড"</item>
+    <item msgid="6902033473986647035">"ছিষ্টেমটোক সিদ্ধান্ত ল’বলৈ দিয়ক"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"অৱস্থান"</item>
+    <item msgid="6842381562497597649">"ব্যক্তিগত"</item>
+    <item msgid="3966700236695683444">"মেছেজিং"</item>
+    <item msgid="8563996233342430477">"মিডিয়া"</item>
+    <item msgid="5323851085993963783">"ডিভাইচ"</item>
+  </string-array>
+    <!-- no translation found for app_ops_summaries:46 (4933375960222609935) -->
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+    <!-- no translation found for app_ops_labels:48 (8291198322681891160) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"চুটি"</item>
+    <item msgid="4816511817309094890">"মধ্যমীয়া"</item>
+    <item msgid="8305084671259331134">"দীঘল"</item>
+  </string-array>
+    <!-- no translation found for captioning_typeface_selector_titles:4 (1487203730637617924) -->
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"২৫%"</item>
+    <item msgid="4665048002584838262">"৫০%"</item>
+    <item msgid="1874668269931014581">"৭৫%"</item>
+    <item msgid="6462911487571123954">"১০০%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"পিপিটিপি ভিপিএন"</item>
+    <item msgid="1349760781118368659">"পূৰ্বে ভাগ-বতৰা কৰা কীসমূহৰ সৈতে L2TP/IPSec ভিপিএন"</item>
+    <item msgid="6128519070545038358">"প্ৰমাণপত্ৰসহ L2TP/IPSec ভিপিএন"</item>
+    <item msgid="312397853907741968">"পূৰ্বতে শ্বেয়াৰ কৰা কী আৰু Xauth সত্যাপনসহ IPSec ভিপিএন"</item>
+    <item msgid="3319427315593649917">"প্ৰমাণপত্ৰ আৰু Xauth বিশ্ৱাসযোগ্যতা প্ৰামাণিকৰণৰ সৈতে IPSec ভিপিএন"</item>
+    <item msgid="8258927774145391041">"প্ৰমাণপত্ৰ আৰু হাইব্ৰিড সত্যাপনসহ IPSec ভিপিএন"</item>
+  </string-array>
+    <!-- no translation found for vpn_proxy_settings:0 (2958623927055120839) -->
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"সোধক"</item>
+    <item msgid="7718817231348607934">"কেতিয়াও অনুমতি নিদিব"</item>
+    <item msgid="8184570120217958741">"চিৰদিনৰ বাবে অনুমোদন"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"নেৰানেপেৰা"</item>
+    <item msgid="167418068739176448">"শীৰ্ষ কাৰ্যকলাপ"</item>
+    <item msgid="4760813290195199773">"গুৰুত্বপূৰ্ণ (নেপথ্য)"</item>
+    <item msgid="2328684826817647595">"গুৰুত্বপূৰ্ণ (নেপথ্য)"</item>
+    <item msgid="7746406490652867365">"বেকআপ"</item>
+    <item msgid="5597404364389196754">"অত্য়ধিক"</item>
+    <item msgid="1290888779300174556">"সেৱা (চলিত)"</item>
+    <item msgid="7241098542073939046">"সেৱা (ৰিষ্টাৰ্ট কৰা হৈছে)"</item>
+    <item msgid="6610439017684111046">"ৰিচিভাৰ"</item>
+    <item msgid="7367606086319921117">"হ\'ম"</item>
+    <item msgid="3344660712396741826">"অন্তিম কাৰ্যকলাপ"</item>
+    <item msgid="5006559348883303865">"কেশ্ব কৰা হোৱা (কাৰ্যকলাপ)"</item>
+    <item msgid="8633480732468137525">"কেশ্ব কৰা হোৱা (কাৰ্যকলাপ গ্ৰাহক)"</item>
+    <item msgid="6248998242443333892">"কেশ্ব কৰা হোৱা (খালী)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"গাঢ় সেউজ-নীলা"</item>
+    <item msgid="3228505970082457852">"নীলা"</item>
+    <item msgid="6590260735734795647">"ইণ্ডিগ\'"</item>
+    <item msgid="3521763377357218577">"বেঙুনীয়া"</item>
+    <item msgid="5932337981182999919">"গুলপীয়া"</item>
+    <item msgid="5642914536624000094">"ৰঙা"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"৩০দিনতকৈ অধিক পুৰণি"</item>
+    <item msgid="8699273238891265610">"৬০ দিনতকৈ অধিক পুৰণি"</item>
+    <item msgid="8346279419423837266">"৯০ দিনতকৈ অধিক পুৰণি"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"১"</item>
+    <item msgid="3118234477029486741">"০"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"স্ৱয়ংক্ৰিয়ভাৱে চিনাক্ত কৰক"</item>
+    <item msgid="773943026484148895">"মিটাৰ কৰা হিছাপে আচৰণ কৰক"</item>
+    <item msgid="1008268820118852416">"নিৰিখ অনিৰ্দিষ্ট বুলি গণ্য কৰক"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"যাদৃচ্ছিক MAC ব্যৱহাৰ কৰক (ডিফ’ল্ট)"</item>
+    <item msgid="214234417308375326">"ডিভাইচৰ MAC ব্যৱহাৰ কৰক"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"নহয়"</item>
+    <item msgid="1930581185557754880">"হয়"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"গাঢ়"</item>
+    <item msgid="5079453644557603349">"পাতল"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"অফ"</item>
+    <item msgid="4072198137051566919">"ডিবাগ"</item>
+    <item msgid="2473005316958868509">"ভাৰ্ব\'ছ"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"কেৱল গৃহ পৃষ্ঠাত"</item>
+    <item msgid="1161026694891024702">"স্বয়ংক্ৰিয়"</item>
+  </string-array>
+    <!-- no translation found for preferred_network_mode_choices:11 (5713723042183940349) -->
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"গোলকীয়"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-as/strings.xml b/tests/CarDeveloperOptions/res/values-as/strings.xml
index f623333..774a801 100644
--- a/tests/CarDeveloperOptions/res/values-as/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-as/strings.xml
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"আপোনাৰ টেবলেটটো কোনো স্ক্ৰীণ লক বিকল্পৰ দ্বাৰা সুৰক্ষিত কৰক যাতে চুৰি হ’লে বা হেৰালে কোনেও সেইটো ব্যৱহাৰ কৰিব নোৱাৰে। মুখমণ্ডল প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। বাতিল কৰক-ত টিপক, তাৰ পিছত পিন ছেট কৰক বা অন্য এটা স্ক্ৰীণ লক বিকল্প বাছনি কৰক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"আপোনাৰ ডিভাইচটো কোনো স্ক্ৰীণ লক বিকল্পৰ দ্বাৰা সুৰক্ষিত কৰক যাতে চুৰি হ’লে বা হেৰালে কোনেও সেইটো ব্যৱহাৰ কৰিব নোৱাৰে। মুখমণ্ডল প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। বাতিল কৰক-ত টিপক, তাৰ পিছত পিন ছেট কৰক বা অন্য এটা স্ক্ৰীণ লক বিকল্প বাছনি কৰক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"আপোনাৰ ফ’নটো কোনো স্ক্ৰীণ লক বিকল্পৰ দ্বাৰা সুৰক্ষিত কৰক যাতে চুৰি হ’লে বা হেৰালে কোনেও সেইটো ব্যৱহাৰ কৰিব নোৱাৰে। মুখমণ্ডল প্ৰমাণীকৰণ ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। বাতিল কৰক-ত টিপক, তাৰ পিছত পিন ছেট কৰক বা অন্য এটা স্ক্ৰীণ লক বিকল্প বাছনি কৰক।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"পিন ছেট আপ নকৰাকৈ এৰি যাবনে?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"পাছৱৰ্ড ছেট আপ এৰি যাব নেকি?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"আৰ্হি ছেট আপ এৰি যাব নেকি?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"স্ক্ৰীণ লক ছেট আপ কৰক"</string>
@@ -1091,8 +1090,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ৱাই-ফাই"</item>
+    <item msgid="4421333712484542489">"ম’বাইল"</item>
+    <item msgid="6007360612667098926">"ৱাই-ফাই মাত্ৰ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2611,7 +2613,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"এতিয়াই ছিংক কৰিবলৈ টিপক<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"কেলেণ্ডাৰ"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"সম্পৰ্কসমূহ"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ছিংকলৈ আপোনাক স্বাগতম!"</font>" \nডেটা ছিংক কৰাৰ এইয়া Googleৰ এটা পদক্ষেপ, যাৰদ্বাৰা আপুনি য\'তেই নাথাকক ত\'তে সম্পৰ্কসূচী, সাক্ষাতৰ সময়সূচীকে ধৰি আপোনাৰ বাবে অতি দৰকাৰী তথ্যসমূহ থাওকতে পাব।"</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"এপৰ ছিংক ছেটিংসমূহ"</string>
@@ -4271,6 +4273,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ইয়ে এই ফ’নটো মন্থৰ কৰিব"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"সম্পূৰ্ণ জিএনএছএছ পৰিমাপ প্ৰয়োগ কৰক"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ব্যৱহাৰকাৰী সলনি কৰাৰ সম্পর্কে সবিশেষ তথ্য দেখুৱাওক"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ব্যৱহাৰকাৰী সলনি কৰাৰ সময়ত সবিশেষ তথ্য দেখুৱাওক"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"নেপথ্যৰ কাৰ্যকলাপ আৰম্ভ কৰাত অনুমতি দিয়ে"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"সকলো নেপথ্যৰ কাৰ্যকলাপ আৰম্ভ কৰাত অনুমতি দিয়ে"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"সদায় ক্ৰেশ্ব ডায়ল\'গ দেখুৱাওক"</string>
diff --git a/tests/CarDeveloperOptions/res/values-az-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-az-nokeys/strings.xml
new file mode 100644
index 0000000..86c4635
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-az-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Tətbiqləri idarə edin"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-az/arrays.xml b/tests/CarDeveloperOptions/res/values-az/arrays.xml
new file mode 100644
index 0000000..d6ee9b7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-az/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Avropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asiya"</item>
+    <item msgid="6683489385344409742">"Avstraliya"</item>
+    <item msgid="5194868215515664953">"Sakit Okean"</item>
+    <item msgid="7044520255415007865">"Bütün"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 saniyə"</item>
+    <item msgid="772029947136115322">"30 saniyə"</item>
+    <item msgid="8743663928349474087">"1 dəqiqə"</item>
+    <item msgid="1506508631223164814">"2 dəqiqə"</item>
+    <item msgid="8664703938127907662">"5 dəqiqə"</item>
+    <item msgid="5827960506924849753">"10 dəqiqə"</item>
+    <item msgid="6677424950124253938">"30 dəqiqə"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Heç vaxt"</item>
+    <item msgid="2517785806387977252">"15 saniyə"</item>
+    <item msgid="6347954399441173672">"30 saniyə"</item>
+    <item msgid="4858305253279921789">"1 dəqiqə"</item>
+    <item msgid="8109273437140044073">"2 dəqiqə"</item>
+    <item msgid="2788593551142462622">"5 dəqiqə"</item>
+    <item msgid="8012672183888404961">"10 dəqiqə"</item>
+    <item msgid="8271452751594598661">"30 dəqiqə"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Dərhal"</item>
+    <item msgid="2038544972632026612">"5 saniyə"</item>
+    <item msgid="5558060663472279597">"15 saniyə"</item>
+    <item msgid="45341168505452037">"30 saniyə"</item>
+    <item msgid="227647485917789272">"1 dəqiqə"</item>
+    <item msgid="3367011891231217504">"2 dəqiqə"</item>
+    <item msgid="4376575879222393045">"5 dəqiqə"</item>
+    <item msgid="811192536981678974">"10 dəqiqə"</item>
+    <item msgid="7258394417241706272">"30 dəqiqə"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Kiçik"</item>
+    <item msgid="591935967183159581">"Defolt"</item>
+    <item msgid="1714184661981538355">"Böyük"</item>
+    <item msgid="6195563047686707484">"Ən böyük"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skan edilir ..."</item>
+    <item msgid="5597394826455877834">"Qoşulur..."</item>
+    <item msgid="5848277343965362748">"Autentifikasiya..."</item>
+    <item msgid="3391238031431440676">"IP ünvanı əldə edilir..."</item>
+    <item msgid="5257597310494000224">"Qoşuldu"</item>
+    <item msgid="8472497592913050396">"Dayandırılıb"</item>
+    <item msgid="1228072488815999109">"Ayrılır..."</item>
+    <item msgid="7253087004422991731">"Əlaqə kəsildi"</item>
+    <item msgid="4169850917304751227">"Uğursuz"</item>
+    <item msgid="6266658166690831131">"Bloklanmış"</item>
+    <item msgid="4517230805854909775">"Keyfiyyətsiz bağlantıdan müvəqqəti qaçış"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skan edilir..."</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> qoşulur…"</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ilə doğrulanır"</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsindən IP ünvan əldə edilir"</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> qoşuldu"</item>
+    <item msgid="6600156231416890902">"Dayandırılıb"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsindən ayrılır..."</item>
+    <item msgid="3980154971187953257">"Əlaqə kəsildi"</item>
+    <item msgid="2847316776634969068">"Uğursuz"</item>
+    <item msgid="4390990424746035383">"Bloklanmış"</item>
+    <item msgid="3618248791367063949">"Zəif bağlantı müvəqqəti aradan qaldırılır"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Düyməsinə basın"</item>
+    <item msgid="7401896200768713930">"Eynisəviyyəli cihazdan PIN"</item>
+    <item msgid="4526848028011846710">"Bu cihazdan PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Qoşuldu"</item>
+    <item msgid="983792611851499732">"Dəvət edilib"</item>
+    <item msgid="5438273405428201793">"Uğursuz"</item>
+    <item msgid="4646663015449312554">"Əlçatandır"</item>
+    <item msgid="3230556734162006146">"Diapazondan kənar"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 dəqiqə"</item>
+    <item msgid="2759776603549270587">"5 dəqiqə"</item>
+    <item msgid="167772676068860015">"1 saat"</item>
+    <item msgid="5985477119043628504">"Heç vaxt taym aut olmasın"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sistem Defoltundan istifadə edin: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Zəif"</item>
+    <item msgid="7882129634982603782">"Keyfiyyətsiz"</item>
+    <item msgid="6457357501905996224">"Kafi"</item>
+    <item msgid="405271628162918841">"Yaxşı"</item>
+    <item msgid="999948812884919584">"Əla"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Son 30 gün"</item>
+    <item msgid="3211287705232736964">"İstifadə siklini əldə edin..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"İstifadə müddəti"</item>
+    <item msgid="2784401352592276015">"Son istifadə vaxtı"</item>
+    <item msgid="249854287216326349">"Tətbiq adı"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Heç biri"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Heç biri"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Heç biri"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statik"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Heç biri"</item>
+    <item msgid="1464741437353223198">"Dərslik"</item>
+    <item msgid="5793600062487886090">"Proksi Avto-Konfiq"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Heç biri"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP və ya CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Bəlli edilməmiş"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Heç biri"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Cihazın daxili yaddaşı"</item>
+    <item msgid="3186681694079967527">"Çıxarılabilən SD card"</item>
+    <item msgid="6902033473986647035">"Sistem qərar versin"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Yer"</item>
+    <item msgid="6842381562497597649">"Şəxsi"</item>
+    <item msgid="3966700236695683444">"Mesajlaşma"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Cihaz"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"təxmini yerləşmə"</item>
+    <item msgid="1830619568689922920">"yaxşı yer"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrasiya"</item>
+    <item msgid="8632513128515114092">"kontaktları oxuyun"</item>
+    <item msgid="3741042113569620272">"kontaktları dəyişin"</item>
+    <item msgid="4204420969709009931">"zəng jurnalı oxuyun"</item>
+    <item msgid="2260380357119423209">"zəng jurnalına dəyişiklik edin"</item>
+    <item msgid="6550710385014530934">"təqvimi oxuyun"</item>
+    <item msgid="3575906174264853951">"təqvimə dəyişiklik edin"</item>
+    <item msgid="4319843242568057174">"wi-fi skan"</item>
+    <item msgid="2981791890467303819">"bildiriş"</item>
+    <item msgid="6617825156152476692">"mobil skan"</item>
+    <item msgid="8865260890611559753">"Telefona zəng edin"</item>
+    <item msgid="3254999273961542982">"SMS oxuyun"</item>
+    <item msgid="7711446453028825171">"SMS yazın"</item>
+    <item msgid="6123238544099198034">"SMS alın"</item>
+    <item msgid="838342167431596036">"təcili SMS alın"</item>
+    <item msgid="8554432731560956686">"MMS alın"</item>
+    <item msgid="7464863464299515059">"WAP push əldə edin"</item>
+    <item msgid="310463075729606765">"SMS göndərin"</item>
+    <item msgid="7338021933527689514">"ICC SMS oxuyun"</item>
+    <item msgid="6130369335466613036">"ICC SMS yazın"</item>
+    <item msgid="6536865581421670942">"ayarları dəyişin"</item>
+    <item msgid="4547203129183558973">"yuxarıda çəkin"</item>
+    <item msgid="9080347512916542840">"giriş bildirişi"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"audio qeydəalın"</item>
+    <item msgid="9182794235292595296">"audio oxudun"</item>
+    <item msgid="8760743229597702019">"panonu oxuyun"</item>
+    <item msgid="2266923698240538544">"panoda dəyişiklik edin"</item>
+    <item msgid="1801619438618539275">"media düymələri"</item>
+    <item msgid="31588119965784465">"audio fokus"</item>
+    <item msgid="7565226799008076833">"master həcmi"</item>
+    <item msgid="5420704980305018295">"səs həcmi"</item>
+    <item msgid="5797363115508970204">"zəng həcmi"</item>
+    <item msgid="8233154098550715999">"media həcmi"</item>
+    <item msgid="5196715605078153950">"siqnal səsi"</item>
+    <item msgid="394030698764284577">"bildiriş həcmi"</item>
+    <item msgid="8952898972491680178">"bluetooth həcmi"</item>
+    <item msgid="8506227454543690851">"oyaq saxla"</item>
+    <item msgid="1108160036049727420">"məkanı monitor edin"</item>
+    <item msgid="1496205959751719491">"yüksək enerji məkanına nəzarət"</item>
+    <item msgid="3776296279910987380">"istifadə statistikası əldə edin"</item>
+    <item msgid="8827100324471975602">"mikrofonu susdurun/susdurmayın"</item>
+    <item msgid="6880736730520126864">"tostu göstərin"</item>
+    <item msgid="4933375960222609935">"layihə mediası"</item>
+    <item msgid="8357907018938895462">"VPN aktivləşdirin"</item>
+    <item msgid="8143812849911310973">"yazı divar kağızı"</item>
+    <item msgid="6266277260961066535">"köməkçi struktur"</item>
+    <item msgid="7715498149883482300">"köməkçi skrinşot"</item>
+    <item msgid="4046679376726313293">"telefon statusunu oxuyun"</item>
+    <item msgid="6329507266039719587">"Səsli məktub əlavə edin"</item>
+    <item msgid="7692440726415391408">"sip istifadə edin"</item>
+    <item msgid="8572453398128326267">"gedən zəngi idarə edin"</item>
+    <item msgid="7775674394089376306">"barmaq izi"</item>
+    <item msgid="3182815133441738779">"bədən sensorları"</item>
+    <item msgid="2793100005496829513">"şəbəkə yayımlarını oxuyun"</item>
+    <item msgid="2633626056029384366">"sınaq yeri"</item>
+    <item msgid="8356842191824684631">"yaddaşı oxuyun"</item>
+    <item msgid="5671906070163291500">"yaddaşı yazın"</item>
+    <item msgid="2791955098549340418">"ekranı yandırın"</item>
+    <item msgid="5599435119609178367">"hesabları əldə edin"</item>
+    <item msgid="1165623660533024666">"arka fonda işləyir"</item>
+    <item msgid="6423861043647911030">"əlçatımlılıq dərəcəsi"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Qısa"</item>
+    <item msgid="4816511817309094890">"Orta"</item>
+    <item msgid="8305084671259331134">"Uzun"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Defolt"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif qatılaşmış"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Gündəlik"</item>
+    <item msgid="4627069151979553527">"Kursiv"</item>
+    <item msgid="6896773537705206194">"Kiçik böyüklər"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Çox kiçik"</item>
+    <item msgid="5091603983404027034">"Kiçik"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Böyük"</item>
+    <item msgid="218913203203160606">"Çox böyük"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Defolt"</item>
+    <item msgid="6488643537808152001">"Heç biri"</item>
+    <item msgid="552332815156010137">"Kontur"</item>
+    <item msgid="7187891159463789272">"Kölgə salın"</item>
+    <item msgid="8019330250538856521">"Qaldırılmış"</item>
+    <item msgid="8987385315647049787">"Bunalımlı"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Tətbiq defoltlarını istifadə edin"</item>
+    <item msgid="8611890312638868524">"Qara üstündə ağ"</item>
+    <item msgid="5891360837786277638">"Ağ üstündə qara"</item>
+    <item msgid="2798457065945456853">"Qara üstündə sarı"</item>
+    <item msgid="5799049811524553967">"Mavi üstündə sarı"</item>
+    <item msgid="3673930830658169860">"Fərdi"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"Öncədən paylaşılmış açarlar ilə L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN sertifikatlar"</item>
+    <item msgid="312397853907741968">"Öncədən paylaşılmış açarlar və Xauth identifikasiyasılı IPSec VPN"</item>
+    <item msgid="3319427315593649917">"Sertifikat və Xauth autentifikasiyalı IPSec VPN"</item>
+    <item msgid="8258927774145391041">"IPSec VPN sertifikatlarla və hibrid identifikasiyaları ilə"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Heç biri"</item>
+    <item msgid="1157046369795346308">"Dərslik"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Əlaqə kəsildi"</item>
+    <item msgid="8754480102834556765">"Başladılır..."</item>
+    <item msgid="3351334355574270250">"Qoşulur..."</item>
+    <item msgid="8303882153995748352">"Qoşuldu"</item>
+    <item msgid="9135049670787351881">"Zaman aşımı"</item>
+    <item msgid="2124868417182583926">"Uğursuz"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Soruş"</item>
+    <item msgid="7718817231348607934">"Heç vaxt icazə verməyin"</item>
+    <item msgid="8184570120217958741">"Həmişə icazə verin"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Davamlı"</item>
+    <item msgid="167418068739176448">"Top fəaliyyət"</item>
+    <item msgid="4760813290195199773">"Önəmli (ön plan)"</item>
+    <item msgid="2328684826817647595">"Önəmli (arxa plan)"</item>
+    <item msgid="7746406490652867365">"Yedək"</item>
+    <item msgid="5597404364389196754">"Ağır çəki"</item>
+    <item msgid="1290888779300174556">"Xidmət (aktivdir)"</item>
+    <item msgid="7241098542073939046">"Xidmət (yenidən başlanır)"</item>
+    <item msgid="6610439017684111046">"Qəbuledici"</item>
+    <item msgid="7367606086319921117">"Əsas səhifə"</item>
+    <item msgid="3344660712396741826">"Son fəaliyyət"</item>
+    <item msgid="5006559348883303865">"Keşlənmiş (fəaliyyət)"</item>
+    <item msgid="8633480732468137525">"Keşlənmiş (fəaliyyət klienti)"</item>
+    <item msgid="6248998242443333892">"Keşlənmiş (boş)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Firuzəyi"</item>
+    <item msgid="3228505970082457852">"Göy"</item>
+    <item msgid="6590260735734795647">"İndiqo"</item>
+    <item msgid="3521763377357218577">"Bənövşəyi"</item>
+    <item msgid="5932337981182999919">"Çəhrayı"</item>
+    <item msgid="5642914536624000094">"Qırmızı"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 gündən köhnədir"</item>
+    <item msgid="8699273238891265610">"60 gündən köhnədir"</item>
+    <item msgid="8346279419423837266">"90 gündən köhnədir"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Avtomatik silin"</item>
+    <item msgid="773943026484148895">"Limitli olaraq qəbul edin"</item>
+    <item msgid="1008268820118852416">"Limitisiz olaraq qəbul edin"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"İxtiyari MAC (defolt) istifadə edin"</item>
+    <item msgid="214234417308375326">"MAC cihazından istifadə edin"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Xeyr"</item>
+    <item msgid="1930581185557754880">"Bəli"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tünd"</item>
+    <item msgid="5079453644557603349">"İşıq"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Deaktiv"</item>
+    <item msgid="4072198137051566919">"Sazlama"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Yalnız daxili"</item>
+    <item msgid="1161026694891024702">"Avtomatik"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA seçilib"</item>
+    <item msgid="7581481130337402578">"Yalnız GSM"</item>
+    <item msgid="8579197487913425819">"Yalnız WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA avtomatik"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo avtomatik"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"Yalnız EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Qlobal"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"Yalnız TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Qlobal"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-az/strings.xml b/tests/CarDeveloperOptions/res/values-az/strings.xml
index 1b8f208..0011fd3 100644
--- a/tests/CarDeveloperOptions/res/values-az/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-az/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Planşetiniz itərsə və ya oğurlanarsa, başqasının istifadə edə bilməməsi üçün onu ekran kilidi ilə qoruyun. Üz tanınmasını quraşdırmaq üçün də ekran kilidi tələb edilir. \"Ləğv edin\" seçiminə klikləyin, sonra isə PIN ayarlayın, yaxud başqa ekran kilidi seçin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Cihazınız itərsə və ya oğurlanarsa, başqasının istifadə edə bilməməsi üçün onu ekran kilidi ilə qoruyun. Üz tanınmasını quraşdırmaq üçün də ekran kilidi tələb edilir. \"Ləğv edin\" seçiminə klikləyin, sonra isə PIN ayarlayın, yaxud başqa ekran kilidi seçin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefonunuz itərsə və ya oğurlanarsa, başqasının istifadə edə bilməməsi üçün onu ekran kilidi ilə qoruyun. Üz tanınmasını quraşdırmaq üçün də ekran kilidi tələb edilir. \"Ləğv edin\" seçiminə klikləyin, sonra isə PIN ayarlayın, yaxud başqa ekran kilidi seçin."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN Quraşdırması ötürülsün?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Parol Quraşdırması ötürülsün?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Nümunə Quraşdırması ötürülsün?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ekran kilidi quraşdırın"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Yalnız Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Bu telefonun sürətini yavaşladacaq"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Tam GNSS ölçülərini icra edin"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"İş sistemi olmadan bütün GNSS qruplaşmaları və tezliklərini izləyin"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"İstifadəçi dəyişməsini sazlayın"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"İstifadəçini dəyişərkən detallı məlumat göstərin"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Arxa fon fəaliyyətinin başlamasına icazə verin"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Bütün arxa fon fəaliyyətinin başlamasına icazə verir"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Xəta dialoqunu həmişə göstərin"</string>
diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn-nokeys/strings.xml
new file mode 100644
index 0000000..aae8d26
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Upravljanje aplikacijama"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
new file mode 100644
index 0000000..b459ed6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Evropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Azija"</item>
+    <item msgid="6683489385344409742">"Australija"</item>
+    <item msgid="5194868215515664953">"Pacifik"</item>
+    <item msgid="7044520255415007865">"Sve"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekundi"</item>
+    <item msgid="772029947136115322">"30 sekundi"</item>
+    <item msgid="8743663928349474087">"1 minut"</item>
+    <item msgid="1506508631223164814">"2 minuta"</item>
+    <item msgid="8664703938127907662">"5 minuta"</item>
+    <item msgid="5827960506924849753">"10 minuta"</item>
+    <item msgid="6677424950124253938">"30 minuta"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikada"</item>
+    <item msgid="2517785806387977252">"15 sekundi"</item>
+    <item msgid="6347954399441173672">"30 sekundi"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minuta"</item>
+    <item msgid="2788593551142462622">"5 minuta"</item>
+    <item msgid="8012672183888404961">"10 minuta"</item>
+    <item msgid="8271452751594598661">"30 minuta"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Odmah"</item>
+    <item msgid="2038544972632026612">"5 sekundi"</item>
+    <item msgid="5558060663472279597">"15 sekundi"</item>
+    <item msgid="45341168505452037">"30 sekundi"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minuta"</item>
+    <item msgid="4376575879222393045">"5 minuta"</item>
+    <item msgid="811192536981678974">"10 minuta"</item>
+    <item msgid="7258394417241706272">"30 minuta"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Mala"</item>
+    <item msgid="591935967183159581">"Podrazumevano"</item>
+    <item msgid="1714184661981538355">"Velika"</item>
+    <item msgid="6195563047686707484">"Najveća"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skeniranje..."</item>
+    <item msgid="5597394826455877834">"Povezivanje…"</item>
+    <item msgid="5848277343965362748">"Proveravanje autentičnosti..."</item>
+    <item msgid="3391238031431440676">"Preuzimanje IP adrese..."</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Obustavljeno"</item>
+    <item msgid="1228072488815999109">"Prekidanje veze..."</item>
+    <item msgid="7253087004422991731">"Veza je prekinuta"</item>
+    <item msgid="4169850917304751227">"Neuspešno"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Privremeno izbegavanje loše veze"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skeniranje..."</item>
+    <item msgid="8058143476674427024">"Povezivanje sa mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Potvrđivanje autentičnosti na mreži <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Dobijanje IP adrese od mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Povezano sa mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Obustavljeno"</item>
+    <item msgid="4133290864821295785">"Prekidanje veze sa mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Veza je prekinuta"</item>
+    <item msgid="2847316776634969068">"Neuspešno"</item>
+    <item msgid="4390990424746035383">"Blokirano"</item>
+    <item msgid="3618248791367063949">"Privremeno izbegavanje loše veze"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Pritisnite dugme"</item>
+    <item msgid="7401896200768713930">"PIN sa ravnopravnog uređaja"</item>
+    <item msgid="4526848028011846710">"PIN sa ovog uređaja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Povezano"</item>
+    <item msgid="983792611851499732">"Pozvan"</item>
+    <item msgid="5438273405428201793">"Neuspešno"</item>
+    <item msgid="4646663015449312554">"Dostupna"</item>
+    <item msgid="3230556734162006146">"Izvan opsega"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuta"</item>
+    <item msgid="2759776603549270587">"5 minuta"</item>
+    <item msgid="167772676068860015">"1 sat"</item>
+    <item msgid="5985477119043628504">"Bez čekanja"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Koristi podrazumevano sistemsko podešavanje: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slaba"</item>
+    <item msgid="7882129634982603782">"Slaba"</item>
+    <item msgid="6457357501905996224">"Zadovoljavajuća"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Odlična"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Poslednjih 30 dana"</item>
+    <item msgid="3211287705232736964">"Podesi ciklus potrošnje..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Vreme korišćenja"</item>
+    <item msgid="2784401352592276015">"Poslednji put korišćeno"</item>
+    <item msgid="249854287216326349">"Naziv aplikacije"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Nijedna"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ništa"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Nijedna"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statički"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Nijedna"</item>
+    <item msgid="1464741437353223198">"Uputstvo"</item>
+    <item msgid="5793600062487886090">"Autom. konfig. proksija"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Nijedna"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ili CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nije navedeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nijedan"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Skladište unutrašnjeg uređaja"</item>
+    <item msgid="3186681694079967527">"Uklonjiva SD kartica"</item>
+    <item msgid="6902033473986647035">"Neka sistem odluči"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokacija"</item>
+    <item msgid="6842381562497597649">"Lični"</item>
+    <item msgid="3966700236695683444">"Razmena poruka"</item>
+    <item msgid="8563996233342430477">"Mediji"</item>
+    <item msgid="5323851085993963783">"Uređaj"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"okvirna lokacija"</item>
+    <item msgid="1830619568689922920">"precizna lokacija"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibracija"</item>
+    <item msgid="8632513128515114092">"čitanje kontakata"</item>
+    <item msgid="3741042113569620272">"menjanje kontakata"</item>
+    <item msgid="4204420969709009931">"čitanje evidencije poziva"</item>
+    <item msgid="2260380357119423209">"menjanje evidencije poziva"</item>
+    <item msgid="6550710385014530934">"čitanje kalendara"</item>
+    <item msgid="3575906174264853951">"menjanje kalendara"</item>
+    <item msgid="4319843242568057174">"Wi-Fi skeniranje"</item>
+    <item msgid="2981791890467303819">"obaveštenje"</item>
+    <item msgid="6617825156152476692">"skeniranje telefona"</item>
+    <item msgid="8865260890611559753">"pozivanje telefona"</item>
+    <item msgid="3254999273961542982">"čitanje SMS poruka"</item>
+    <item msgid="7711446453028825171">"pisanje SMS poruka"</item>
+    <item msgid="6123238544099198034">"prijem SMS poruka"</item>
+    <item msgid="838342167431596036">"prijem hitnih SMS poruka"</item>
+    <item msgid="8554432731560956686">"prijem MMS poruka"</item>
+    <item msgid="7464863464299515059">"prijem push poruka preko WAP-a"</item>
+    <item msgid="310463075729606765">"slanje SMS poruka"</item>
+    <item msgid="7338021933527689514">"čitanje ICC SMS poruka"</item>
+    <item msgid="6130369335466613036">"pisanje ICC SMS poruka"</item>
+    <item msgid="6536865581421670942">"menjanje podešavanja"</item>
+    <item msgid="4547203129183558973">"povlačenje na vrh"</item>
+    <item msgid="9080347512916542840">"pristup obaveštenjima"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"snimanje audio zapisa"</item>
+    <item msgid="9182794235292595296">"puštanje audio zapisa"</item>
+    <item msgid="8760743229597702019">"čitanje memorije"</item>
+    <item msgid="2266923698240538544">"menjanje memorije"</item>
+    <item msgid="1801619438618539275">"dugmad za medije"</item>
+    <item msgid="31588119965784465">"audio fokus"</item>
+    <item msgid="7565226799008076833">"glavna jačina zvuka"</item>
+    <item msgid="5420704980305018295">"jačina zvuka glasa"</item>
+    <item msgid="5797363115508970204">"jačina zvuka zvona"</item>
+    <item msgid="8233154098550715999">"jačina zvuka medija"</item>
+    <item msgid="5196715605078153950">"jačina zvuka alarma"</item>
+    <item msgid="394030698764284577">"jačina zvuka obaveštenja"</item>
+    <item msgid="8952898972491680178">"jačina zvuka Bluetooth-a"</item>
+    <item msgid="8506227454543690851">"zadržavanje van stanja spavanja"</item>
+    <item msgid="1108160036049727420">"praćenje lokacije"</item>
+    <item msgid="1496205959751719491">"nadgledanje lokacije sa visokim naponom"</item>
+    <item msgid="3776296279910987380">"preuzmi statistiku o korišćenju"</item>
+    <item msgid="8827100324471975602">"isključi/uključi zvuk mikrofona"</item>
+    <item msgid="6880736730520126864">"prikazivanje iskačućih poruka"</item>
+    <item msgid="4933375960222609935">"mediji za projekat"</item>
+    <item msgid="8357907018938895462">"aktiviranje VPN-a"</item>
+    <item msgid="8143812849911310973">"upis na pozadinu"</item>
+    <item msgid="6266277260961066535">"struktura pomoći"</item>
+    <item msgid="7715498149883482300">"snimak ekrana pomoći"</item>
+    <item msgid="4046679376726313293">"čitanje stanja telefona"</item>
+    <item msgid="6329507266039719587">"dodavanje govorne pošte"</item>
+    <item msgid="7692440726415391408">"korišćenje SIP-a"</item>
+    <item msgid="8572453398128326267">"obrada odlaznog poziva"</item>
+    <item msgid="7775674394089376306">"digitalni otisak"</item>
+    <item msgid="3182815133441738779">"senzori za telo"</item>
+    <item msgid="2793100005496829513">"čitanje poruka za mobilne uređaje na lokalitetu"</item>
+    <item msgid="2633626056029384366">"lažna lokacija"</item>
+    <item msgid="8356842191824684631">"čitanje memorijskog prostora"</item>
+    <item msgid="5671906070163291500">"upis podataka u memorijski prostor"</item>
+    <item msgid="2791955098549340418">"uključivanje ekrana"</item>
+    <item msgid="5599435119609178367">"pristup nalozima"</item>
+    <item msgid="1165623660533024666">"rad u pozadini"</item>
+    <item msgid="6423861043647911030">"jačina zvuka za pristupačnost"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kratko"</item>
+    <item msgid="4816511817309094890">"Srednji"</item>
+    <item msgid="8305084671259331134">"Dugačko"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Podrazumevano"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Skupljeni sans-serif"</item>
+    <item msgid="6529379119163117545">"Sans-serif fiksne širine"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif fiksne širine"</item>
+    <item msgid="4448481989108928248">"Opušteno"</item>
+    <item msgid="4627069151979553527">"Kurziv"</item>
+    <item msgid="6896773537705206194">"Mala početna slova"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Veoma mala"</item>
+    <item msgid="5091603983404027034">"Mala"</item>
+    <item msgid="176844712416932112">"Normalna"</item>
+    <item msgid="2784236342175159295">"Velika"</item>
+    <item msgid="218913203203160606">"Veoma velika"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Podrazumevano"</item>
+    <item msgid="6488643537808152001">"Nijedna"</item>
+    <item msgid="552332815156010137">"Kontura"</item>
+    <item msgid="7187891159463789272">"Padajuća senka"</item>
+    <item msgid="8019330250538856521">"Izdignuto"</item>
+    <item msgid="8987385315647049787">"Udubljena"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Podrazumevano za aplikaciju"</item>
+    <item msgid="8611890312638868524">"Belo na crno"</item>
+    <item msgid="5891360837786277638">"Crno na belo"</item>
+    <item msgid="2798457065945456853">"Žuto na crno"</item>
+    <item msgid="5799049811524553967">"Žuto na plavo"</item>
+    <item msgid="3673930830658169860">"Prilagođeno"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN sa unapred deljenim ključevima"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN sa sertifikatima"</item>
+    <item msgid="312397853907741968">"IPSec VPN sa unapred deljenim ključevima i Xauth potvrdom identiteta"</item>
+    <item msgid="3319427315593649917">"IPSec VPN sa sertifikatima i Xauth potvrdom identiteta"</item>
+    <item msgid="8258927774145391041">"IPSec VPN sa sertifikatima i hibridnom potvrdom identiteta"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nema"</item>
+    <item msgid="1157046369795346308">"Uputstvo"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Veza je prekinuta"</item>
+    <item msgid="8754480102834556765">"Pokretanje..."</item>
+    <item msgid="3351334355574270250">"Povezivanje…"</item>
+    <item msgid="8303882153995748352">"Povezano"</item>
+    <item msgid="9135049670787351881">"Vreme čekanja"</item>
+    <item msgid="2124868417182583926">"Neuspešno"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Pitaj"</item>
+    <item msgid="7718817231348607934">"Nikada ne dozvoli"</item>
+    <item msgid="8184570120217958741">"Uvek dozvoli"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Neprekidna"</item>
+    <item msgid="167418068739176448">"Najveća aktivnost"</item>
+    <item msgid="4760813290195199773">"Važna (prvi plan)"</item>
+    <item msgid="2328684826817647595">"Važna (drugi plan)"</item>
+    <item msgid="7746406490652867365">"Rezervne kopije"</item>
+    <item msgid="5597404364389196754">"Teška"</item>
+    <item msgid="1290888779300174556">"Usluga (aktivna)"</item>
+    <item msgid="7241098542073939046">"Usluga (ponovo se pokreće)"</item>
+    <item msgid="6610439017684111046">"Prijemnik"</item>
+    <item msgid="7367606086319921117">"Početna"</item>
+    <item msgid="3344660712396741826">"Poslednja aktivnost"</item>
+    <item msgid="5006559348883303865">"Keširana (aktivnost)"</item>
+    <item msgid="8633480732468137525">"Keširana (klijent aktivnosti)"</item>
+    <item msgid="6248998242443333892">"Keširana (prazno)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Plavozelena"</item>
+    <item msgid="3228505970082457852">"Plava"</item>
+    <item msgid="6590260735734795647">"Tamnoplava"</item>
+    <item msgid="3521763377357218577">"Ljubičasta"</item>
+    <item msgid="5932337981182999919">"Roze"</item>
+    <item msgid="5642914536624000094">"Crvena"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Starije od 30 dana"</item>
+    <item msgid="8699273238891265610">"Starije od 60 dana"</item>
+    <item msgid="8346279419423837266">"Starije od 90 dana"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Automatski otkrij"</item>
+    <item msgid="773943026484148895">"Tretiraj kao mrežu sa ograničenjem"</item>
+    <item msgid="1008268820118852416">"Tretiraj kao mrežu bez ograničenja"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Koristi nasumično izabranu MAC adresu (podrazumevano)"</item>
+    <item msgid="214234417308375326">"Koristi MAC adresu uređaja"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ne"</item>
+    <item msgid="1930581185557754880">"Da"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tamna"</item>
+    <item msgid="5079453644557603349">"Svetla"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Isključeno"</item>
+    <item msgid="4072198137051566919">"Otkloni greške"</item>
+    <item msgid="2473005316958868509">"Detaljno"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Samo kućna"</item>
+    <item msgid="1161026694891024702">"Automatski"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA ima prednost"</item>
+    <item msgid="7581481130337402578">"Samo GSM"</item>
+    <item msgid="8579197487913425819">"Samo WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatski"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatski"</item>
+    <item msgid="4219607161971472471">"CDMA bez EvDo-a"</item>
+    <item msgid="7278975240951052041">"Samo EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalna"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Samo TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalna"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
index c0c06cf..be6b529 100644
--- a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili potvrdu identiteta licem. Dodirnite Otkaži, pa podesite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštitite uređaj pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili potvrdu identiteta licem. Dodirnite Otkaži, pa podesite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili potvrdu identiteta licem. Dodirnite Otkaži, pa podesite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti podešavanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti podešavanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti podešavanje šablona?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Podesi zaključavanje ekrana"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilni podaci"</item>
+    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2880,9 +2882,9 @@
       <item quantity="other">Proveri sertifikate</item>
     </plurals>
     <string name="user_settings_title" msgid="7917598650933179545">"Više korisnika"</string>
-    <string name="user_settings_footer_text" product="device" msgid="4573858247439190545">"Delite uređaj tako što ćete dodati nove korisnike. Svaki korisnik ima lični prostor na uređaju za prilagođene početne ekrane, naloge, aplikacije, podešavanja i još mnogo toga."</string>
-    <string name="user_settings_footer_text" product="tablet" msgid="780018221428132918">"Delite tablet tako što ćete dodati nove korisnike. Svaki korisnik ima lični prostor na tabletu za prilagođene početne ekrane, naloge, aplikacije, podešavanja i još mnogo toga."</string>
-    <string name="user_settings_footer_text" product="default" msgid="1470859614968237491">"Delite telefon tako što ćete dodati nove korisnike. Svaki korisnik ima lični prostor na telefonu za prilagođene početne ekrane, naloge, aplikacije, podešavanja i još mnogo toga."</string>
+    <string name="user_settings_footer_text" product="device" msgid="4573858247439190545">"Delite uređaj tako što ćete dodati nove korisnike. Svaki korisnik ima lični prostor na uređaju za prilagođene početne ekrane, naloge, aplikacije, podešavanja i drugo."</string>
+    <string name="user_settings_footer_text" product="tablet" msgid="780018221428132918">"Delite tablet tako što ćete dodati nove korisnike. Svaki korisnik ima lični prostor na tabletu za prilagođene početne ekrane, naloge, aplikacije, podešavanja i drugo."</string>
+    <string name="user_settings_footer_text" product="default" msgid="1470859614968237491">"Delite telefon tako što ćete dodati nove korisnike. Svaki korisnik ima lični prostor na telefonu za prilagođene početne ekrane, naloge, aplikacije, podešavanja i drugo."</string>
     <string name="user_list_title" msgid="6670258645246192324">"Korisnici i profili"</string>
     <string name="user_add_user_or_profile_menu" msgid="4220679989900149336">"Dodaj korisnika ili profil"</string>
     <string name="user_add_user_menu" msgid="9006572936456324794">"Dodaj korisnika"</string>
@@ -4348,6 +4350,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Usporiće ovaj telefon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Prinudno pokreni puna GNSS merenja"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Prati sve GNSS konstalacije i frekvencije bez ciklusa rada"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Otklanjanje grešaka u vezi sa promenom korisnika"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Prikazuje detaljne informacije tokom promene korisnika"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Dozvoli pokretanje aplikacija u pozadini"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Dozvoljava pokretanje svih aktivnosti u pozadini"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Uvek prikazuj dijalog o otkazivanju"</string>
diff --git a/tests/CarDeveloperOptions/res/values-be-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-be-nokeys/strings.xml
new file mode 100644
index 0000000..7e52eb0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-be-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Кіраванне прыкладаннямі"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-be/arrays.xml b/tests/CarDeveloperOptions/res/values-be/arrays.xml
new file mode 100644
index 0000000..c8aaf44
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-be/arrays.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Амерыка"</item>
+    <item msgid="4791956477275129121">"Еўропа"</item>
+    <item msgid="3812126832016254559">"Афрыка"</item>
+    <item msgid="2765816300353408280">"Азія"</item>
+    <item msgid="6683489385344409742">"Аўстралія"</item>
+    <item msgid="5194868215515664953">"Ціхі акіян"</item>
+    <item msgid="7044520255415007865">"Усе"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Ніколі"</item>
+    <item msgid="2517785806387977252">"15 секунд"</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 хвіліна"</item>
+    <item msgid="8109273437140044073">"2 хвіліны"</item>
+    <item msgid="2788593551142462622">"5 хвілін"</item>
+    <item msgid="8012672183888404961">"10 хвілін"</item>
+    <item msgid="8271452751594598661">"30 хвілін"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Неадкладна"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 хвіліна"</item>
+    <item msgid="3367011891231217504">"2 хвіліны"</item>
+    <item msgid="4376575879222393045">"5 хвілін"</item>
+    <item msgid="811192536981678974">"10 хвілін"</item>
+    <item msgid="7258394417241706272">"30 хвілін"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Малы"</item>
+    <item msgid="591935967183159581">"Стандартны"</item>
+    <item msgid="1714184661981538355">"Вялікі"</item>
+    <item msgid="6195563047686707484">"Найвялікшы"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Сканаванне..."</item>
+    <item msgid="5597394826455877834">"Падключэнне..."</item>
+    <item msgid="5848277343965362748">"Аўтэнтыфікацыя..."</item>
+    <item msgid="3391238031431440676">"Атрыманне IP-адраса..."</item>
+    <item msgid="5257597310494000224">"Падключана"</item>
+    <item msgid="8472497592913050396">"Прыпынена"</item>
+    <item msgid="1228072488815999109">"Адключэнне..."</item>
+    <item msgid="7253087004422991731">"Адключана"</item>
+    <item msgid="4169850917304751227">"Няўдала"</item>
+    <item msgid="6266658166690831131">"Заблакiравана"</item>
+    <item msgid="4517230805854909775">"Дрэнная сувязь часова пазбегнута"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Сканаванне..."</item>
+    <item msgid="8058143476674427024">"Падключэнне да сеткі <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Аўтэнтыфікацыя ў сетцы <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Атрыманне IP-адраса ў сетцы <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Падключаны да сеткi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Прыпынена"</item>
+    <item msgid="4133290864821295785">"Адключэнне ад сеткі <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Адключана"</item>
+    <item msgid="2847316776634969068">"Няўдала"</item>
+    <item msgid="4390990424746035383">"Заблакiравана"</item>
+    <item msgid="3618248791367063949">"Дрэнная сувязь часова пазбегнута"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Націсніце кнопку"</item>
+    <item msgid="7401896200768713930">"PIN-код ад пірынгавай прылады"</item>
+    <item msgid="4526848028011846710">"PIN-код для гэтай прылады"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Падключана"</item>
+    <item msgid="983792611851499732">"Запрошаны"</item>
+    <item msgid="5438273405428201793">"Няўдала"</item>
+    <item msgid="4646663015449312554">"Даступна"</item>
+    <item msgid="3230556734162006146">"Выхад за дазволеныя межы"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Выкарыстоўваць стандартныя налады сістэмы: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Дрэнны"</item>
+    <item msgid="7882129634982603782">"Дрэнны"</item>
+    <item msgid="6457357501905996224">"Слабая"</item>
+    <item msgid="405271628162918841">"Добры"</item>
+    <item msgid="999948812884919584">"Выдатны"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Апошнія 30 дзён"</item>
+    <item msgid="3211287705232736964">"Заданне цыклу расходу..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Час выкарыстання"</item>
+    <item msgid="2784401352592276015">"Апошняе выкарыстанне"</item>
+    <item msgid="249854287216326349">"Назва прыкладання"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Няма"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Няма"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Няма"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Статычны"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Няма"</item>
+    <item msgid="1464741437353223198">"Кіраўніцтва"</item>
+    <item msgid="5793600062487886090">"Аўтаканфігурацыя проксі"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Няма"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ці CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Не пазначана"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Няма"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Унутраная памяць прылады"</item>
+    <item msgid="3186681694079967527">"Зменная SD-карта"</item>
+    <item msgid="6902033473986647035">"Няхай вырашыць сістэма"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Месцазнаходжанне"</item>
+    <item msgid="6842381562497597649">"Асабістае"</item>
+    <item msgid="3966700236695683444">"Абмен паведамленнямі"</item>
+    <item msgid="8563996233342430477">"Медыя"</item>
+    <item msgid="5323851085993963783">"Прылада"</item>
+  </string-array>
+    <!-- no translation found for app_ops_summaries:46 (4933375960222609935) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+    <!-- no translation found for app_ops_labels:48 (8291198322681891160) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Кароткая"</item>
+    <item msgid="4816511817309094890">"Сярэдняя"</item>
+    <item msgid="8305084671259331134">"Доўгая"</item>
+  </string-array>
+    <!-- no translation found for captioning_typeface_selector_titles:4 (1487203730637617924) -->
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Вельмі дробны"</item>
+    <item msgid="5091603983404027034">"Дробны"</item>
+    <item msgid="176844712416932112">"Звычайны"</item>
+    <item msgid="2784236342175159295">"Вялікі"</item>
+    <item msgid="218913203203160606">"Вельмі вялікі"</item>
+  </string-array>
+    <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN з загадзя размеркаванымі ключамі"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN з сертыфікатамі"</item>
+    <item msgid="312397853907741968">"IPSec VPN з папярэдне размеркаванымі ключамі і аўтэнтыфікацыяй Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN з сертыфікатамі і аўтэнтыфікацыяй Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN з сертыфікатамі і гібрыднай аўтэнтыфікацыяй"</item>
+  </string-array>
+    <!-- no translation found for vpn_proxy_settings:0 (2958623927055120839) -->
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Адключана"</item>
+    <item msgid="8754480102834556765">"Ініцыялізацыя..."</item>
+    <item msgid="3351334355574270250">"Падключэнне..."</item>
+    <item msgid="8303882153995748352">"Падключана"</item>
+    <item msgid="9135049670787351881">"Тайм-аўт"</item>
+    <item msgid="2124868417182583926">"Няўдала"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Запытацца"</item>
+    <item msgid="7718817231348607934">"Нiколi не дазваляць"</item>
+    <item msgid="8184570120217958741">"Заўсёды дазваляць"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Пастаянны"</item>
+    <item msgid="167418068739176448">"Папулярная дзейнасць"</item>
+    <item msgid="4760813290195199773">"Важна (на пярэднім плане)"</item>
+    <item msgid="2328684826817647595">"Важна (у фоне)"</item>
+    <item msgid="7746406490652867365">"Рэзервовае капіраванне"</item>
+    <item msgid="5597404364389196754">"Вялікая вага"</item>
+    <item msgid="1290888779300174556">"Сэрвіс (працуе)"</item>
+    <item msgid="7241098542073939046">"Сэрвіс (перазапуск)"</item>
+    <item msgid="6610439017684111046">"Прыёмнік"</item>
+    <item msgid="7367606086319921117">"Галоўны"</item>
+    <item msgid="3344660712396741826">"Апошняя дзейнасць"</item>
+    <item msgid="5006559348883303865">"Кэшавана (дзейнасць)"</item>
+    <item msgid="8633480732468137525">"Кэшавана (кліент дзейнасці)"</item>
+    <item msgid="6248998242443333892">"Кэшавана (пуста)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Сіне-зялёны"</item>
+    <item msgid="3228505970082457852">"Сiнi"</item>
+    <item msgid="6590260735734795647">"Індыга"</item>
+    <item msgid="3521763377357218577">"Фіялетавы"</item>
+    <item msgid="5932337981182999919">"Ружовы"</item>
+    <item msgid="5642914536624000094">"Чырвоны"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Старэйшыя за 30 дзён"</item>
+    <item msgid="8699273238891265610">"Старэйшыя за 60 дзён"</item>
+    <item msgid="8346279419423837266">"Старэйшыя за 90 дзён"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Вызначаць аўтаматычна"</item>
+    <item msgid="773943026484148895">"Лімітная"</item>
+    <item msgid="1008268820118852416">"Безлімітная"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Выкарыстоўваць выпадковы MAC-адрас (стандартна)"</item>
+    <item msgid="214234417308375326">"Выкарыстоўваць прыладу MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Не"</item>
+    <item msgid="1930581185557754880">"Так"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Цёмная"</item>
+    <item msgid="5079453644557603349">"Светлая"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Выключана"</item>
+    <item msgid="4072198137051566919">"Наладзіць"</item>
+    <item msgid="2473005316958868509">"Падрабязна"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Толькі дамашнія сеткі"</item>
+    <item msgid="1161026694891024702">"Аўтаматычна"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Прыярытэт GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Толькі GSM"</item>
+    <item msgid="8579197487913425819">"Толькі WCDMA"</item>
+    <item msgid="8465243227505412498">"Аўтаматычны выбар GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Аўтаматычны выбар CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA без EvDo"</item>
+    <item msgid="7278975240951052041">"Толькі EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Глабальная"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Толькі TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"R-UIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Глабальная"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-be/strings.xml b/tests/CarDeveloperOptions/res/values-be/strings.xml
index d58fa11..74871d2 100644
--- a/tests/CarDeveloperOptions/res/values-be/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-be/strings.xml
@@ -483,14 +483,13 @@
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"Пазней"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"Прапусціць усталёўку адбітка пальца?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"Вы вырашылі выкарыстоўваць свой адбітак пальца як адзін са спосабоў разблакіроўкі тэлефона. Калі вы прапусціце гэты крок зараз, вам трэба будзе ўсталяваць гэты спосаб пазней. Усталёўка займае ўсяго каля хвіліны."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Абараніце планшэт з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць лічбавы адбітак. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Абараніце прыладу з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ёю карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць лічбавы адбітак. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Абараніце тэлефон з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць лічбавы адбітак. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"Абараніце планшэт з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць аўтэнтыфікацыю па адбітку пальца. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"Абараніце прыладу з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ёю карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць аўтэнтыфікацыю па адбітку пальца. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"Абараніце тэлефон з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць аўтэнтыфікацыю па адбітку пальца. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Абараніце планшэт з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Абараніце прыладу з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ёю карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Абараніце тэлефон з дапамогай опцыі блакіроўкі экрана, каб ніхто не змог ім карыстацца ў выпадку прапажы ці крадзяжу. Опцыя блакіроўкі экрана таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Націсніце \"Скасаваць\", а потым задайце PIN-код ці выберыце іншую опцыю блакіроўкі экрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Прапусціць наладку PIN-кода?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Прапусціць наладку пароля?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Прапусціць наладку ўзору?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Наладзіць блакіроўку экрана"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мабільны інтэрнэт"</item>
+    <item msgid="6007360612667098926">"Толькі Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1237,7 +1239,7 @@
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Укл. / Калі глядзець на экран, ён не будзе выключацца"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Выключана"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"Не дазваляе экрану выключацца, калі на яго глядзяць"</string>
-    <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Адаптыўны рэжым з дапамогай пярэдняй камеры вызначае, калі хто-небудзь глядзіць на экран. Калі ён уключаны, відарысы не захоўваюцца і не адпраўляюцца ў Google."</string>
+    <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Адаптыўны рэжым з дапамогай пярэдняй камеры вызначае, калі хто-небудзь глядзіць на экран. Функцыя працуе толькі на прыладзе: відарысы не захоўваюцца і не адпраўляюцца ў Google."</string>
     <string name="night_display_title" msgid="1305002424893349814">"Начны рэжым"</string>
     <string name="night_display_text" msgid="5330502493684652527">"У начным рэжыме экран будзе мець бурштынавае адценне. Так вам будзе зручней глядзець на экран пры цьмяным асвятленні, а таксама лягчэй заснуць."</string>
     <string name="night_display_auto_mode_title" msgid="8493573087102481588">"Расклад"</string>
@@ -1615,8 +1617,8 @@
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"Памылка сцірання спампаваных SIM.\n\nПеразапусціце прыладу і паўтарыце спробу."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"Сцерці ўсе даныя (cкід да заводскіх налад)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"ваш Уліковы запiс Google;"</li>\n<li>"сістэмныя даныя і налады, а таксама даныя і налады праграм;"</li>\n<li>"спампаваныя праграмы"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"ваш Уліковы запіс Google;"</li>\n<li>"сістэмныя даныя і налады, а таксама даныя і налады праграм;"</li>\n<li>"спампаваныя праграмы"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"Ваш Уліковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
+    <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"Ваш Уліковы запіс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"На гэтай прыладзе ёсць іншыя карыстальнікі.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="3947303501615091903"><li>"Музыка"</li>\n<li>"Фатаграфіі"</li>\n<li>"Іншыя дадзеныя карыстальніка"</li></string>
@@ -3023,7 +3025,7 @@
     <string name="call_manager_title" msgid="1118074011469650421">"Call Manager (Менеджар выклікаў)"</string>
     <!-- no translation found for call_manager_summary (1232655174841493040) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="5750066270993255966">"Надзвычайныя абвесткі"</string>
+    <string name="cell_broadcast_settings" msgid="5750066270993255966">"Абвесткі аб надзвычайных сітуацыях"</string>
     <string name="network_operators_settings" msgid="7822337582828465633">"Сеткавыя аператары"</string>
     <string name="access_point_names" msgid="7992382237358800596">"Назвы пунктаў доступу"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="1624079276378568594">"VoLTE"</string>
@@ -3871,7 +3873,7 @@
     <string name="background_check_title" msgid="4136736684290307970">"Поўны доступ у фоне"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"Выкарыстоўваць тэкст з экрана"</string>
     <string name="assist_access_context_summary" msgid="5867997494395842785">"Дазволіць праграме-памочніку доступ да змесціва на экране ў выглядзе тэксту"</string>
-    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"Выкарыстоўваць скрыншот"</string>
+    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"Выкарыстоўваць здымак экрана"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Дазволіць праграме-памочніку доступ да відарыса на экране"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Падсвечванне экрана"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"Падсвечваць краі экрана, калі праграма-памочнік атрымлівае доступ да тэксту на экране або на здымке экрана"</string>
@@ -4417,8 +4419,8 @@
     <string name="install_type_instant" msgid="6248487669862821874">"Імгненная праграма"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"Выключыць менеджар сховішча?"</string>
     <string name="storage_movies_tv" msgid="7282484273991655296">"Праграмы для фільмаў і ТБ"</string>
-    <string name="carrier_provisioning" msgid="3309125279191534469">"Інфармацыя аператара"</string>
-    <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Уключыць/выключыць забеспячэнне аператарам"</string>
+    <string name="carrier_provisioning" msgid="3309125279191534469">"Звесткі аб аператары"</string>
+    <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Запусціць сінхранізацыю з аператарам"</string>
     <string name="zen_suggestion_title" msgid="2134699720214231950">"Абнавіце рэжым \"Не турбаваць\""</string>
     <string name="zen_suggestion_summary" msgid="4041062903237952737">"Прыпыніце апавяшчэнні, каб яны не адцягвалі ўвагу"</string>
     <string name="disabled_low_ram_device" msgid="4958060232123741721">"Гэта функцыя недаступная на гэтай прыладзе"</string>
@@ -4426,6 +4428,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Праца гэтага тэлефона будзе запаволена"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Прымусова правесці поўныя вымярэнні GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Адсочваць усе групы і частоты GNSS з выключаным працоўным цыклам"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Пераключэнне карыстальніка з адладкай"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Паказваць падрабязную інфармацыю падчас пераключэння карыстальніка"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Дазволіць фонавую актыўнасць"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Дазваляе неабмежаваную фонавую актыўнасць"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Заўсёды паказваць дыялогавыя вокны з памылкамі"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bg-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-bg-nokeys/strings.xml
new file mode 100644
index 0000000..9efd3fa
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-bg-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Управление на приложенията"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-bg/arrays.xml b/tests/CarDeveloperOptions/res/values-bg/arrays.xml
new file mode 100644
index 0000000..f42800f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-bg/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америка"</item>
+    <item msgid="4791956477275129121">"Европа"</item>
+    <item msgid="3812126832016254559">"Африка"</item>
+    <item msgid="2765816300353408280">"Азия"</item>
+    <item msgid="6683489385344409742">"Австралия"</item>
+    <item msgid="5194868215515664953">"тихоокеанско"</item>
+    <item msgid="7044520255415007865">"Всички"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 секунди"</item>
+    <item msgid="772029947136115322">"30 секунди"</item>
+    <item msgid="8743663928349474087">"1 минута"</item>
+    <item msgid="1506508631223164814">"2 минути"</item>
+    <item msgid="8664703938127907662">"5 минути"</item>
+    <item msgid="5827960506924849753">"10 минути"</item>
+    <item msgid="6677424950124253938">"30 минути"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Никога"</item>
+    <item msgid="2517785806387977252">"15 секунди"</item>
+    <item msgid="6347954399441173672">"30 секунди"</item>
+    <item msgid="4858305253279921789">"1 минута"</item>
+    <item msgid="8109273437140044073">"2 минути"</item>
+    <item msgid="2788593551142462622">"5 минути"</item>
+    <item msgid="8012672183888404961">"10 минути"</item>
+    <item msgid="8271452751594598661">"30 минути"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Незабавно"</item>
+    <item msgid="2038544972632026612">"5 секунди"</item>
+    <item msgid="5558060663472279597">"15 секунди"</item>
+    <item msgid="45341168505452037">"30 секунди"</item>
+    <item msgid="227647485917789272">"1 минута"</item>
+    <item msgid="3367011891231217504">"2 минути"</item>
+    <item msgid="4376575879222393045">"5 минути"</item>
+    <item msgid="811192536981678974">"10 минути"</item>
+    <item msgid="7258394417241706272">"30 минути"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Малък"</item>
+    <item msgid="591935967183159581">"По подразбиране"</item>
+    <item msgid="1714184661981538355">"Голям"</item>
+    <item msgid="6195563047686707484">"Най-голямо"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Сканира се..."</item>
+    <item msgid="5597394826455877834">"Свързва се..."</item>
+    <item msgid="5848277343965362748">"Удостоверява се..."</item>
+    <item msgid="3391238031431440676">"Получава се IP адрес"</item>
+    <item msgid="5257597310494000224">"Установена е връзка"</item>
+    <item msgid="8472497592913050396">"Прекъсната"</item>
+    <item msgid="1228072488815999109">"Изключва се..."</item>
+    <item msgid="7253087004422991731">"Изкл."</item>
+    <item msgid="4169850917304751227">"Неуспешно"</item>
+    <item msgid="6266658166690831131">"Блокирано"</item>
+    <item msgid="4517230805854909775">"Временно се избягва лоша връзка"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Сканира се..."</item>
+    <item msgid="8058143476674427024">"Установява се връзка с/ъс <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Удостоверява се със: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"IP адресът се получава от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Установена е връзка с(ъс) <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Прекъсната"</item>
+    <item msgid="4133290864821295785">"Изключва се от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Изкл."</item>
+    <item msgid="2847316776634969068">"Неуспешно"</item>
+    <item msgid="4390990424746035383">"Блокирано"</item>
+    <item msgid="3618248791367063949">"Временно се избягва лоша връзка"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Бутон"</item>
+    <item msgid="7401896200768713930">"ПИН от съответното устройство"</item>
+    <item msgid="4526848028011846710">"ПИН от това у-во"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Установена е връзка"</item>
+    <item msgid="983792611851499732">"Има покана"</item>
+    <item msgid="5438273405428201793">"Неуспешно"</item>
+    <item msgid="4646663015449312554">"Налице"</item>
+    <item msgid="3230556734162006146">"Извън обхват"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 минути"</item>
+    <item msgid="2759776603549270587">"5 минути"</item>
+    <item msgid="167772676068860015">"1 час"</item>
+    <item msgid="5985477119043628504">"Времето за изчакване да не изтича никога"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Използване на стандартната системна настройка: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слаб"</item>
+    <item msgid="7882129634982603782">"Лоша"</item>
+    <item msgid="6457357501905996224">"Задоволителен"</item>
+    <item msgid="405271628162918841">"Добър"</item>
+    <item msgid="999948812884919584">"Отлична"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Последните 30 дни"</item>
+    <item msgid="3211287705232736964">"Цикъл на пренос..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Време на употреба"</item>
+    <item msgid="2784401352592276015">"Последно използване"</item>
+    <item msgid="249854287216326349">"Име на приложението"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Нищо"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Няма"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM карта"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Нищо"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Статични"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Нищо"</item>
+    <item msgid="1464741437353223198">"Ръководство"</item>
+    <item msgid="5793600062487886090">"Прокси: Автоконфиг."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Нищо"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP или CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Неизвестен"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Няма"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Вътрешно хранилище на устройство"</item>
+    <item msgid="3186681694079967527">"SD карта, която може да се премахва"</item>
+    <item msgid="6902033473986647035">"Нека системата да реши"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Местоположение"</item>
+    <item msgid="6842381562497597649">"Лични"</item>
+    <item msgid="3966700236695683444">"Съобщения"</item>
+    <item msgid="8563996233342430477">"Носители"</item>
+    <item msgid="5323851085993963783">"Устройство"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"местоположение с ниска точност"</item>
+    <item msgid="1830619568689922920">"местоположение с висока точност"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"вибриране"</item>
+    <item msgid="8632513128515114092">"четене на контактите"</item>
+    <item msgid="3741042113569620272">"промяна на контактите"</item>
+    <item msgid="4204420969709009931">"четене на списъка с обажданията"</item>
+    <item msgid="2260380357119423209">"промяна на списъка с обажданията"</item>
+    <item msgid="6550710385014530934">"четене на календара"</item>
+    <item msgid="3575906174264853951">"промяна на календара"</item>
+    <item msgid="4319843242568057174">"сканиране за Wi-Fi"</item>
+    <item msgid="2981791890467303819">"известие"</item>
+    <item msgid="6617825156152476692">"сканиране за сигнал"</item>
+    <item msgid="8865260890611559753">"обаждане по телефона"</item>
+    <item msgid="3254999273961542982">"четене на SMS"</item>
+    <item msgid="7711446453028825171">"запис на SMS"</item>
+    <item msgid="6123238544099198034">"получаване на SMS"</item>
+    <item msgid="838342167431596036">"получаване на спешен SMS"</item>
+    <item msgid="8554432731560956686">"получаване на MMS"</item>
+    <item msgid="7464863464299515059">"получаване на насочено WAP съобщение"</item>
+    <item msgid="310463075729606765">"изпращане на SMS"</item>
+    <item msgid="7338021933527689514">"четене на ICC SMS"</item>
+    <item msgid="6130369335466613036">"запис на ICC SMS"</item>
+    <item msgid="6536865581421670942">"промяна на настройките"</item>
+    <item msgid="4547203129183558973">"рисуване върху елемент"</item>
+    <item msgid="9080347512916542840">"достъп до известията"</item>
+    <item msgid="5332718516635907742">"камера"</item>
+    <item msgid="6098422447246167852">"записва звук"</item>
+    <item msgid="9182794235292595296">"възпроизвеждане на звук"</item>
+    <item msgid="8760743229597702019">"четене на буферната памет"</item>
+    <item msgid="2266923698240538544">"промяна на буферната памет"</item>
+    <item msgid="1801619438618539275">"бутони за мултимедия"</item>
+    <item msgid="31588119965784465">"фокусиране на звука"</item>
+    <item msgid="7565226799008076833">"основна сила на звука"</item>
+    <item msgid="5420704980305018295">"сила на звука за глас"</item>
+    <item msgid="5797363115508970204">"сила на звука при звънене"</item>
+    <item msgid="8233154098550715999">"сила на звука за мултимедия"</item>
+    <item msgid="5196715605078153950">"сила на звука на будилника"</item>
+    <item msgid="394030698764284577">"сила на звука за известия"</item>
+    <item msgid="8952898972491680178">"сила на звука за Bluetooth"</item>
+    <item msgid="8506227454543690851">"оставяне в будно състояние"</item>
+    <item msgid="1108160036049727420">"наблюдение на местоположението"</item>
+    <item msgid="1496205959751719491">"наблюдение на заявките за местоположение, изразходващи много енергия"</item>
+    <item msgid="3776296279910987380">"получаване на статистически данни за употребата"</item>
+    <item msgid="8827100324471975602">"заглушаване/включване на микрофона"</item>
+    <item msgid="6880736730520126864">"показване на съобщение в изскачащо прозорче"</item>
+    <item msgid="4933375960222609935">"прожектиране на мултимедия"</item>
+    <item msgid="8357907018938895462">"активиране на виртуална частна мрежа (VPN)"</item>
+    <item msgid="8143812849911310973">"запис на тапет"</item>
+    <item msgid="6266277260961066535">"структура за помощ"</item>
+    <item msgid="7715498149883482300">"екранна снимка за помощ"</item>
+    <item msgid="4046679376726313293">"четене на състоянието на телефона"</item>
+    <item msgid="6329507266039719587">"добавяне на гласова поща"</item>
+    <item msgid="7692440726415391408">"използване на SIP"</item>
+    <item msgid="8572453398128326267">"обработване на изходящо обаждане"</item>
+    <item msgid="7775674394089376306">"отпечатък"</item>
+    <item msgid="3182815133441738779">"телесни сензори"</item>
+    <item msgid="2793100005496829513">"четене на клетъчни излъчвания"</item>
+    <item msgid="2633626056029384366">"мнимо местоположение"</item>
+    <item msgid="8356842191824684631">"четене на хранилището"</item>
+    <item msgid="5671906070163291500">"запис в хранилището"</item>
+    <item msgid="2791955098549340418">"включване на екрана"</item>
+    <item msgid="5599435119609178367">"създаване на профили"</item>
+    <item msgid="1165623660533024666">"пускане на заден план"</item>
+    <item msgid="6423861043647911030">"сила на звука за услугите за достъпност"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Кратко"</item>
+    <item msgid="4816511817309094890">"Средна важност"</item>
+    <item msgid="8305084671259331134">"Продължително"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"По подразбиране"</item>
+    <item msgid="4147246073737933622">"Безсерифни"</item>
+    <item msgid="3117680749167407907">"Безсерифни сбити"</item>
+    <item msgid="6529379119163117545">"Безсерифни непропорционални"</item>
+    <item msgid="1487203730637617924">"Серифни"</item>
+    <item msgid="4937790671987480464">"Серифни непропорционални"</item>
+    <item msgid="4448481989108928248">"Неформални"</item>
+    <item msgid="4627069151979553527">"Курсивни"</item>
+    <item msgid="6896773537705206194">"Малки главни букви"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Много малък"</item>
+    <item msgid="5091603983404027034">"Малък"</item>
+    <item msgid="176844712416932112">"Нормален"</item>
+    <item msgid="2784236342175159295">"Голям"</item>
+    <item msgid="218913203203160606">"Много голям"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"По подразбиране"</item>
+    <item msgid="6488643537808152001">"Нищо"</item>
+    <item msgid="552332815156010137">"С контур"</item>
+    <item msgid="7187891159463789272">"Със сянка"</item>
+    <item msgid="8019330250538856521">"Повдигнати"</item>
+    <item msgid="8987385315647049787">"Вдлъбнати"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Стандартен за приложението"</item>
+    <item msgid="8611890312638868524">"Бяло върху черно"</item>
+    <item msgid="5891360837786277638">"Черно върху бяло"</item>
+    <item msgid="2798457065945456853">"Жълто върху черно"</item>
+    <item msgid="5799049811524553967">"Жълто върху синьо"</item>
+    <item msgid="3673930830658169860">"Персонализирани"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN с PPTP"</item>
+    <item msgid="1349760781118368659">"VPN с L2TP/IPSec с предварително споделени ключове"</item>
+    <item msgid="6128519070545038358">"VPN с L2TP/IPSec със сертификати"</item>
+    <item msgid="312397853907741968">"VPN с IPSec с предварително споделени ключове и удостоверяване за Xauth"</item>
+    <item msgid="3319427315593649917">"VPN с IPSec със сертификати и удостоверяване за Xauth"</item>
+    <item msgid="8258927774145391041">"VPN с IPSec със сертификати и хибридно удостоверяване"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Няма"</item>
+    <item msgid="1157046369795346308">"Ръководство"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Изкл."</item>
+    <item msgid="8754480102834556765">"Подготвя се за работа..."</item>
+    <item msgid="3351334355574270250">"Свързва се..."</item>
+    <item msgid="8303882153995748352">"Установена е връзка"</item>
+    <item msgid="9135049670787351881">"Време за изчакване"</item>
+    <item msgid="2124868417182583926">"Неуспешно"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Да се пита"</item>
+    <item msgid="7718817231348607934">"Никога да не се разрешава"</item>
+    <item msgid="8184570120217958741">"Винаги да се разрешава"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Постоянно"</item>
+    <item msgid="167418068739176448">"Водеща активност"</item>
+    <item msgid="4760813290195199773">"Важно (на преден план)"</item>
+    <item msgid="2328684826817647595">"Важно (на заден план)"</item>
+    <item msgid="7746406490652867365">"Резервно копие"</item>
+    <item msgid="5597404364389196754">"Голямо натоварване"</item>
+    <item msgid="1290888779300174556">"Услуга (изпълнява се)"</item>
+    <item msgid="7241098542073939046">"Услуга (рестартира се)"</item>
+    <item msgid="6610439017684111046">"Приемник"</item>
+    <item msgid="7367606086319921117">"Начален екран"</item>
+    <item msgid="3344660712396741826">"Последна активност"</item>
+    <item msgid="5006559348883303865">"Кеширано (активност)"</item>
+    <item msgid="8633480732468137525">"Кеширано (клиентска програма за активността)"</item>
+    <item msgid="6248998242443333892">"Кеширано (празно)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"синьо-зелено"</item>
+    <item msgid="3228505970082457852">"Син"</item>
+    <item msgid="6590260735734795647">"индиго"</item>
+    <item msgid="3521763377357218577">"лилаво"</item>
+    <item msgid="5932337981182999919">"розово"</item>
+    <item msgid="5642914536624000094">"Червен"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"По-стари от 30 дни"</item>
+    <item msgid="8699273238891265610">"По-стари от 60 дни"</item>
+    <item msgid="8346279419423837266">"По-стари от 90 дни"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Автоматично откриване"</item>
+    <item msgid="773943026484148895">"Третиране като мрежа с отчитане"</item>
+    <item msgid="1008268820118852416">"Третиране като мрежа без отчитане"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Използване на произв. генериран MAC адрес (станд.)"</item>
+    <item msgid="214234417308375326">"Използване на MAC адреса на устройството"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Не"</item>
+    <item msgid="1930581185557754880">"Да"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Тъмна"</item>
+    <item msgid="5079453644557603349">"Светла"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Изключено"</item>
+    <item msgid="4072198137051566919">"Отстраняване на грешки"</item>
+    <item msgid="2473005316958868509">"Подробно"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Само домашни мрежи"</item>
+    <item msgid="1161026694891024702">"Автоматично"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Предпочита се GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Само GSM"</item>
+    <item msgid="8579197487913425819">"Само WCDMA"</item>
+    <item msgid="8465243227505412498">"Авт. GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Авт. CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA без EvDo"</item>
+    <item msgid="7278975240951052041">"Само EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Глобална мрежа"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Само TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Глобална мрежа"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-bg/strings.xml b/tests/CarDeveloperOptions/res/values-bg/strings.xml
index 3965eb5..b34c516 100644
--- a/tests/CarDeveloperOptions/res/values-bg/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bg/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Защитете таблета си с опция за заключване на екрана, така че никой друг да не може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на удостоверяването с лице. Докоснете „Отказ“, след което задайте ПИН код или изберете друга опция за заключване на екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Защитете устройството си с опция за заключване на екрана, така че никой друг да не може да го използва, ако бъде изгубено или откраднато. Такава опция е нужна и за настройване на удостоверяването с лице. Докоснете „Отказ“, след което задайте ПИН код или изберете друга опция за заключване на екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Защитете телефона си с опция за заключване на екрана, така че никой друг да не може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на удостоверяването с лице. Докоснете „Отказ“, след което задайте ПИН код или изберете друга опция за заключване на екрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Пропускане на настр. на ПИН?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Пропуск. на настр. на парола?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Пропуск. на настр. на фигура?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Заключване на екрана: Настройване"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобилни данни"</item>
+    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Тя ще забави телефона ви"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Налагане на пълно проследяване на измерванията с GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Проследяване на всички констелации и честоти на GNSS без използване на коефициент на запълване"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Отстраняване на грешки при превключването на потребителя"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Показване на подробна информация по време на превключването на потребителя"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Разрешаване на стартирания на активност на заден план"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Разрешава всички стартирания на активност на заден план"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Диалоговият прозорец за сривове да се показва винаги"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bn-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-bn-nokeys/strings.xml
new file mode 100644
index 0000000..414969e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-bn-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"অ্যাপ্লিকেশানগুলি পরিচালনা করুন"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-bn/arrays.xml b/tests/CarDeveloperOptions/res/values-bn/arrays.xml
new file mode 100644
index 0000000..3b10fdc
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-bn/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"আমেরিকা"</item>
+    <item msgid="4791956477275129121">"ইউরোপ"</item>
+    <item msgid="3812126832016254559">"আফ্রিকা"</item>
+    <item msgid="2765816300353408280">"এশিয়া"</item>
+    <item msgid="6683489385344409742">"অস্ট্রেলিয়া"</item>
+    <item msgid="5194868215515664953">"পেসিফিক"</item>
+    <item msgid="7044520255415007865">"সমস্ত"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"১৫ সেকেন্ড"</item>
+    <item msgid="772029947136115322">"৩০ সেকেন্ড"</item>
+    <item msgid="8743663928349474087">"১ মিনিট"</item>
+    <item msgid="1506508631223164814">"২ মিনিট"</item>
+    <item msgid="8664703938127907662">"৫ মিনিট"</item>
+    <item msgid="5827960506924849753">"১০ মিনিট"</item>
+    <item msgid="6677424950124253938">"৩০ মিনিট"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"অবিলম্বে"</item>
+    <item msgid="2038544972632026612">"৫ সেকেন্ড"</item>
+    <item msgid="5558060663472279597">"১৫ সেকেন্ড"</item>
+    <item msgid="45341168505452037">"৩০ সেকেন্ড"</item>
+    <item msgid="227647485917789272">"১ মিনিট"</item>
+    <item msgid="3367011891231217504">"২ মিনিট"</item>
+    <item msgid="4376575879222393045">"৫ মিনিট"</item>
+    <item msgid="811192536981678974">"১০ মিনিট"</item>
+    <item msgid="7258394417241706272">"৩০ মিনিট"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"কানেক্ট আছে"</item>
+    <item msgid="983792611851499732">"আমন্ত্রিত"</item>
+    <item msgid="5438273405428201793">"অসফল"</item>
+    <item msgid="4646663015449312554">"উপলভ্য"</item>
+    <item msgid="3230556734162006146">"পরিষেবার বাইরে"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"২ মিনিট"</item>
+    <item msgid="2759776603549270587">"৫ মিনিট"</item>
+    <item msgid="167772676068860015">"১ ঘণ্টা"</item>
+    <item msgid="5985477119043628504">"কখনই সময় শেষ হবে না"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"সিস্টেম ডিফল্ট ব্যবহার করুন: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"১"</item>
+    <item msgid="5318020123964299318">"২"</item>
+    <item msgid="6429260054182662738">"৩"</item>
+    <item msgid="1644506614010085798">"৪"</item>
+    <item msgid="3132506679404897150">"৫"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"গত ৩০ দিন"</item>
+    <item msgid="3211287705232736964">"ব্যবহার চক্র সেট করুন..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ব্যবহারের সময়"</item>
+    <item msgid="2784401352592276015">"সর্বশেষ ব্যবহার হয়েছে"</item>
+    <item msgid="249854287216326349">"অ্যাপ্লিকেশান নাম"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"কোনো কিছুই নয়"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"কোনো কিছুই নয়"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"সিম"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"কোনো কিছুই নয়"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"কোনো কিছুই নয়"</item>
+    <item msgid="1464741437353223198">"ম্যানুয়াল"</item>
+    <item msgid="5793600062487886090">"প্রক্সি স্বতঃ-কনফিগারেশন"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"কোনো কিছুই নয়"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP বা CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"অনির্দিষ্ট"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"কোনো কিছুই নয়"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ইন্টারনাল ডিভাইসের স্টোরেজ"</item>
+    <item msgid="3186681694079967527">"অপসারণযোগ্য SD কার্ড"</item>
+    <item msgid="6902033473986647035">"সিস্টেমকে সিদ্ধান্ত নিতে দিন"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"লোকেশন"</item>
+    <item msgid="6842381562497597649">"ব্যক্তিগত"</item>
+    <item msgid="3966700236695683444">"মেসেজিং"</item>
+    <item msgid="8563996233342430477">"মিডিয়া"</item>
+    <item msgid="5323851085993963783">"ডিভাইস"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"অনির্দিষ্ট লোকেশন"</item>
+    <item msgid="1830619568689922920">"সূক্ষ্ম লোকেশন"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ভাইব্রেট"</item>
+    <item msgid="8632513128515114092">"পরিচিতিগুলি পড়ুন"</item>
+    <item msgid="3741042113569620272">"পরিচিতি পরিবর্তন করুন"</item>
+    <item msgid="4204420969709009931">"কল লগ পড়ুন"</item>
+    <item msgid="2260380357119423209">"কল লগ পরিবর্তন করুন"</item>
+    <item msgid="6550710385014530934">"ক্যালেন্ডার পড়ুন"</item>
+    <item msgid="3575906174264853951">"ক্যালেন্ডারে পরিবর্তন করুন"</item>
+    <item msgid="4319843242568057174">"wi-fi স্ক্যান"</item>
+    <item msgid="2981791890467303819">"বিজ্ঞপ্তি"</item>
+    <item msgid="6617825156152476692">"সেল স্ক্যান"</item>
+    <item msgid="8865260890611559753">"ফোন করুন"</item>
+    <item msgid="3254999273961542982">"SMS পড়ুন"</item>
+    <item msgid="7711446453028825171">"SMS লিখুন"</item>
+    <item msgid="6123238544099198034">"SMS পান"</item>
+    <item msgid="838342167431596036">"জরুরী SMS পান"</item>
+    <item msgid="8554432731560956686">"MMS পান"</item>
+    <item msgid="7464863464299515059">"WAP পুশ পান"</item>
+    <item msgid="310463075729606765">"SMS পাঠান"</item>
+    <item msgid="7338021933527689514">"ICC SMS পড়ুন"</item>
+    <item msgid="6130369335466613036">"ICC SMS লিখুন"</item>
+    <item msgid="6536865581421670942">"সেটিংস সংশোধন করুন"</item>
+    <item msgid="4547203129183558973">"উপরে অঙ্কন করুন"</item>
+    <item msgid="9080347512916542840">"বিজ্ঞপ্তিগুলি অ্যাক্সেস করুন"</item>
+    <item msgid="5332718516635907742">"ক্যামেরা"</item>
+    <item msgid="6098422447246167852">"অডিও রেকর্ড"</item>
+    <item msgid="9182794235292595296">"অডিও প্লে করুন"</item>
+    <item msgid="8760743229597702019">"ক্লিপবোর্ড পড়ুন"</item>
+    <item msgid="2266923698240538544">"ক্লিপবোর্ড সংশোধন করুন"</item>
+    <item msgid="1801619438618539275">"মিডিয়া বোতাম"</item>
+    <item msgid="31588119965784465">"অডিও ফোকাস করুন"</item>
+    <item msgid="7565226799008076833">"মাস্টার ভলিউম"</item>
+    <item msgid="5420704980305018295">"ভয়েস ভলিউম"</item>
+    <item msgid="5797363115508970204">"রিং ভলিউম"</item>
+    <item msgid="8233154098550715999">"মিডিয়া ভলিউম"</item>
+    <item msgid="5196715605078153950">"অ্যালার্মের ভলিউম"</item>
+    <item msgid="394030698764284577">"বিজ্ঞপ্তির ভলিউম"</item>
+    <item msgid="8952898972491680178">"ব্লুটুথ এর ভলিউম"</item>
+    <item msgid="8506227454543690851">"জাগিয়ে রাখা"</item>
+    <item msgid="1108160036049727420">"লোকেশন নিরীক্ষণ করুন"</item>
+    <item msgid="1496205959751719491">"উচ্চ ক্ষমতার লোকেশন নিরীক্ষণ করুন"</item>
+    <item msgid="3776296279910987380">"ব্যবহারের পরিসংখ্যান পান"</item>
+    <item msgid="8827100324471975602">"মাইক্রোফোন মিউট/সশব্দ করুন"</item>
+    <item msgid="6880736730520126864">"টোস্ট দেখান"</item>
+    <item msgid="4933375960222609935">"মিডিয়া অভিক্ষেপ করুন"</item>
+    <item msgid="8357907018938895462">"VPN সক্রিয় করুন"</item>
+    <item msgid="8143812849911310973">"ওয়ালপেপারে লিখুন"</item>
+    <item msgid="6266277260961066535">"পরিকাঠামোর সহায়তা"</item>
+    <item msgid="7715498149883482300">"স্ক্রিনশটে সহায়তা"</item>
+    <item msgid="4046679376726313293">"ফোনে্র অবস্থা পড়ুন"</item>
+    <item msgid="6329507266039719587">"ভয়েসমেল যোগ করুন"</item>
+    <item msgid="7692440726415391408">"SIP ব্যবহার করুন"</item>
+    <item msgid="8572453398128326267">"আউটগোয়িং কলের প্রক্রিয়া করুন"</item>
+    <item msgid="7775674394089376306">"আঙ্গুলের ছাপ"</item>
+    <item msgid="3182815133441738779">"শরীরের সেন্সরগুলি"</item>
+    <item msgid="2793100005496829513">"সে্লে সম্প্রচারগুলি পড়ুন"</item>
+    <item msgid="2633626056029384366">"ছদ্ম লোকেশন"</item>
+    <item msgid="8356842191824684631">"সঞ্চয়স্থানে পড়ুন"</item>
+    <item msgid="5671906070163291500">"সঞ্চয়স্থানে লিখুন"</item>
+    <item msgid="2791955098549340418">"স্ক্রিন চালু করুন"</item>
+    <item msgid="5599435119609178367">"অ্যাকাউন্ট পেয়ে যান"</item>
+    <item msgid="1165623660533024666">"পটভূমি্তে অ্যাপ্স চলছে"</item>
+    <item msgid="6423861043647911030">"অ্যাক্সেসযোগ্যতার ভলিউম"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"স্বল্প"</item>
+    <item msgid="4816511817309094890">"মাঝারি"</item>
+    <item msgid="8305084671259331134">"দীর্ঘ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ডিফল্ট"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif ঘনীভূত"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"ক্যাজুয়্যাল"</item>
+    <item msgid="4627069151979553527">"কার্সিভ"</item>
+    <item msgid="6896773537705206194">"Small Capitals"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ডিফল্ট"</item>
+    <item msgid="6488643537808152001">"কোনো কিছুই নয়"</item>
+    <item msgid="552332815156010137">"রূপরেখা"</item>
+    <item msgid="7187891159463789272">"ড্রপ শ্যাডো"</item>
+    <item msgid="8019330250538856521">"উত্থাপিত"</item>
+    <item msgid="8987385315647049787">"চাপা"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"২৫%"</item>
+    <item msgid="4665048002584838262">"৫০%"</item>
+    <item msgid="1874668269931014581">"৭৫%"</item>
+    <item msgid="6462911487571123954">"১০০%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"আগে থেকে শেয়ার করা কীগুলির সাথে L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"শংসাপত্রগুলির সাথে L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"আগে থেকে শেয়ার করা কীগুলি এবং Xauth প্রমাণীকরণের সাথে IPSec VPN"</item>
+    <item msgid="3319427315593649917">"শংসাপত্রগুলি এবং Xauth প্রমাণীকরণের সাথে IPSec VPN"</item>
+    <item msgid="8258927774145391041">"শংসাপত্রগুলি এবং হাইব্রীড প্রমাণীকরণের সাথে IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"কোনো কিছুই নয়"</item>
+    <item msgid="1157046369795346308">"ম্যানুয়াল"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"জিজ্ঞাসা করুন"</item>
+    <item msgid="7718817231348607934">"কখনো অনুমতি দেবেন না"</item>
+    <item msgid="8184570120217958741">"সর্বদা অনুমতি দিন"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ক্রমাগত"</item>
+    <item msgid="167418068739176448">"শীর্ষ অ্যাক্টিভিটি"</item>
+    <item msgid="4760813290195199773">"গুরুত্বপূর্ণ (পুরোভাগে)"</item>
+    <item msgid="2328684826817647595">"গুরুত্বপূর্ণ (পশ্চাদপট)"</item>
+    <item msgid="7746406490652867365">"ব্যাক-আপ"</item>
+    <item msgid="5597404364389196754">"হেভি ওয়েট"</item>
+    <item msgid="1290888779300174556">"পরিষেবা (চলমান)"</item>
+    <item msgid="7241098542073939046">"পরিষেবা (আবার চালু হচ্ছে)"</item>
+    <item msgid="6610439017684111046">"রিসিভার"</item>
+    <item msgid="7367606086319921117">"হোম"</item>
+    <item msgid="3344660712396741826">"সর্বশেষ অ্যাক্টিভিটি"</item>
+    <item msgid="5006559348883303865">"ব্যবহৃত ক্যাশে (অ্যাক্টিভিটি)"</item>
+    <item msgid="8633480732468137525">"ব্যবহৃত ক্যাশে (অ্যাক্টিভিটি ক্লায়েন্ট)"</item>
+    <item msgid="6248998242443333892">"ব্যবহৃত ক্যাশে (খালি)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"টিল"</item>
+    <item msgid="3228505970082457852">"নীল"</item>
+    <item msgid="6590260735734795647">"বেগুনী নীলবর্ণ"</item>
+    <item msgid="3521763377357218577">"বেগুনী"</item>
+    <item msgid="5932337981182999919">"গোলাপী"</item>
+    <item msgid="5642914536624000094">"লাল"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"৩০ দিনের বেশি পুরনো"</item>
+    <item msgid="8699273238891265610">"৬০ দিনের বেশি পুরনো"</item>
+    <item msgid="8346279419423837266">"৯০ দিনের বেশি পুরনো"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"১"</item>
+    <item msgid="3118234477029486741">"০"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"অটোমেটিক শনাক্ত হতে দিন"</item>
+    <item msgid="773943026484148895">"মিটারিং চালু রাখুন"</item>
+    <item msgid="1008268820118852416">"মিটারিং এর দরকার নেই"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"র‍্যান্ডমাইজ করা MAC (ডিফল্ট)"</item>
+    <item msgid="214234417308375326">"MAC ডিভাইস ব্যবহার করুন"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"না"</item>
+    <item msgid="1930581185557754880">"হ্যাঁ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"গাঢ়"</item>
+    <item msgid="5079453644557603349">"হালকা"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"বন্ধ আছে"</item>
+    <item msgid="4072198137051566919">"ডিবাগ"</item>
+    <item msgid="2473005316958868509">"ভার্বোস"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"শুধুমাত্র হোমে"</item>
+    <item msgid="1161026694891024702">"অটোমেটিক"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA ব্যবহার করতে চাই"</item>
+    <item msgid="7581481130337402578">"শুধুমাত্র GSM"</item>
+    <item msgid="8579197487913425819">"শুধুমাত্র WCDMA"</item>
+    <item msgid="8465243227505412498">"অটোমেটিক GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"অটোমেটিক CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"EvDo ছাড়া CDMA"</item>
+    <item msgid="7278975240951052041">"শুধুমাত্র EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"গ্লোবাল"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"শুধুমাত্র TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/সিম"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"গ্লোবাল"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-bn/strings.xml b/tests/CarDeveloperOptions/res/values-bn/strings.xml
index d43defa..63d2cc7 100644
--- a/tests/CarDeveloperOptions/res/values-bn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bn/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"স্ক্রিন লক বিকল্প ব্যবহার করে আপনার ট্যাবলেট সুরক্ষিত করুন যাতে এটি হারিয়ে গেলে বা চুরি হয়ে গেলে কেউ ব্যবহার করতে না পারে। ফেস যাচাই করার প্রক্রিয়াটি সেট-আপ করার জন্য আপনার ডিভাইসে একটি স্ক্রিন লক বিকল্প থাকতে হবে। বাতিল করুন বিকল্পে ট্যাপ করে পিন সেট করুন অথবা অন্য স্ক্রিন লক বিকল্প বেছে নিন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"স্ক্রিন লক বিকল্প ব্যবহার করে আপনার ডিভাইস সুরক্ষিত করুন যাতে এটি হারিয়ে গেলে বা চুরি হয়ে গেলে কেউ ব্যবহার করতে না পারে। ফেস যাচাই করার প্রক্রিয়াটি সেট-আপ করার জন্য আপনার ডিভাইসে একটি স্ক্রিন লক বিকল্প থাকতে হবে। বাতিল করুন বিকল্পে ট্যাপ করে পিন সেট করুন অথবা অন্য স্ক্রিন লক বিকল্প বেছে নিন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"স্ক্রিন লক বিকল্প ব্যবহার করে আপনার ফোন সুরক্ষিত করুন যাতে এটি হারিয়ে গেলে বা চুরি হয়ে গেলে কেউ ব্যবহার করতে না পারে। ফেস যাচাই করার প্রক্রিয়াটি সেট-আপ করার জন্য আপনার ডিভাইসে একটি স্ক্রিন লক বিকল্প থাকতে হবে। বাতিল করুন বিকল্পে ট্যাপ করে পিন সেট করুন অথবা অন্য স্ক্রিন লক বিকল্প বেছে নিন।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"পিন সেট-আপ এড়াতে চান?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"পাসওয়ার্ড সেট-আপ এড়াতে চান?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"প্যাটার্ন সেট-আপ এড়াতে চান?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"স্ক্রিন লক সেট-আপ করুন"</string>
@@ -982,7 +981,7 @@
     <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"লোকেশন নির্ভুলতা উন্নতি ও অন্যান্য উদ্দ্যেশ্যের জন্য <xliff:g id="APP_NAME">%1$s</xliff:g> নেটওয়ার্ক স্ক্যান চালু করতে চাইছে, এমনকি ওয়াই-ফাই বন্ধ থাকা সত্ত্বেও।\n\nযে সব অ্যাপ্লিকেশানগুলি স্ক্যান করতে চাই তাদের জন্য এটির অনুমতি দেবেন?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"এটি বন্ধ করতে, ওভারফ্লো মেনুতে ‘উন্নত’ লেখায় যান"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="8857664849515496237">"অনুমতি দিন"</string>
-    <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"আস্বীকার করুন"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"অস্বীকার করুন"</string>
     <string name="wifi_hotspot_title" msgid="2631956539767069385">"কানেক্ট করতে প্রবেশ করবেন?"</string>
     <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> এর চাহিদা অনুযায়ী নেটওয়ার্কের সাথে কানেক্ট হওয়ার পূর্বে আপনাকে অনলাইনে প্রবেশ করতে হবে।"</string>
     <string name="wifi_hotspot_connect" msgid="409079339360849653">"কানেক্ট করুন"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ওয়াই-ফাই"</item>
+    <item msgid="4421333712484542489">"মোবাইল"</item>
+    <item msgid="6007360612667098926">"শুধুমাত্র ওয়াই-ফাই"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1178,7 +1180,7 @@
     <string name="brightness" msgid="7309120144111305275">"উজ্জ্বলতার স্তর"</string>
     <string name="brightness_title" msgid="5660190946911149690">"উজ্জ্বলতা"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"স্ক্রীনের উজ্জ্বলতা সামঞ্জস্য করুন"</string>
-    <string name="auto_brightness_title" msgid="908511534369820426">"অ্যাডাপ্টিভ উজ্জ্বলতা"</string>
+    <string name="auto_brightness_title" msgid="908511534369820426">"অভিযোজিত উজ্জ্বলতা"</string>
     <string name="auto_brightness_summary_on" msgid="121488862610275737">"চালু আছে"</string>
     <string name="auto_brightness_summary_off" msgid="8569141123211510256">"বন্ধ আছে"</string>
     <string name="auto_brightness_summary_very_low" msgid="7625647285740629347">"পছন্দের উজ্জ্বলতার মান খুব কম"</string>
@@ -2612,7 +2614,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"এখনই সিঙ্ক করতে আলতো চাপুন<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"ক্যালেন্ডার"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"পরিচিতিগুলি"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google সমন্বয়ে স্বাগতম!"</font>" \nআপনি যেখানেই থাকুন না কেন আপনার পরিচিতি, অ্যাপয়েন্টমেন্ট, এবং আরো অনেক কিছু অ্যাক্সেস করার জন্য ডেটা সিঙ্ক করতে একটি Google এর একটি পদক্ষেপ।"</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"অ্যাপ্লিকেশান সমন্বয় সেটিংস"</string>
@@ -3071,7 +3073,7 @@
     <string name="keywords_factory_data_reset" msgid="5865739790670615499">"ওয়াইপ করুন, মুছুন, ফিরিয়ে আনুন, মুছুন, সরান, ফ্যাক্টরি রিসেট করুন"</string>
     <string name="keywords_printing" msgid="8499167841024606451">"প্রিন্টার"</string>
     <string name="keywords_sounds" msgid="9155626618185269312">"স্পিকার বিপ, স্পিকার, ভলিউম, মিউট, সাইলেন্স, অডিও, মিউজিক"</string>
-    <string name="keywords_sounds_and_notifications_interruptions" msgid="7106220678170229900">"বিরক্ত করবেন না, বাধা দেওয়া, বাধা, বিরতি"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="7106220678170229900">"বিরক্ত করবে না, বাধা দেওয়া, বাধা, বিরতি"</string>
     <string name="keywords_app" msgid="8058542404742867098">"RAM"</string>
     <string name="keywords_location" msgid="6439463166207072559">"আশেপাশে, লোকেশন, ইতিহাস, রিপোর্টিং, জিপিএস"</string>
     <string name="keywords_accounts" msgid="5908945725229306088">"অ্যাকাউন্ট"</string>
@@ -3123,7 +3125,7 @@
     <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"ব্যাটারি সেভার, স্টিকি, লেগে থাকা, পাওয়ার সেভার, ব্যাটারি"</string>
     <string name="default_sound" msgid="6675629744816442953">"ডিফল্ট সাউন্ড"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"রিং ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g> তে রয়েছে"</string>
-    <string name="sound_dashboard_summary" msgid="5187301919242823508">"ভলিউম, কম্পন, বিরক্ত করবেন না"</string>
+    <string name="sound_dashboard_summary" msgid="5187301919242823508">"ভলিউম, ভাইব্রেশন, বিরক্ত করবে না"</string>
     <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"রিঙ্গারকে ভাইব্রেট অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_summary_silent" msgid="899823817462768876">"রিঙ্গারকে নীরব অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"রিং ভলিউম ৮০% তে রয়েছে"</string>
@@ -3161,8 +3163,8 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি চালু করা আছে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি চালু করা আছে</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="3425263414594779244">"বিরক্ত করবেন না"</string>
-    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"\'বিরক্ত করবেন না\' মোড চালু করুন"</string>
+    <string name="zen_mode_settings_title" msgid="3425263414594779244">"বিরক্ত করবে না"</string>
+    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"\'বিরক্ত করবে না\' মোড চালু করুন"</string>
     <string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"ব্যতিক্রম"</string>
     <string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"ডিফল্ট সময়কাল"</string>
     <string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"এগুলির সাউন্ড ও ভাইব্রেশন হবে"</string>
@@ -3178,7 +3180,7 @@
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5272888746413504692">"সময়সূচি"</string>
     <string name="zen_mode_schedule_category_title" msgid="1936785755444711221">"সময়সূচি"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4921779962633710347">"নির্দিষ্ট সময়ে ফোন সাইলেন্ট করুন"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"\'বিরক্ত করবেন না\' মোডের নিয়ম সেট-আপ করুন"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"\'বিরক্ত করবে না\' মোডের নিয়ম সেট-আপ করুন"</string>
     <string name="zen_mode_schedule_title" msgid="5275268813192802631">"সময়সূচি"</string>
     <string name="zen_mode_use_automatic_rule" msgid="446326253915861824">"সময়সূচি ব্যবহার করুন"</string>
     <string name="zen_mode_option_important_interruptions" msgid="5173944276846940149">"শুধুমাত্র অগ্রাধিকার"</string>
@@ -3187,14 +3189,14 @@
     <string name="zen_mode_summary_combination" msgid="6960111215170691605">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="8378266552787406849">"ভিজ্যুয়াল ব্যাঘাতগুলিকে ব্লক করুন"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6608239691864638854">"ভিজুয়াল সঙ্কেতগুলি চালু করুন"</string>
-    <string name="zen_mode_settings_category" msgid="5601680733422424922">"যখন \'বিরক্ত করবেন না চালু\' থাকবে"</string>
+    <string name="zen_mode_settings_category" msgid="5601680733422424922">"যখন \'বিরক্ত করবে না চালু\' থাকবে"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="7486753018073540477">"বিজ্ঞপ্তি ব্লক করুন"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="2673665450311184875">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="1696217042353376674">"আপনার স্ক্রিনে বিজ্ঞপ্তি দেখতে পাবেন"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3049522809520549054">"বিজ্ঞপ্তি দেখানো হলে ফোনে সাউন্ড বা ভাইব্রেশন হবে না।"</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="3296933643539682552">"বিজ্ঞপ্তি থেকে কোনও কিছু দেখা বা শোনা যাবে না"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"আপনি কোনও বিজ্ঞপ্তি দেখতে বা শুনতে পাবেন না"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"নতুন অথবা আগে থেকে রয়েছে এমন বিজ্ঞপ্তির ক্ষেত্রে আপনার ফোনে ভাইব্রেশন অথবা সাউন্ড হবে না বা কোনও কিছু দেখাবে না। মনে রাখবেন, ফোনের অ্যাক্টিভিটি এবং স্ট্যাটাস সংক্রান্ত জরুরি বিজ্ঞপ্তি দেখানো হবে।\n\nআপনি ফোনে \"বিরক্ত করবেন না মোড\" বন্ধ করে রাখলে, স্ক্রিনের উপর থেকে নিচে সোয়াইপ করে মিস হওয়া বিজ্ঞপ্তিগুলি দেখুন।"</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"নতুন অথবা আগে থেকে রয়েছে এমন বিজ্ঞপ্তির ক্ষেত্রে আপনার ফোনে ভাইব্রেশন অথবা সাউন্ড হবে না বা কোনও কিছু দেখাবে না। মনে রাখবেন, ফোনের অ্যাক্টিভিটি এবং স্ট্যাটাস সংক্রান্ত জরুরি বিজ্ঞপ্তি দেখানো হবে।\n\nআপনি ফোনে \"বিরক্ত করবে না মোড\" বন্ধ করে রাখলে, স্ক্রিনের উপর থেকে নিচে সোয়াইপ করে মিস হওয়া বিজ্ঞপ্তিগুলি দেখুন।"</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"কাস্টম"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"কাস্টম সেটিং চালু করুন"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"কাস্টম সেটিং সরান"</string>
@@ -3225,11 +3227,11 @@
     <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"চালু করুন"</string>
     <string name="zen_mode_button_turn_on" msgid="1097964136225943415">"এখনই চালু করুন"</string>
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"এখনই বন্ধ করুন"</string>
-    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"\'বিরক্ত করবেন না\' মোডটি <xliff:g id="FORMATTED_TIME">%s</xliff:g> পর্যন্ত চালু থাকবে"</string>
-    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"\'বিরক্ত করবেন না\' মোডটি বন্ধ না করা পর্যন্ত সেটি চালু থাকবে"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"(<xliff:g id="RULE_NAME">%s</xliff:g>) শিডিউলের জন্য বিরক্ত করবেন না মোডটি নিজে থেকেই চালু হয়ে গেছে"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> অ্যাপটি নিজে থেকেই \'বিরক্ত করবেন না\' মোড চালু করে দিয়েছে"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"কাস্টম সেটিংস সহ <xliff:g id="RULE_NAMES">%s</xliff:g>-এর জন্য \'বিরক্ত করবেন না\' মোডটি চালু আছে।"</string>
+    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"\'বিরক্ত করবে না\' মোডটি <xliff:g id="FORMATTED_TIME">%s</xliff:g> পর্যন্ত চালু থাকবে"</string>
+    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"\'বিরক্ত করবে না\' মোডটি বন্ধ না করা পর্যন্ত সেটি চালু থাকবে"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"(<xliff:g id="RULE_NAME">%s</xliff:g>) শিডিউলের জন্য বিরক্ত করবে না মোডটি নিজে থেকেই চালু হয়ে গেছে"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> অ্যাপটি নিজে থেকেই \'বিরক্ত করবে না\' মোড চালু করে দিয়েছে"</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"কাস্টম সেটিংস সহ <xliff:g id="RULE_NAMES">%s</xliff:g>-এর জন্য \'বিরক্ত করবে না\' মোডটি চালু আছে।"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" কাস্টম সেটিংস দেখুন"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"শুধুমাত্র অগ্রাধিকার"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3252,7 +3254,7 @@
     <string name="zen_category_exceptions" msgid="2139670640033601899">"ব্যতিক্রম"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"সময় ঠিক করুন"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"সবগুলি দেখুন"</string>
-    <string name="zen_sound_footer" msgid="1778673975517424878">"\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সবকিছুর ক্ষেত্রে সাউন্ড এবং ভাইব্রেশন মিউট করা হবে।"</string>
+    <string name="zen_sound_footer" msgid="1778673975517424878">"\'বিরক্ত করবে না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সবকিছুর ক্ষেত্রে সাউন্ড এবং ভাইব্রেশন মিউট করা হবে।"</string>
     <string name="zen_sound_category_title" msgid="2109447208414722786">"এগুলি ছাড়া সবকিছু মিউট করুন"</string>
     <string name="zen_sound_all_muted" msgid="4844094866910870591">"মিউট করা আছে"</string>
     <string name="zen_sound_none_muted" msgid="4869385974769188085">"মিউট করা নেই"</string>
@@ -3265,14 +3267,14 @@
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"বিজ্ঞপ্তি"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"সময়কাল"</string>
     <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"মেসেজ, ইভেন্ট ও রিমাইন্ডার"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"\'বিরক্ত করবে না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
     <string name="zen_onboarding_ok" msgid="6403635918125323678">"হয়ে গেছে"</string>
     <string name="zen_onboarding_settings" msgid="1416466597876383322">"সেটিংস"</string>
     <string name="zen_onboarding_new_setting_title" msgid="3622673375041304362">"বিজ্ঞপ্তি থেকে কোনও কিছু দেখা বা শোনা যাবে না"</string>
     <string name="zen_onboarding_current_setting_title" msgid="2560330551761407563">"বিজ্ঞপ্তি থেকে কোনও সাউন্ড হবে না"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"আপনি কোনও বিজ্ঞপ্তি দেখতে বা শুনতে পাবেন না। যারা তারা চিহ্নিত পরিচিতি এবং আগে যারা ফোন করেছেন তারা আবার ফোন করতে পারবেন।"</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(বর্তমান সেটিং)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"\"বিরক্ত করবেন না\" মোডের বিজ্ঞপ্তির সেটিংস পরিবর্তন করবেন?"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"\"বিরক্ত করবে না\" মোডের বিজ্ঞপ্তির সেটিংস পরিবর্তন করবেন?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"কর্মস্থলের প্রোফাইলের ধ্বনিগুলি"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করুন"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"কাজ এবং ব্যক্তিগত প্রোফাইলের জন্য একই শব্দ"</string>
@@ -3364,10 +3366,10 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"অ্যাসিস্ট্যান্টের পরিষেবা পাওয়া যাবে না"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"ইনস্টল করা কোনো অ্যাপের অনুরোধকৃত বিজ্ঞপ্তির অ্যাক্সেস নেই৷"</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g>-কে বিজ্ঞপ্তিতে অ্যাক্সেস দিতে চান?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> পরিচিতির নাম এবং আপনি পেয়েছেন এমন টেক্সট মেসেজ সহ ব্যক্তিগত তথ্যের সব বিজ্ঞপ্তি পড়তে পারবে। এর মধ্যে থাকা বিজ্ঞপ্তি পরিবর্তন করতে বা অ্যাকশন বোতাম ট্রিগার করতে বা খারিজ করতে পারবে। \n\nএই অ্যাপ \'বিরক্ত করবেন না\' বিকল্পটিকে চালু বা বন্ধ করার এবং সম্পর্কিত সেটিংস পরিবর্তন করতে পারবে।"</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> পরিচিতির নাম এবং আপনি পেয়েছেন এমন টেক্সট মেসেজ সহ ব্যক্তিগত তথ্যের সব বিজ্ঞপ্তি পড়তে পারবে। এর মধ্যে থাকা বিজ্ঞপ্তি পরিবর্তন করতে বা অ্যাকশন বোতাম ট্রিগার করতে বা খারিজ করতে পারবে। \n\nএই অ্যাপ \'বিরক্ত করবে না\' বিকল্পটিকে চালু বা বন্ধ করার এবং সম্পর্কিত সেটিংস পরিবর্তন করতে পারবে।"</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> এর জন্য বিজ্ঞপ্তির অ্যাক্সেসে অনুমতি দেবেন?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, পরিচিতির নাম ও আপনার গৃহীত পাঠ্য বার্তাগুলির মত ব্যক্তিগত তথ্য সহ সমস্ত বিজ্ঞপ্তি পড়তে সক্ষম হবে৷ এটি আবার এর মধ্যে থাকা বিজ্ঞপ্তিগুলি বা নির্দিষ্ট কাজের বোতামগুলি খারিজ করতে পারবে। \n\nএছাড়াও এটি এই অ্যাপ্লিকেশানকে, \'বিরক্ত করবেন না\' বিকল্পটিকে চালু বা বন্ধ করার এবং সংশ্লিষ্ট সেটিংস পরিবর্তন করার ক্ষমতা প্রদান করবে৷"</string>
-    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"যদি আপনি <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> এর জন্য বিজ্ঞপ্তির অ্যাক্সেস বন্ধ করেন, তাহলে \'বিরক্ত করবেন না\' এর অ্যাক্সেসও বন্ধ হয়ে যেতে পারে৷"</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, পরিচিতির নাম ও আপনার গৃহীত পাঠ্য বার্তাগুলির মত ব্যক্তিগত তথ্য সহ সমস্ত বিজ্ঞপ্তি পড়তে সক্ষম হবে৷ এটি আবার এর মধ্যে থাকা বিজ্ঞপ্তিগুলি বা নির্দিষ্ট কাজের বোতামগুলি খারিজ করতে পারবে। \n\nএছাড়াও এটি এই অ্যাপ্লিকেশানকে, \'বিরক্ত করবে না\' বিকল্পটিকে চালু বা বন্ধ করার এবং সংশ্লিষ্ট সেটিংস পরিবর্তন করার ক্ষমতা প্রদান করবে৷"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"যদি আপনি <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> এর জন্য বিজ্ঞপ্তির অ্যাক্সেস বন্ধ করেন, তাহলে \'বিরক্ত করবে না\' এর অ্যাক্সেসও বন্ধ হয়ে যেতে পারে৷"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"বন্ধ করুন"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"বাতিল করুন"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"(ভিআর)VR সহায়তাকারী পরিষেবাগুলি"</string>
@@ -3383,9 +3385,9 @@
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"ছবির-মধ্যে-ছবি"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"ছবির-মধ্যে-ছবি তৈরির অনুমতি দিন"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"অ্যাপটি খোলা থাকার সময় অথবা আপনি এটি ছেড়ে বেরিয়ে গেলে (যেমন, কোনও ভিডিও দেখার জন্য) এটিকে একটি ছবির-মধ্যে-ছবি সমেত উইন্ডো তৈরি করার অনুমতি দিন। চালু থাকা অন্যান্য অ্যাপের উপরে এই উইন্ডোটি দেখা যাবে।"</string>
-    <string name="manage_zen_access_title" msgid="3058206309728524196">"বিরক্ত করবেন না মোডের ক্ষেত্রে অ্যাক্সেস"</string>
-    <string name="zen_access_detail_switch" msgid="8706332327904974500">"\'বিরক্ত করবেন না\' মোডের জন্য অনুমতি দিন"</string>
-    <string name="zen_access_empty_text" msgid="7667538993781607731">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবেন না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
+    <string name="manage_zen_access_title" msgid="3058206309728524196">"বিরক্ত করবে না মোডের ক্ষেত্রে অ্যাক্সেস"</string>
+    <string name="zen_access_detail_switch" msgid="8706332327904974500">"\'বিরক্ত করবে না\' মোডের জন্য অনুমতি দিন"</string>
+    <string name="zen_access_empty_text" msgid="7667538993781607731">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবে না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"আপনার অনুরোধ অনুযায়ী Android এই অ্যাপের বিজ্ঞপ্তি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"আপনার অনুরোধ অনুযায়ী Android এই বিভাগের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
@@ -3415,8 +3417,8 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"ছায়া বা পেরিফেরাল ডিভাইসে কখনও বিজ্ঞপ্তিগুলি দেখায় না"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"বিজ্ঞপ্তির ডট দেখানোর অনুমতি দিন"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"বিজ্ঞপ্তির ডট দেখান"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"\'বিরক্ত করবেন না\' মোড চালু থাকলেও এই বিজ্ঞপ্তিগুলির জন্য আওয়াজ হতে দিন"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\'বিরক্ত করবে না\' ওভাররাইড করুন"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"\'বিরক্ত করবে না\' মোড চালু থাকলেও এই বিজ্ঞপ্তিগুলির জন্য আওয়াজ হতে দিন"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"লক স্ক্রিনে"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"অবরুদ্ধ"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"অগ্রাধিকার"</string>
@@ -3439,13 +3441,13 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="2646596466259025978">"\"<xliff:g id="RULE">%1$s</xliff:g>\" নিয়ম মুছে ফেলবেন?"</string>
     <string name="zen_mode_delete_rule_button" msgid="611058106279881991">"মুছুন"</string>
     <string name="zen_mode_rule_type_unknown" msgid="2819480113355191421">"অজানা"</string>
-    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"এই সেটিংগুলি এখনই পরিবর্তন করা যাবে না। অ্যাপটি (<xliff:g id="APP_NAME">%1$s</xliff:g>) কাস্টম আচরণের সাথে \'বিরক্ত করবেন না\'\' মোডটি নিজে থেকেই চালু করে দিয়েছে।"</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"এই সেটিংগুলি এখনই পরিবর্তন করা যাবে না। অ্যাপটি কাস্টম আচরণের সাথে \'বিরক্ত করবেন না\'\' মোডটি নিজে থেকেই চালু করে দিয়েছে।"</string>
-    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"এই সেটিংগুলি এখনই পরিবর্তন করা যাবে না। কাস্টম আচরণের সাথে ম্যানুয়ালী \'\'বিরক্ত করবেন না\'\' মোডটি চালু করা ছিল।"</string>
+    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"এই সেটিংগুলি এখনই পরিবর্তন করা যাবে না। অ্যাপটি (<xliff:g id="APP_NAME">%1$s</xliff:g>) কাস্টম আচরণের সাথে \'বিরক্ত করবে না\'\' মোডটি নিজে থেকেই চালু করে দিয়েছে।"</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"এই সেটিংগুলি এখনই পরিবর্তন করা যাবে না। অ্যাপটি কাস্টম আচরণের সাথে \'বিরক্ত করবে না\'\' মোডটি নিজে থেকেই চালু করে দিয়েছে।"</string>
+    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"এই সেটিংগুলি এখনই পরিবর্তন করা যাবে না। কাস্টম আচরণের সাথে ম্যানুয়ালী \'\'বিরক্ত করবে না\'\' মোডটি চালু করা ছিল।"</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"সময়"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"বিরক্ত করবেন না চালু করার জন্য, নির্দিষ্ট সময়ের জন্য স্বয়ংক্রিয়ভাবে নিয়ম সেট করা"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"বিরক্ত করবে না চালু করার জন্য, নির্দিষ্ট সময়ের জন্য স্বয়ংক্রিয়ভাবে নিয়ম সেট করা"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"ইভেন্ট"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"বিরক্ত করবেন না চালু করার জন্য, নির্দিষ্ট সময়ের জন্য স্বয়ংক্রিয়ভাবে নিয়ম সেট করা"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"বিরক্ত করবে না চালু করার জন্য, নির্দিষ্ট সময়ের জন্য স্বয়ংক্রিয়ভাবে নিয়ম সেট করা"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"এর জন্য ইভেন্টগুলি চলাকালীন"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"<xliff:g id="CALENDAR">%1$s</xliff:g> এর জন্য ইভেন্টগুলি চলাকালীন"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"যেকোনো ক্যালেন্ডার"</string>
@@ -3463,7 +3465,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="8814173364016139675">"প্রতিদিন"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="2078194049274875023">"অ্যালার্ম সমাপ্তি সময়কে ওভাররাইড করতে পারে"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="5556997989911412070">"কোনও অ্যালার্ম বাজলে সময়সূচী বন্ধ হয়ে যায়"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"\'বিরক্ত করবেন না\' মোড"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"\'বিরক্ত করবে না\' মোড"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="3509865340195397447">"ডিফল্ট সেটিংস ব্যবহার করুন"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7206909852887332604">"এই সময়ের জন্য কাস্টম সেটিংস তৈরি করুন"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7451686525113262087">"\'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\'-এর জন্য"</string>
@@ -3504,8 +3506,8 @@
     <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"অ্যাপ ওভাররাইডের অনুমতি দিন"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"অ্যাপ এক্সেপশন"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
-      <item quantity="one">যদি <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপকে বিজ্ঞপ্তি দেওয়ার অনুমতি দেওয়া হয়, তাহলে বিরক্ত করবেন না মোড ওভাররাইড হতে পারে।</item>
-      <item quantity="other">যদি <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপকে বিজ্ঞপ্তি দেওয়ার অনুমতি দেওয়া হয়, তাহলে বিরক্ত করবেন না মোড ওভাররাইড হতে পারে।</item>
+      <item quantity="one">যদি <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপকে বিজ্ঞপ্তি দেওয়ার অনুমতি দেওয়া হয়, তাহলে বিরক্ত করবে না মোড ওভাররাইড হতে পারে।</item>
+      <item quantity="other">যদি <xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপকে বিজ্ঞপ্তি দেওয়ার অনুমতি দেওয়া হয়, তাহলে বিরক্ত করবে না মোড ওভাররাইড হতে পারে।</item>
     </plurals>
     <string name="zen_mode_events_list" msgid="8578102701815684873">"ইভেন্ট"</string>
     <string name="zen_mode_all_callers" msgid="4455039040077343838">"যেকেউ"</string>
@@ -3537,10 +3539,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"শুধুমাত্র <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"যখন স্ক্রিন চালু থাকে"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\'বিরক্ত করবেন না\' দ্বারা মিউট করা বিজ্ঞপ্তিগুলিকে স্ক্রিনে প্রদর্শিত হতে এবং একটি স্ট্যাটাস বার আইকন দেখাতে দিন"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\'বিরক্ত করবে না\' দ্বারা মিউট করা বিজ্ঞপ্তিগুলিকে স্ক্রিনে প্রদর্শিত হতে এবং একটি স্ট্যাটাস বার আইকন দেখাতে দিন"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"যখন স্ক্রিন বন্ধ থাকে"</string>
-    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"\'বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করতে এবং লাইটটি জ্বলাতে ও নেভাতে দিন"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"\'বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করতে দিন"</string>
+    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"\'বিরক্ত করবে না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করতে এবং লাইটটি জ্বলাতে ও নেভাতে দিন"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"\'বিরক্ত করবে না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করতে দিন"</string>
     <string name="notification_app_settings_button" msgid="3651180424198580907">"বিজ্ঞপ্তির সেটিংস"</string>
     <string name="suggestion_button_text" msgid="5783566542423813847">"ঠিক আছে"</string>
     <string name="device_feedback" msgid="4042352891448769818">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
@@ -3602,7 +3604,7 @@
     <string name="notifications_silenced" msgid="538923056987616372">"মিউট করা হয়েছে"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"সংবেদনশীল সামগ্রীকে লক স্ক্রীনে দেখানো হবে না"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"লক স্ক্রীনে দেখানো হবে না"</string>
-    <string name="notifications_priority" msgid="8849045645983017929">"\'বিরক্ত করবেন না\' ওভাররাইড করা হয়েছে"</string>
+    <string name="notifications_priority" msgid="8849045645983017929">"\'বিরক্ত করবে না\' ওভাররাইড করা হয়েছে"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
     <string name="notification_summary_level" msgid="309162160355022027">"লেভেল %d"</string>
     <string name="notification_summary_channel" msgid="3372346622071114366">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3626,7 +3628,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"কোন অনুমতির অনুরোধ জানানো হয় নি"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"সমস্ত অ্যাপ্লিকেশন"</string>
     <string name="filter_enabled_apps" msgid="5888459261768538489">"ইনস্টল করা অ্যাপগুলি"</string>
-    <string name="filter_instant_apps" msgid="8087483282854072366">"ঝটপট অ্যাপ"</string>
+    <string name="filter_instant_apps" msgid="8087483282854072366">"ইনস্ট্যান্ট অ্যাপ"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"ব্যক্তিগত"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"কাজ"</string>
     <string name="filter_notif_all_apps" msgid="1862666327228804896">"অ্যাপ: সমস্ত"</string>
@@ -3634,7 +3636,7 @@
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"বিভাগগুলি: জরুরী গুরুত্বের"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"বিভাগগুলি: কম গুরুত্বের"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"বিভাগগুলি: বন্ধ আছে"</string>
-    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"বিভাগগুলি: বিরক্ত করবেন না কে ওভাররাইড করে"</string>
+    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"বিভাগগুলি: বিরক্ত করবে না কে ওভাররাইড করে"</string>
     <string name="advanced_apps" msgid="6643869089344883537">"উন্নত"</string>
     <string name="configure_apps" msgid="4066683118857400943">"অ্যাপ্লিকেশান কনফিগার করুন"</string>
     <string name="unknown_app" msgid="2312052973570376877">"অজানা অ্যাপ্লিকেশান"</string>
@@ -3779,11 +3781,11 @@
     <string name="running_frequency" msgid="7545170806968474449">"পুনরাবৃত্তির হার"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"সর্বাধিক ব্যবহার"</string>
     <string name="no_data_usage" msgid="903383745620135746">"কোনো ডেটা ব্যবহৃত হয়নি"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> ব্যবহারের জন্য \'বিরক্ত করবেন না\' -তে অ্যাক্সেসের অনুমতি দেবেন?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"অ্যাপটি \'বিরক্ত করবেন না\' চালু/বন্ধ করতে সক্ষম হবে এবং এই সংক্রান্ত সেটিংসে পরিবর্তনগুলি করবে।"</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> ব্যবহারের জন্য \'বিরক্ত করবে না\' -তে অ্যাক্সেসের অনুমতি দেবেন?"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"অ্যাপটি \'বিরক্ত করবে না\' চালু/বন্ধ করতে সক্ষম হবে এবং এই সংক্রান্ত সেটিংসে পরিবর্তনগুলি করবে।"</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"বিজ্ঞপ্তির অ্যাক্সেস চালু থাকার কারণে এটিকে অবশ্যই চালু থাকতে হবে"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> এর জন্য \'বিরক্ত করবেন না\' তে অ্যাক্সেস প্রত্যাহার করবেন?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"এই অ্যাপ্লিকেশানের দ্বারা তৈরি হওয়া সমস্ত \'বিরক্ত করবেন না\' নিয়মগুলিকে সরানো হবে৷"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> এর জন্য \'বিরক্ত করবে না\' তে অ্যাক্সেস প্রত্যাহার করবেন?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"এই অ্যাপ্লিকেশানের দ্বারা তৈরি হওয়া সমস্ত \'বিরক্ত করবে না\' নিয়মগুলিকে সরানো হবে৷"</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"অপ্টিমাইজ করবেন না"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"অপ্টিমাইজ করুন"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"এতে চার্জ আরও দ্রুত শেষ হয়ে যেতে পারে। ব্যাকগ্রাউন্ডে ব্যাটারি ব্যবহার করা থেকে অ্যাপটিকে আর সীমাবদ্ধ করা হবে না।"</string>
@@ -3883,7 +3885,7 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"হটস্পট চালু আছে"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"বিমান মোড চালু করা আছে"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"নেটওয়ার্ক উপলভ্য নেই"</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"\'বিরক্ত করবেন না\' মোড চালু আছে"</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"\'বিরক্ত করবে না\' মোড চালু আছে"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"ফোন মিউট করা আছে"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"ব্যতিক্রম সহ"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"ব্যাটারি সেভার চালু আছে"</string>
@@ -4124,7 +4126,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ফোনটি তুলে ধরুন।"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ট্যাবলেটটি তুলে ধরুন।"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ডিভাইসটি তুলে ধরুন।"</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"ফোন যাচাই করতে ট্যাপ করুন"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"ফোন চেক করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"ট্যাবলেট যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"ডিভাইস যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ট্যাপ করুন।"</string>
@@ -4260,18 +4262,20 @@
     <string name="storage_manager_indicator" msgid="4255140732848476875">"স্টোরেজ ম্যানেজার: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="6404056007102580777">"বন্ধ আছে"</string>
     <string name="storage_manager_indicator_on" msgid="5295306384982062320">"চালু আছে"</string>
-    <string name="install_type_instant" msgid="6248487669862821874">"ঝটপট অ্যাপ"</string>
+    <string name="install_type_instant" msgid="6248487669862821874">"ইনস্ট্যান্ট অ্যাপ"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"স্টোরেজ ম্যানেজার বন্ধ করবেন?"</string>
     <string name="storage_movies_tv" msgid="7282484273991655296">"সিনেমা ও টিভি অ্যাপ"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
-    <string name="zen_suggestion_title" msgid="2134699720214231950">"\'বিরক্ত করবেন না\' মোডটি আপডেট করুন"</string>
+    <string name="zen_suggestion_title" msgid="2134699720214231950">"\'বিরক্ত করবে না\' মোডটি আপডেট করুন"</string>
     <string name="zen_suggestion_summary" msgid="4041062903237952737">"যাতে বিরক্ত হতে না হয় তার জন্য বিজ্ঞপ্তি পজ করুন"</string>
     <string name="disabled_low_ram_device" msgid="4958060232123741721">"এই বৈশিষ্ট্যটি এই ডিভাইসে উপলব্ধ নেই"</string>
     <string name="disabled_feature" msgid="3747549387387702365">"এই ফিচারটি উপলভ্য নেই"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"এই ফিচারটি ব্যবহার করলে ফোন ঠিকভাবে কাজ নাও করতে পারে"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GnssMeasurement সম্পূর্ণভাবে ট্র্যাক করুন"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ডিউটি-সাইক্লিং বাদে সমস্ত কন্সটেলেশন এবং ফ্রিকোয়েন্সি ট্র্যাক করুন"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ব্যবহারকারী পরিবর্তনের সময় ডিবাগ করুন"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ব্যবহারকারী পরিবর্তনের সময় বিস্তারিত তথ্য দেখুন"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটি চালু করার অনুমতি দিন"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"সব ব্যাকগ্রাউন্ড অ্যাক্টিভিটি চালু করার অনুমতি দিন"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"প্রত্যেকবার ক্র্যাশ ডায়ালগ দেখাতে দিন"</string>
diff --git a/tests/CarDeveloperOptions/res/values-bs-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-bs-nokeys/strings.xml
new file mode 100644
index 0000000..aae8d26
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-bs-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Upravljanje aplikacijama"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-bs/arrays.xml b/tests/CarDeveloperOptions/res/values-bs/arrays.xml
new file mode 100644
index 0000000..1890771
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-bs/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Evropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Azija"</item>
+    <item msgid="6683489385344409742">"Australija"</item>
+    <item msgid="5194868215515664953">"pacifički"</item>
+    <item msgid="7044520255415007865">"Sve"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekunda"</item>
+    <item msgid="772029947136115322">"30 sekundi"</item>
+    <item msgid="8743663928349474087">"1 minuta"</item>
+    <item msgid="1506508631223164814">"2 minute"</item>
+    <item msgid="8664703938127907662">"5 minuta"</item>
+    <item msgid="5827960506924849753">"10 minuta"</item>
+    <item msgid="6677424950124253938">"30 minuta"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikada"</item>
+    <item msgid="2517785806387977252">"15 sekundi"</item>
+    <item msgid="6347954399441173672">"30 sekundi"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minuta"</item>
+    <item msgid="8012672183888404961">"10 minuta"</item>
+    <item msgid="8271452751594598661">"30 minuta"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Odmah"</item>
+    <item msgid="2038544972632026612">"5 sekundi"</item>
+    <item msgid="5558060663472279597">"15 sekundi"</item>
+    <item msgid="45341168505452037">"30 sekundi"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minuta"</item>
+    <item msgid="811192536981678974">"10 minuta"</item>
+    <item msgid="7258394417241706272">"30 minuta"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Malen"</item>
+    <item msgid="591935967183159581">"Zadano"</item>
+    <item msgid="1714184661981538355">"Velik"</item>
+    <item msgid="6195563047686707484">"Najveći"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skeniranje…"</item>
+    <item msgid="5597394826455877834">"Povezivanje…"</item>
+    <item msgid="5848277343965362748">"Autentifikacija..."</item>
+    <item msgid="3391238031431440676">"Dobivanje IP adrese…"</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Suspendirano"</item>
+    <item msgid="1228072488815999109">"Prekidanje veze…"</item>
+    <item msgid="7253087004422991731">"Isključena"</item>
+    <item msgid="4169850917304751227">"Neuspješno"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Privremeno izbjegavaj veze lošeg kvaliteta"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skeniranje..."</item>
+    <item msgid="8058143476674427024">"Povezivanje na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Autentifikacija s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Dohvaćanje IP adrese s mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Povezano na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspendirano"</item>
+    <item msgid="4133290864821295785">"Prekidanje veze s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Isključena"</item>
+    <item msgid="2847316776634969068">"Neuspješno"</item>
+    <item msgid="4390990424746035383">"Blokirano"</item>
+    <item msgid="3618248791367063949">"Privremeno izbjegavaj veze lošeg kvaliteta"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Pritisnuti gumb"</item>
+    <item msgid="7401896200768713930">"PIN ravnopravnog uređaja"</item>
+    <item msgid="4526848028011846710">"PIN ovog uređaja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Povezano"</item>
+    <item msgid="983792611851499732">"Pozvan"</item>
+    <item msgid="5438273405428201793">"Neuspješno"</item>
+    <item msgid="4646663015449312554">"Dostupno"</item>
+    <item msgid="3230556734162006146">"Izvan opsega"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minute"</item>
+    <item msgid="2759776603549270587">"5 minuta"</item>
+    <item msgid="167772676068860015">"1 sat"</item>
+    <item msgid="5985477119043628504">"Ne ističe nikada"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Korištenje zadanih postavki sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slaba"</item>
+    <item msgid="7882129634982603782">"Loša"</item>
+    <item msgid="6457357501905996224">"Zadovoljavajuća"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Izvrsna"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Posljednjih 30 dana"</item>
+    <item msgid="3211287705232736964">"Podesi ciklus korištenja…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Vrijeme korištenja"</item>
+    <item msgid="2784401352592276015">"Posljednji put korišteno"</item>
+    <item msgid="249854287216326349">"Ime aplikacije"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ništa"</item>
+    <item msgid="8655686691660180616">"MSCHAPv2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ništa"</item>
+    <item msgid="212906109313512425">"MSCHAPv2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ništa"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPv2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statično"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ništa"</item>
+    <item msgid="1464741437353223198">"Ručno"</item>
+    <item msgid="5793600062487886090">"Automatska konfiguracija proksija"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ništa"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ili CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nije navedeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nema"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interna pohrana uređaja"</item>
+    <item msgid="3186681694079967527">"Izmjenjiva SD kartica"</item>
+    <item msgid="6902033473986647035">"Neka sistem odluči"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokacija"</item>
+    <item msgid="6842381562497597649">"Lično"</item>
+    <item msgid="3966700236695683444">"Slanje poruka"</item>
+    <item msgid="8563996233342430477">"Mediji"</item>
+    <item msgid="5323851085993963783">"Uređaj"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"približna lokacija"</item>
+    <item msgid="1830619568689922920">"tačna lokacija"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibracija"</item>
+    <item msgid="8632513128515114092">"čitaj kontakte"</item>
+    <item msgid="3741042113569620272">"prromijeni kontakte"</item>
+    <item msgid="4204420969709009931">"čitaj zapisnik poziva"</item>
+    <item msgid="2260380357119423209">"promijeni zapisnik poziva"</item>
+    <item msgid="6550710385014530934">"čitaj kalendar"</item>
+    <item msgid="3575906174264853951">"promijeni kalendar"</item>
+    <item msgid="4319843242568057174">"skeniranje wi-fi mreža"</item>
+    <item msgid="2981791890467303819">"obavještenje"</item>
+    <item msgid="6617825156152476692">"traženje mobitela"</item>
+    <item msgid="8865260890611559753">"pozovi telefon"</item>
+    <item msgid="3254999273961542982">"pročitaj SMS"</item>
+    <item msgid="7711446453028825171">"piši SMS"</item>
+    <item msgid="6123238544099198034">"primi SMS"</item>
+    <item msgid="838342167431596036">"primi hitni SMS"</item>
+    <item msgid="8554432731560956686">"primi MMS"</item>
+    <item msgid="7464863464299515059">"primi WAP push poruku"</item>
+    <item msgid="310463075729606765">"pošalji SMS"</item>
+    <item msgid="7338021933527689514">"pročitaj ICC SMS"</item>
+    <item msgid="6130369335466613036">"piši ICC SMS"</item>
+    <item msgid="6536865581421670942">"izmijeni postavke"</item>
+    <item msgid="4547203129183558973">"crtaj preko"</item>
+    <item msgid="9080347512916542840">"pristupi obavještenjima"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"snimi zvuk"</item>
+    <item msgid="9182794235292595296">"reproduciraj zvuk"</item>
+    <item msgid="8760743229597702019">"čitaj međumemoriju"</item>
+    <item msgid="2266923698240538544">"mijenjaj međumemoriju"</item>
+    <item msgid="1801619438618539275">"dugmad za upravljanje medijima"</item>
+    <item msgid="31588119965784465">"aplikacija sa odobrenjem za reproduciranje zvuka"</item>
+    <item msgid="7565226799008076833">"centar za upravljanje zvukom"</item>
+    <item msgid="5420704980305018295">"jačina glasa"</item>
+    <item msgid="5797363115508970204">"jačina zvuka zvona"</item>
+    <item msgid="8233154098550715999">"jačina zvuka medija"</item>
+    <item msgid="5196715605078153950">"jačina zvuka alarma"</item>
+    <item msgid="394030698764284577">"jačina zvuka za obavještenja"</item>
+    <item msgid="8952898972491680178">"jačina zvuka za Bluetooth vezu"</item>
+    <item msgid="8506227454543690851">"drži aktivnim"</item>
+    <item msgid="1108160036049727420">"prati lokaciju"</item>
+    <item msgid="1496205959751719491">"prati lokaciju sa velikom potrošnjom"</item>
+    <item msgid="3776296279910987380">"preuzmi statistiku korištenja"</item>
+    <item msgid="8827100324471975602">"isključi/uključi mikrofon"</item>
+    <item msgid="6880736730520126864">"prikaži toast poruku"</item>
+    <item msgid="4933375960222609935">"projiciranje medija"</item>
+    <item msgid="8357907018938895462">"aktiviraj VPN"</item>
+    <item msgid="8143812849911310973">"ispisana pozadinska slika"</item>
+    <item msgid="6266277260961066535">"asistent za podešavanje strukture"</item>
+    <item msgid="7715498149883482300">"asistent za snimak ekrana"</item>
+    <item msgid="4046679376726313293">"čitaj podatke o stanju telefona"</item>
+    <item msgid="6329507266039719587">"dodaj govornu poštu"</item>
+    <item msgid="7692440726415391408">"koristi SIP"</item>
+    <item msgid="8572453398128326267">"procesiraj odlazni poziv"</item>
+    <item msgid="7775674394089376306">"otisak prsta"</item>
+    <item msgid="3182815133441738779">"tjelesni senzori"</item>
+    <item msgid="2793100005496829513">"čita podatke info servisā"</item>
+    <item msgid="2633626056029384366">"lažna lokacija"</item>
+    <item msgid="8356842191824684631">"čitaj podatke iz pohrane"</item>
+    <item msgid="5671906070163291500">"zapisuj podatke u pohranu"</item>
+    <item msgid="2791955098549340418">"uključi ekran"</item>
+    <item msgid="5599435119609178367">"pregledaj račune"</item>
+    <item msgid="1165623660533024666">"radi u pozadini"</item>
+    <item msgid="6423861043647911030">"jačina zvuka za pristupačnost"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kratko"</item>
+    <item msgid="4816511817309094890">"Srednja"</item>
+    <item msgid="8305084671259331134">"Dugo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Zadano"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif kondenzovani"</item>
+    <item msgid="6529379119163117545">"Sans-serif fiksnog razmaka"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif fiksnog razmaka"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Kurziv"</item>
+    <item msgid="6896773537705206194">"Mala početna slova"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Vrlo mali"</item>
+    <item msgid="5091603983404027034">"Mali"</item>
+    <item msgid="176844712416932112">"Normalni"</item>
+    <item msgid="2784236342175159295">"Velik"</item>
+    <item msgid="218913203203160606">"Vrlo veliki"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Zadano"</item>
+    <item msgid="6488643537808152001">"Ništa"</item>
+    <item msgid="552332815156010137">"Sa obrisom"</item>
+    <item msgid="7187891159463789272">"Osjenčena"</item>
+    <item msgid="8019330250538856521">"Povišeno"</item>
+    <item msgid="8987385315647049787">"Udubljena"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Koristi zadane postavke aplikacija"</item>
+    <item msgid="8611890312638868524">"Bijelo na crnom"</item>
+    <item msgid="5891360837786277638">"Crno na bijelom"</item>
+    <item msgid="2798457065945456853">"Žuto na crnom"</item>
+    <item msgid="5799049811524553967">"Žuto na plavom"</item>
+    <item msgid="3673930830658169860">"Prilagođeno"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN sa pre-shared lozinkama"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN sa certifikatima"</item>
+    <item msgid="312397853907741968">"IPSec VPN sa pre-shared lozinkama i Xauth autentifikacijom"</item>
+    <item msgid="3319427315593649917">"IPSec VPN sa certifikatima i Xauth autentifikacijom"</item>
+    <item msgid="8258927774145391041">"IPSec VPN sa certifikatima i hibridnom autentifikacijom"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ništa"</item>
+    <item msgid="1157046369795346308">"Ručno"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Isključena"</item>
+    <item msgid="8754480102834556765">"Pokretanje…"</item>
+    <item msgid="3351334355574270250">"Povezivanje…"</item>
+    <item msgid="8303882153995748352">"Povezano"</item>
+    <item msgid="9135049670787351881">"Privremeni prekid"</item>
+    <item msgid="2124868417182583926">"Neuspješno"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Pitaj"</item>
+    <item msgid="7718817231348607934">"Nikada ne dozvoli"</item>
+    <item msgid="8184570120217958741">"Uvijek dozvoli"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Uporna"</item>
+    <item msgid="167418068739176448">"Maksimalna aktivnost"</item>
+    <item msgid="4760813290195199773">"Važno (u prvom planu)"</item>
+    <item msgid="2328684826817647595">"Važno (u pozadini)"</item>
+    <item msgid="7746406490652867365">"Izrada sigurnosnih kopija"</item>
+    <item msgid="5597404364389196754">"Velika težina"</item>
+    <item msgid="1290888779300174556">"Usluga (pokrenuta)"</item>
+    <item msgid="7241098542073939046">"Usluga (ponovno pokretanje)"</item>
+    <item msgid="6610439017684111046">"Prijemnik"</item>
+    <item msgid="7367606086319921117">"Početna"</item>
+    <item msgid="3344660712396741826">"Posljednja aktivnost"</item>
+    <item msgid="5006559348883303865">"Keširana (aktivnost)"</item>
+    <item msgid="8633480732468137525">"Keširana (aktivnost klijenta)"</item>
+    <item msgid="6248998242443333892">"Keširano (prazno)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"Plava"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Ljubičasta"</item>
+    <item msgid="5932337981182999919">"Ružičasta"</item>
+    <item msgid="5642914536624000094">"Crvena"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Starije od 30 dana"</item>
+    <item msgid="8699273238891265610">"Starije od 60 dana"</item>
+    <item msgid="8346279419423837266">"Starije od 90 dana"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detektiraj automatski"</item>
+    <item msgid="773943026484148895">"Tretiraj kao vezu s naplatom"</item>
+    <item msgid="1008268820118852416">"Tretiraj kao vezu bez naplate"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Koristi nasumičnu MAC adresu (zadano)"</item>
+    <item msgid="214234417308375326">"Koristi MAC adresu uređaja"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ne"</item>
+    <item msgid="1930581185557754880">"Da"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tamno"</item>
+    <item msgid="5079453644557603349">"Svijetlo"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Isključeno"</item>
+    <item msgid="4072198137051566919">"Otklanjanje grešaka"</item>
+    <item msgid="2473005316958868509">"Opširno"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Samo početna stranica"</item>
+    <item msgid="1161026694891024702">"Automatski"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Preferiraj GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Samo GSM"</item>
+    <item msgid="8579197487913425819">"Samo WCDMA"</item>
+    <item msgid="8465243227505412498">"Automatski GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automatski CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"Samo EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalno"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Samo TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalno"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-bs/strings.xml b/tests/CarDeveloperOptions/res/values-bs/strings.xml
index c4bb3ae..ab18137 100644
--- a/tests/CarDeveloperOptions/res/values-bs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/strings.xml
@@ -34,7 +34,7 @@
     <string name="header_category_system" msgid="4045988717359334410">"Sistem"</string>
     <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"Omogućite vezu za prijenos podataka"</string>
     <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"Onemogućite podatkovnu mrežu"</string>
-    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE"</string>
+    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE omogućen"</string>
     <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Video poziv obezbijeđen"</string>
     <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"WiFi poziv obezbijeđen"</string>
     <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/Omogućeno prisustvo"</string>
@@ -209,7 +209,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"Morate popuniti adresno polje"</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"Adresno polje mora biti prazno ako je server polje prazno."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Uneseni port nije važeći."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Preglednik koristi HTTP proksi, ali je moguće da ga ne koriste druge aplikacije."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Preglednik koristi HTTP proksi, ali ga druge aplikacije ne mogu koristiti."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"URL za PAC: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL propusnost (kbps):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL propusnost (kbps):"</string>
@@ -317,7 +317,7 @@
     <string name="roaming_reenable_message" msgid="8388505868655113258">"Ostali ste bez veze za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"Uključi"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"Može doći do značajnih troškova."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"Ako dozvolite prijenos podataka u romingu, može doći do značajnih troškova rominga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"Ako dozvolite prijenos podataka u romingu, može doći do značajnih troškova rominga!\n\nOva postavka utiče na sve korisnike na ovom tabletu."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6999819541078827556">"Kada dozvolite podatkovni roming mogu nastati značajni troškovi !\n\nOva postavka se odnosi na sve korisnike telefona."</string>
     <string name="roaming_reenable_title" msgid="6985082191178297921">"Dozvoliti roming podataka?"</string>
     <string name="networks" msgid="3073876464102136771">"Izbor operatera"</string>
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštitite uređaj zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon zaključavanjem ekrana tako da ga niko ne može koristiti ako ga izgubite ili vam ga ukradu. Zaključavanje ekrana vam je potrebno i za postavljanje autentifikacije licem. Dodirnite Otkaži, a zatim postavite PIN ili odaberite drugu opciju zaključavanja ekrana."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti postavljanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti postavljanje uzorka?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Postavi zaključavanje ekrana"</string>
@@ -732,7 +731,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aktivnih aplikacija</item>
     </plurals>
     <string name="manage_trust_agents" msgid="8129970926213142261">"Pouzdani agenti"</string>
-    <string name="disabled_because_no_backup_security" msgid="8127039979909203528">"Da biste koristili, prvo postavite zaključavanje ekrana"</string>
+    <string name="disabled_because_no_backup_security" msgid="8127039979909203528">"Da ovo koristite, prvo postavite zaključavanje ekrana"</string>
     <string name="manage_trust_agents_summary" msgid="2023116850759962248">"Nema"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5550538038916606097">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aktivni pouzdani agent</item>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WiFi"</item>
+    <item msgid="4421333712484542489">"Mobilna mreža"</item>
+    <item msgid="6007360612667098926">"Samo WiFi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2057,7 +2059,7 @@
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"Zvuk i tekst na ekranu"</string>
     <string name="display_category_title" msgid="545168481672250195">"Prikaz"</string>
     <string name="interaction_control_category_title" msgid="8775039211811947683">"Kontrole za interakciju"</string>
-    <string name="user_installed_services_category_title" msgid="4288689493753221319">"Preuzeti servisi"</string>
+    <string name="user_installed_services_category_title" msgid="4288689493753221319">"Preuzete usluge"</string>
     <string name="experimental_category_title" msgid="3797000069740110717">"Eksperimentalno"</string>
     <string name="feature_flags_dashboard_title" msgid="3153034144122754381">"Oznake funkcija"</string>
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
@@ -2095,7 +2097,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 minuta"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 minute"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"Vrijeme za čitanje"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Rok za poduzimanje radnje"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Vrijeme za poduzimanje radnje"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Odaberite koliko dugo želite da se poruke koje trebate pročitati prikazuju. One će biti vidljive samo privremeno.\n\nOvu postavku ne podržavaju sve aplikacije."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Odaberite koliko dugo želite da se prikazuju poruke koje od vas zahtijevaju da poduzmete radnju, a koje će biti vidljive samo privremeno.\n\nOvu postavku ne podržavaju sve aplikacije."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Odgoda za dodirivanje i držanje"</string>
@@ -2180,7 +2182,7 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Prozirnost teksta"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Boja rubova"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Vrsta rubova"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Skup fontova"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Porodica fontova"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Stilovi će izgledati ovako"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"Zadano"</string>
@@ -2613,7 +2615,7 @@
     <string name="adding_profile_owner_warning" msgid="1284541194547382194">"Ako nastavite, vašim korisnikom će upravljati vaš administrator koji će, osim vaših ličnih podataka, moći pohranjivati i povezane podatke.\n\nVaš administrator može pratiti i upravljati postavkama, pristupom, aplikacijama i podacima koji su povezani s ovim korisnikom, uključujući aktivnost na mreži i informacije o lokaciji vašeg uređaja."</string>
     <string name="admin_disabled_other_options" msgid="8097063307730025707">"Administrator je onemogućio ostale opcije"</string>
     <string name="admin_more_details" msgid="1719819589822345585">"Više detalja"</string>
-    <string name="notification_log_title" msgid="4200467765474474753">"Dnevnik obavještenja"</string>
+    <string name="notification_log_title" msgid="4200467765474474753">"Zapisnik obavještenja"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="4678065664534722153">"Melodija zvona telefona i vibracija"</string>
     <string name="wifi_setup_detail" msgid="3551227109377008779">"Detalji o mreži"</string>
     <string name="accessibility_sync_enabled" msgid="4620153705473448002">"Sinhronizacija omogućena"</string>
@@ -2989,7 +2991,7 @@
     <string name="enhanced_4g_lte_mode_title" msgid="1624079276378568594">"VoLTE"</string>
     <string name="enhanced_4g_lte_mode_title_advanced_calling" msgid="5155507161065290507">"Napredno pozivanje"</string>
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="1262729135500839141">"Pozivanje putem 4G mreže"</string>
-    <string name="enhanced_4g_lte_mode_summary" msgid="4515503153340557170">"Koristi LTE usluge za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="4515503153340557170">"Koristite LTE usluge za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
     <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="1006226172299077404">"Koristi usluge 4G mreže za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
     <string name="preferred_network_type_title" msgid="1980819233332592332">"Tip preferirane mreže"</string>
     <string name="preferred_network_type_summary" msgid="8828375904939960006">"LTE (preporučeno)"</string>
@@ -3426,7 +3428,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"sus slika u"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Dozvoli način rada Slika u slici"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Dozvoli ovoj aplikaciji kreiranje prozora u načinu rada slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Dozvolite aplikaciji da kreira prozor u načinu rada slika u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"Pristup načinu rada Ne ometaj"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"Dozvoli način rada Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
@@ -3638,7 +3640,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"Otvori bez pitanja"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Podržani linkovi"</string>
     <string name="app_launch_other_defaults_title" msgid="2986685757258232543">"Ostale zadane vrijednosti"</string>
-    <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="SIZE">%1$s</xliff:g> se koristi u memoriji <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: iskorišteno <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="4434212376539293892">"Unutrašnja pohrana"</string>
     <string name="storage_type_external" msgid="8827468573685648108">"Vanjska pohrana"</string>
     <string name="data_summary_format" msgid="5022135392347814271">"Iskorišt.: <xliff:g id="SIZE">%1$s</xliff:g> od <xliff:g id="DATE">%2$s</xliff:g>"</string>
@@ -3730,8 +3732,8 @@
     <string name="usage_access" msgid="2023443456361489516">"Pristup korištenju"</string>
     <string name="permit_usage_access" msgid="3321727608629752758">"Dopusti pristup korištenju"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Postavke upotrebe aplikacija"</string>
-    <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Vrijeme upotrebe"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Pristup korištenju omogućava praćenje drugih aplikacija koje koristite i učestalosti korištenja, kao i praćenje vašeg operatera, postavke jezika i drugo."</string>
+    <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Vrijeme korištenja uređaja"</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Pristup korištenju omogućava aplikaciji da prati koje druge aplikacije koristite i koliko često, kao i da vidi vašeg mobilnog operatera, postavke jezika i druge detalje."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Memorija"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Detalji o memoriji"</string>
     <string name="always_running" msgid="5320183445080208766">"Uvijek je pokrenuta (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3763,7 +3765,7 @@
     <string name="high_power_system" msgid="739584574711292753">"Optimizacija baterije je nedostupna"</string>
     <string name="high_power_desc" msgid="333756885680362741">"Ne primjenjuje se optimizacija baterije. Tako se baterija može brže isprazniti."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"Dopustiti aplikaciji da uvijek radi u pozadini?"</string>
-    <string name="high_power_prompt_body" msgid="8067395096053552289">"Ako aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dopustite da uvijek radi u pozadini, može se skratiti vijek trajanja baterije. \n\nTo možete promijeniti kasnije ako odete u Postavke &gt; Aplikacije i obavještenja."</string>
+    <string name="high_power_prompt_body" msgid="8067395096053552289">"Ako aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dozvolite da uvijek radi u pozadini, može se skratiti vijek trajanja baterije. \n\nTo možete promijeniti kasnije ako odete u Postavke &gt; Aplikacije i obavještenja."</string>
     <string name="battery_summary" msgid="4345690800899981339">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> iskorištenosti od posljednje potpune napunjenosti"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"Upravljanje napajanjem"</string>
     <string name="no_battery_summary" msgid="4105932628367471314">"Nema potrošnje baterije od prošlog potpunog punjenja"</string>
@@ -4348,6 +4350,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ona će usporiti ovaj telefon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Prisilno omogući potpuno GNSS mjerenje"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Praćenje svih konstelacija i frekvencija GNSS-a bez ciklusa rada"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Otklanjanje grešaka prilikom prebacivanja između korisnika"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Prikaz detaljnih informacija prilikom prebacivanja između korisnika"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Dozvoli pokretanja aktivnosti u pozadini"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Dozvoljava sva pokretanja aktivnosti u pozadini"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Uvijek prikaži dijaloški okvir za pad aplikacije"</string>
@@ -4492,14 +4496,14 @@
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"Nije moguće izbrisati SIM"</string>
     <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Nije moguće izbrisati ovaj SIM zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
     <string name="preferred_network_mode_title" msgid="8324526359482124770">"Vrsta preferirane mreže"</string>
-    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Promijeni način rada mreže"</string>
+    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="5448698073828567428">"Vrsta preferirane mreže"</string>
     <string name="carrier_settings_euicc" msgid="7723199738771996732">"Operater"</string>
     <string name="carrier_settings_version" msgid="2657511289029828425">"Verzija postavki"</string>
     <string name="call_category" msgid="3418535202893644015">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="8011841542502156112">"Operater video pozivanja"</string>
     <string name="cdma_system_select_title" msgid="5620679296177526467">"Odabir sistema"</string>
-    <string name="cdma_system_select_summary" msgid="6749131988334321244">"Promijeni način rada CDMA rominga"</string>
+    <string name="cdma_system_select_summary" msgid="6749131988334321244">"Promijenite način rada CDMA rominga"</string>
     <string name="cdma_system_select_dialogtitle" msgid="7489000866289285390">"Odabir sistema"</string>
     <string name="network_operator_category" msgid="9136988058829550510">"Mreža"</string>
     <string name="network_select_title" msgid="9176906726897071251">"Mreža"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ca-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ca-nokeys/strings.xml
new file mode 100644
index 0000000..f7d7ddb
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ca-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gestiona les aplicacions"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ca/arrays.xml b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
new file mode 100644
index 0000000..593c847
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ca/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amèrica"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Àfrica"</item>
+    <item msgid="2765816300353408280">"Àsia"</item>
+    <item msgid="6683489385344409742">"Austràlia"</item>
+    <item msgid="5194868215515664953">"Pacífic"</item>
+    <item msgid="7044520255415007865">"Tots"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segons"</item>
+    <item msgid="772029947136115322">"30 segons"</item>
+    <item msgid="8743663928349474087">"1 minut"</item>
+    <item msgid="1506508631223164814">"2 minuts"</item>
+    <item msgid="8664703938127907662">"5 minuts"</item>
+    <item msgid="5827960506924849753">"10 minuts"</item>
+    <item msgid="6677424950124253938">"30 minuts"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Mai"</item>
+    <item msgid="2517785806387977252">"15 segons"</item>
+    <item msgid="6347954399441173672">"30 segons"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minuts"</item>
+    <item msgid="2788593551142462622">"5 minuts"</item>
+    <item msgid="8012672183888404961">"10 minuts"</item>
+    <item msgid="8271452751594598661">"30 minuts"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediatament"</item>
+    <item msgid="2038544972632026612">"5 segons"</item>
+    <item msgid="5558060663472279597">"15 segons"</item>
+    <item msgid="45341168505452037">"30 segons"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minuts"</item>
+    <item msgid="4376575879222393045">"5 minuts"</item>
+    <item msgid="811192536981678974">"10 minuts"</item>
+    <item msgid="7258394417241706272">"30 minuts"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Petita"</item>
+    <item msgid="591935967183159581">"Predeterminat"</item>
+    <item msgid="1714184661981538355">"Gran"</item>
+    <item msgid="6195563047686707484">"Més grans possible"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"S\'està cercant..."</item>
+    <item msgid="5597394826455877834">"S\'està connectant..."</item>
+    <item msgid="5848277343965362748">"S\'està autenticant..."</item>
+    <item msgid="3391238031431440676">"S\'està obtenint l\'adreça IP…"</item>
+    <item msgid="5257597310494000224">"Connectat"</item>
+    <item msgid="8472497592913050396">"Suspesa"</item>
+    <item msgid="1228072488815999109">"S\'està desconnectant..."</item>
+    <item msgid="7253087004422991731">"Desconnectat"</item>
+    <item msgid="4169850917304751227">"Incorrecte"</item>
+    <item msgid="6266658166690831131">"Bloquejat"</item>
+    <item msgid="4517230805854909775">"S\'està evitant temporalment una connexió feble"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"S\'està explorant..."</item>
+    <item msgid="8058143476674427024">"S\'està connectant a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"S\'està autenticant amb <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"S\'està obtenint l\'adreça IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Connectat a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspesa"</item>
+    <item msgid="4133290864821295785">"S\'està desconnectant de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Desconnectat"</item>
+    <item msgid="2847316776634969068">"Incorrecte"</item>
+    <item msgid="4390990424746035383">"Bloquejat"</item>
+    <item msgid="3618248791367063949">"S\'està evitant temporalment una connexió feble"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Botó per prémer"</item>
+    <item msgid="7401896200768713930">"PIN de l\'altre dispositiu"</item>
+    <item msgid="4526848028011846710">"PIN des del dispositiu"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connectat"</item>
+    <item msgid="983792611851499732">"Convidat"</item>
+    <item msgid="5438273405428201793">"Incorrecte"</item>
+    <item msgid="4646663015449312554">"Disponible"</item>
+    <item msgid="3230556734162006146">"Fora de l\'abast"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuts"</item>
+    <item msgid="2759776603549270587">"5 minuts"</item>
+    <item msgid="167772676068860015">"1 hora"</item>
+    <item msgid="5985477119043628504">"Sempre visible"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utilitza la configuració predeterminada del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dolenta"</item>
+    <item msgid="7882129634982603782">"Baixa"</item>
+    <item msgid="6457357501905996224">"Suficient"</item>
+    <item msgid="405271628162918841">"Bona"</item>
+    <item msgid="999948812884919584">"Excel·lent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 darrers dies"</item>
+    <item msgid="3211287705232736964">"Defineix el cicle d\'ús..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Temps d\'ús"</item>
+    <item msgid="2784401352592276015">"Darrer ús"</item>
+    <item msgid="249854287216326349">"Nom de l\'aplicació"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Cap"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Cap"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Cap"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Estàtic"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Cap"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Autoconfig. serv. inter."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Cap"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP o CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"No especificat"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Cap"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Emmagatzematge intern del dispositiu"</item>
+    <item msgid="3186681694079967527">"Targeta SD extraïble"</item>
+    <item msgid="6902033473986647035">"Deixa que ho decideixi el sistema"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Ubicació"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Missatges"</item>
+    <item msgid="8563996233342430477">"Multimèdia"</item>
+    <item msgid="5323851085993963783">"Dispositiu"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ubicació aproximada"</item>
+    <item msgid="1830619568689922920">"ubicació precisa"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibració"</item>
+    <item msgid="8632513128515114092">"lectura de contactes"</item>
+    <item msgid="3741042113569620272">"modifica els contactes"</item>
+    <item msgid="4204420969709009931">"llegeix el registre de trucades"</item>
+    <item msgid="2260380357119423209">"modifica el registre de trucades"</item>
+    <item msgid="6550710385014530934">"lectura del calendari"</item>
+    <item msgid="3575906174264853951">"modifica el calendari"</item>
+    <item msgid="4319843242568057174">"exploració de Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notificació"</item>
+    <item msgid="6617825156152476692">"exploració de cel·la"</item>
+    <item msgid="8865260890611559753">"trucada"</item>
+    <item msgid="3254999273961542982">"llegeix SMS"</item>
+    <item msgid="7711446453028825171">"escriu SMS"</item>
+    <item msgid="6123238544099198034">"rep SMS"</item>
+    <item msgid="838342167431596036">"rep SMS d\'emergència"</item>
+    <item msgid="8554432731560956686">"rep MMS"</item>
+    <item msgid="7464863464299515059">"rep insercions WAP"</item>
+    <item msgid="310463075729606765">"envia SMS"</item>
+    <item msgid="7338021933527689514">"llegeix SMS ICC"</item>
+    <item msgid="6130369335466613036">"escriu SMS ICC"</item>
+    <item msgid="6536865581421670942">"modifica la configuració"</item>
+    <item msgid="4547203129183558973">"dibuixa a sobre"</item>
+    <item msgid="9080347512916542840">"accedeix a les notificacions"</item>
+    <item msgid="5332718516635907742">"càmera"</item>
+    <item msgid="6098422447246167852">"grava l\'àudio"</item>
+    <item msgid="9182794235292595296">"reprodueix l\'àudio"</item>
+    <item msgid="8760743229597702019">"llegeix el porta-retalls"</item>
+    <item msgid="2266923698240538544">"modifica el porta-retalls"</item>
+    <item msgid="1801619438618539275">"botons multimèdia"</item>
+    <item msgid="31588119965784465">"enfocament de l\'àudio"</item>
+    <item msgid="7565226799008076833">"volum general"</item>
+    <item msgid="5420704980305018295">"volum de la veu"</item>
+    <item msgid="5797363115508970204">"volum del to"</item>
+    <item msgid="8233154098550715999">"volum de multimèdia"</item>
+    <item msgid="5196715605078153950">"volum de l\'alarma"</item>
+    <item msgid="394030698764284577">"volum de notificació"</item>
+    <item msgid="8952898972491680178">"volum del Bluetooth"</item>
+    <item msgid="8506227454543690851">"mantén actiu"</item>
+    <item msgid="1108160036049727420">"supervisa la ubicació"</item>
+    <item msgid="1496205959751719491">"fes un seguiment de la precisió de la ubicació"</item>
+    <item msgid="3776296279910987380">"obtenir estadístiques d\'ús"</item>
+    <item msgid="8827100324471975602">"silencia / deixa de silenciar el micròfon"</item>
+    <item msgid="6880736730520126864">"mostrar l\'avís"</item>
+    <item msgid="4933375960222609935">"projectar fitxers multimèdia"</item>
+    <item msgid="8357907018938895462">"activar la VPN"</item>
+    <item msgid="8143812849911310973">"fons de pantalla d\'escriptura"</item>
+    <item msgid="6266277260961066535">"estructura d\'assistència"</item>
+    <item msgid="7715498149883482300">"captura de pantalla d\'assistència"</item>
+    <item msgid="4046679376726313293">"consultar l\'estat del telèfon"</item>
+    <item msgid="6329507266039719587">"afegir missatges de veu"</item>
+    <item msgid="7692440726415391408">"utilitzar el protocol SIP"</item>
+    <item msgid="8572453398128326267">"processar les trucades sortints"</item>
+    <item msgid="7775674394089376306">"empremta digital"</item>
+    <item msgid="3182815133441738779">"sensors corporals"</item>
+    <item msgid="2793100005496829513">"consultar les difusions mòbils"</item>
+    <item msgid="2633626056029384366">"ubicació simulada"</item>
+    <item msgid="8356842191824684631">"consultar l\'emmagatzematge"</item>
+    <item msgid="5671906070163291500">"fer canvis a l\'emmagatzematge"</item>
+    <item msgid="2791955098549340418">"activar la pantalla"</item>
+    <item msgid="5599435119609178367">"obtenir comptes"</item>
+    <item msgid="1165623660533024666">"executar en segon pla"</item>
+    <item msgid="6423861043647911030">"volum d\'accessibilitat"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Breu"</item>
+    <item msgid="4816511817309094890">"Mitjana"</item>
+    <item msgid="8305084671259331134">"Llarg"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predeterminat"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensada"</item>
+    <item msgid="6529379119163117545">"Sans serif monoespaiada"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monoespaiada"</item>
+    <item msgid="4448481989108928248">"Informal"</item>
+    <item msgid="4627069151979553527">"Cursiva"</item>
+    <item msgid="6896773537705206194">"Versaletes"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Molt petit"</item>
+    <item msgid="5091603983404027034">"Petita"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Gran"</item>
+    <item msgid="218913203203160606">"Molt gran"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predeterminat"</item>
+    <item msgid="6488643537808152001">"Cap"</item>
+    <item msgid="552332815156010137">"Contorn"</item>
+    <item msgid="7187891159463789272">"Ombra paral·lela"</item>
+    <item msgid="8019330250538856521">"Elevat"</item>
+    <item msgid="8987385315647049787">"Enfonsat"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Valors predeterminats"</item>
+    <item msgid="8611890312638868524">"Blanc sobre negre"</item>
+    <item msgid="5891360837786277638">"Negre sobre fons blanc"</item>
+    <item msgid="2798457065945456853">"Groc sobre negre"</item>
+    <item msgid="5799049811524553967">"Groc sobre blau"</item>
+    <item msgid="3673930830658169860">"Personalitzat"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN de PPTP"</item>
+    <item msgid="1349760781118368659">"VPN L2TP/IPSec amb claus prèviament compartides"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec amb certificats"</item>
+    <item msgid="312397853907741968">"VPN IPSec amb claus prèviament compartides i autenticació Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec amb certificats i autenticació Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec amb certificats i autenticació híbrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Cap"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Desconnectat"</item>
+    <item msgid="8754480102834556765">"S\'està inicialitzant..."</item>
+    <item msgid="3351334355574270250">"S\'està connectant..."</item>
+    <item msgid="8303882153995748352">"Connectat"</item>
+    <item msgid="9135049670787351881">"Temps d\'espera esgotat"</item>
+    <item msgid="2124868417182583926">"Incorrecte"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Pregunta-ho"</item>
+    <item msgid="7718817231348607934">"No permetis mai"</item>
+    <item msgid="8184570120217958741">"Permet sempre"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistent"</item>
+    <item msgid="167418068739176448">"Activitat principal"</item>
+    <item msgid="4760813290195199773">"Important (primer pla)"</item>
+    <item msgid="2328684826817647595">"Important (fons)"</item>
+    <item msgid="7746406490652867365">"Còpia de seguretat"</item>
+    <item msgid="5597404364389196754">"Pesat"</item>
+    <item msgid="1290888779300174556">"Servei (en execució)"</item>
+    <item msgid="7241098542073939046">"Servei (reinici)"</item>
+    <item msgid="6610439017684111046">"Receptor"</item>
+    <item msgid="7367606086319921117">"Inici"</item>
+    <item msgid="3344660712396741826">"Darrera activitat"</item>
+    <item msgid="5006559348883303865">"A la memòria cau (activitat)"</item>
+    <item msgid="8633480732468137525">"A la memòria cau (client de l\'activitat)"</item>
+    <item msgid="6248998242443333892">"A la memòria cau (buit)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Verd blavós"</item>
+    <item msgid="3228505970082457852">"Blau"</item>
+    <item msgid="6590260735734795647">"Anyil"</item>
+    <item msgid="3521763377357218577">"Porpra"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Vermell"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Més de 30 dies d\'antiguitat"</item>
+    <item msgid="8699273238891265610">"Més de 60 dies d\'antiguitat"</item>
+    <item msgid="8346279419423837266">"Més de 90 dies d\'antiguitat"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detecta automàticament"</item>
+    <item msgid="773943026484148895">"Tracta com a xarxa d\'ús mesurat"</item>
+    <item msgid="1008268820118852416">"Tracta com a xarxa d\'ús no mesurat"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Utilitza adreça MAC aleatòria (predeterminat)"</item>
+    <item msgid="214234417308375326">"Utilitza adreça MAC del dispositiu"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Sí"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Fosc"</item>
+    <item msgid="5079453644557603349">"Clar"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desactivat"</item>
+    <item msgid="4072198137051566919">"Depura"</item>
+    <item msgid="2473005316958868509">"Detalla"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Només local"</item>
+    <item msgid="1161026694891024702">"Automàtic"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Mode GSM/WCDMA preferit"</item>
+    <item msgid="7581481130337402578">"Només GSM"</item>
+    <item msgid="8579197487913425819">"Només WCDMA"</item>
+    <item msgid="8465243227505412498">"Mode GSM/WCDMA automàtic"</item>
+    <item msgid="9107479914166352132">"Mode CDMA/EvDo automàtic"</item>
+    <item msgid="4219607161971472471">"Mode CDMA sense EvDo"</item>
+    <item msgid="7278975240951052041">"Només EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Només TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ca/strings.xml b/tests/CarDeveloperOptions/res/values-ca/strings.xml
index 3ee524b..257d6b2 100644
--- a/tests/CarDeveloperOptions/res/values-ca/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/strings.xml
@@ -349,13 +349,13 @@
     <string name="time_picker_title" msgid="1596400307061268660">"Hora"</string>
     <string name="lock_after_timeout" msgid="7755520959071097304">"Bloqueja automàticament"</string>
     <string name="lock_after_timeout_summary" msgid="3160517585613694740">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> després d\'entrar en repòs"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Immediatament després del repòs, menys quan <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> manté la pantalla desbloquejada"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> després d\'activar el repòs, excepte si <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> manté el dispositiu desbloquejat"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Immediatament després del repòs, excepte si està desbloquejat per <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> després d\'activar el repòs, excepte si està desbloquejat per <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Mostra informació del propietari a la pantalla de bloqueig"</string>
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Missatge a la pantalla de bloqueig"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Activa els widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Desactivada per l\'administrador"</string>
-    <string name="lockdown_settings_title" msgid="4534779922580115990">"Mostra l\'opció Bloqueig de seguretat"</string>
+    <string name="lockdown_settings_title" msgid="4534779922580115990">"Mostra l\'opció de bloqueig de seguretat"</string>
     <string name="lockdown_settings_summary" msgid="7270756909878256174">"Mostra l\'opció del botó d\'engegada que desactiva Smart Lock, el desbloqueig amb l\'empremta digital i les notificacions a la pantalla de bloqueig"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Desbloqueig ampliat per a agents de confiança"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Si s\'activa, els agents de confiança mantindran el dispositiu desbloquejat durant més temps, però ja no podran desbloquejar un dispositiu bloquejat."</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protegeix la tauleta amb una de les opcions de bloqueig de pantalla perquè ningú no pugui utilitzar-la si la perds o te la roben. També necessites una d\'aquestes opcions per configurar l\'autenticació facial. Toca Cancel·la i, a continuació, defineix un PIN o tria una altra opció de bloqueig de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protegeix el dispositiu amb una de les opcions de bloqueig de pantalla perquè ningú no pugui utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar l\'autenticació facial. Toca Cancel·la i, a continuació, defineix un PIN o tria una altra opció de bloqueig de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protegeix el telèfon amb una de les opcions de bloqueig de pantalla perquè ningú no pugui utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar l\'autenticació facial. Toca Cancel·la i, a continuació, defineix un PIN o tria una altra opció de bloqueig de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"No vols configurar el PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"No configurar la contrasenya?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"No vols configurar el patró?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configura el bloqueig de pantalla"</string>
@@ -504,7 +503,7 @@
     <string name="fingerprint_delete_title" msgid="3120894112324235536">"Suprimeix <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
     <string name="fingerprint_delete_message" msgid="5895802741486967970">"Vols suprimir aquesta empremta digital?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"No podràs fer servir les empremtes digitals per desbloquejar el telèfon, autoritzar compres ni iniciar la sessió en aplicacions"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"No podràs utilitzar les empremtes digitals per desbloquejar el teu perfil professional, autoritzar compres ni iniciar la sessió en aplicacions de la feina"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"No podràs utilitzar les empremtes digitals per desbloquejar el teu perfil de treball, autoritzar compres ni iniciar la sessió en aplicacions de treball"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"Sí, suprimeix"</string>
     <string name="crypt_keeper_settings_title" msgid="839783588093862748">"Encriptació"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"Encriptació de la tauleta"</string>
@@ -645,12 +644,12 @@
     <string name="lock_last_pattern_attempt_before_wipe_user" msgid="5194192938934564218">"Si tornes a introduir un patró incorrecte, se suprimirà l\'usuari"</string>
     <string name="lock_last_pin_attempt_before_wipe_user" msgid="7833852187363499906">"Si tornes a introduir un PIN incorrecte, se suprimirà l\'usuari"</string>
     <string name="lock_last_password_attempt_before_wipe_user" msgid="8979742220140001204">"Si tornes a introduir una contrasenya incorrecta, se suprimirà l\'usuari"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="3877613047631174576">"Si tornes a introduir un patró incorrecte, se suprimirà el perfil professional i les dades que contingui"</string>
-    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="8132438288175428168">"Si tornes a introduir un PIN incorrecte, se suprimirà el perfil professional i les dades que contingui"</string>
-    <string name="lock_last_password_attempt_before_wipe_profile" msgid="1535128774464384305">"Si tornes a introduir una contrasenya incorrecta, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="3877613047631174576">"Si tornes a introduir un patró incorrecte, se suprimirà el perfil de treball i les dades que contingui"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="8132438288175428168">"Si tornes a introduir un PIN incorrecte, se suprimirà el perfil de treball i les dades que contingui"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="1535128774464384305">"Si tornes a introduir una contrasenya incorrecta, se suprimirà el perfil de treball i les dades que contingui"</string>
     <string name="lock_failed_attempts_now_wiping_device" msgid="8662360098784762828">"Has superat el nombre d\'intents incorrectes permesos. Se suprimiran les dades del dispositiu."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="3793513796171561873">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà l\'usuari."</string>
-    <string name="lock_failed_attempts_now_wiping_profile" msgid="5347108525299038285">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà el perfil professional i les dades que contingui."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="5347108525299038285">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà el perfil de treball i les dades que contingui."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="3950582268749037318">"Ignora"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="694091983183310827">
       <item quantity="other">Ha de tenir com a mínim <xliff:g id="COUNT_1">%d</xliff:g> caràcters</item>
@@ -829,7 +828,7 @@
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="8068287225180474199">"Preparat per compartir contingut d\'aplicacions per NFC"</string>
     <string name="android_beam_off_summary" msgid="7365818039159364600">"Desactivat"</string>
-    <string name="nfc_disabled_summary" msgid="2181777971122724361">"No està disponible perquè la funció NFC està desactivada"</string>
+    <string name="nfc_disabled_summary" msgid="2181777971122724361">"No disponible perquè la funció NFC està desactivada"</string>
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
     <string name="android_beam_explained" msgid="4501176353247859329">"Si aquesta funció està activada, pots col·locar el dispositiu a prop d\'un altre que també sigui compatible amb la tecnologia NFC per compartir contingut d\'aplicacions entre tots dos. Per exemple, pots compartir-hi pàgines web, vídeos de YouTube, contactes i moltes coses més.\n\nCol·loca els dispositius a prop (normalment encarant-los per la part posterior) i, a continuació, toca la pantalla del teu dispositiu. L\'aplicació determina el contingut que es pot compartir."</string>
     <string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wi-Fi"</string>
@@ -849,8 +848,8 @@
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"Notifica\'m quan hi hagi una xarxa pública d\'alta qualitat"</string>
     <string name="wifi_wakeup" msgid="4963732992164721548">"Activa la Wi‑Fi automàticament"</string>
     <string name="wifi_wakeup_summary" msgid="1152699417411690">"La Wi-Fi es tornarà a activar automàticament prop de xarxes d\'alta qualitat desades, com la de casa teva"</string>
-    <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"No està disponible perquè la ubicació està desactivada. Activa la "<annotation id="link">"ubicació"</annotation>"."</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="6820040651529910914">"No està disponible perquè la cerca de xarxes Wi-Fi està desactivada"</string>
+    <string name="wifi_wakeup_summary_no_location" msgid="3007457288587966962">"No disponible perquè la ubicació està desactivada. Activa la "<annotation id="link">"ubicació"</annotation>"."</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="6820040651529910914">"No disponible perquè la cerca de xarxes Wi-Fi està desactivada"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"Per utilitzar aquesta funció, selecciona un proveïdor de valoració de xarxes"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"Només connexions estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"No utilitzis una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Dades mòbils"</item>
+    <item msgid="6007360612667098926">"Només Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1145,19 +1147,19 @@
     <string name="dock_audio_settings_title" msgid="569878977159555611">"Àudio"</string>
     <string name="dock_audio_summary_desk" msgid="7392976991908633214">"Configuració de la base d\'escriptori"</string>
     <string name="dock_audio_summary_car" msgid="56931858694127021">"Configuració de la base del vehicle"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="1406968511715778099">"Tauleta no connectada"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="2704912407397319084">"Telèfon no connectat"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="1406968511715778099">"Tauleta no acoblada"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="2704912407397319084">"Telèfon no acoblat"</string>
     <string name="dock_audio_summary_unknown" msgid="1615958511030469507">"Configuració de la base adjunta"</string>
     <string name="dock_not_found_title" msgid="2035088760477532435">"No s\'ha trobat la base"</string>
     <string name="dock_not_found_text" product="tablet" msgid="5996654431405111902">"Per configurar l\'àudio de la base, has de connectar-hi la tauleta."</string>
-    <string name="dock_not_found_text" product="default" msgid="8275091896320216368">"Per configurar l\'àudio de la base, has de connectar-hi el telèfon."</string>
+    <string name="dock_not_found_text" product="default" msgid="8275091896320216368">"Per configurar l\'àudio de la base, has de acoblar-hi el telèfon."</string>
     <string name="dock_sounds_enable_title" msgid="3385931465312084061">"So en inserir a la base"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="4322104626905111669">"Reprodueix so en inserir o retirar la tauleta de la base"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="2751810717801098293">"Reprodueix so en inserir o treure el telèfon de la base"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="2125391395745266946">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="9075438702849896866">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
     <string name="account_settings" msgid="1937600532993930396">"Comptes"</string>
-    <string name="accessibility_category_work" msgid="2808942060489460727">"Comptes del perfil professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_work" msgid="2808942060489460727">"Comptes del perfil de treball: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1423427301759058762">"Comptes del perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="3195468574776888011">"Compte de la feina: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"Compte personal: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -1216,11 +1218,11 @@
     <string name="night_display_summary_off" msgid="8850539785332228069">"Desactivada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"No s\'activarà mai automàticament"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"S\'activarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"S\'activarà automàticament quan es pongui el sol"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"S\'activarà automàticament al vespre"</string>
     <string name="night_display_summary_on" msgid="6580571388791426596">"Activat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5461580863060506687">"No es desactivarà mai automàticament"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2200631112239399233">"Es desactivarà automàticament a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"Es desactivarà automàticament quan surti el sol"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"Es desactivarà automàticament a l\'alba"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"Activa ara"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"Desactiva ara"</string>
     <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"Activa fins a l\'alba"</string>
@@ -1239,10 +1241,10 @@
     <string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"Personalitza la pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"Selecciona fons de pantalla de"</string>
     <string name="screensaver_settings_title" msgid="7720091234133721021">"Estalvi de pantalla"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"Mentre es carrega o està connectat a la base"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"Mentre es carrega o està acoblat a la base"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2453772128682850053">"Els dos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6097363596749362692">"Mentre es carrega"</string>
-    <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"Mentre està connectat a la base"</string>
+    <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"Mentre està acoblat a la base"</string>
     <string name="screensaver_settings_summary_never" msgid="3995259444981620707">"Mai"</string>
     <string name="screensaver_settings_summary_off" msgid="6119947316484763131">"Desactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"Per controlar què passa quan el telèfon està acoblat a una base o en mode de repòs, activa l\'estalvi de pantalla."</string>
@@ -1554,7 +1556,7 @@
     <string name="menu_cancel" msgid="1292949233623397786">"Descarta"</string>
     <string name="error_title" msgid="6595678722641187629"></string>
     <string name="error_name_empty" msgid="4638536651499727722">"El camp Nom no pot ser buit."</string>
-    <string name="error_apn_empty" msgid="4849569239327147849">"L\'APN no pot estar buit."</string>
+    <string name="error_apn_empty" msgid="4849569239327147849">"L\'APN no pot ser buit."</string>
     <string name="error_mcc_not3" msgid="1333037488064427164">"El camp MCC ha de tenir 3 dígits."</string>
     <string name="error_mnc_not23" msgid="6738398924368729180">"El camp MNC ha de tenir 2 o 3 dígits."</string>
     <string name="error_adding_apn_type" msgid="671634520340569678">"L\'operador no permet afegir APN de tipus %s."</string>
@@ -1640,7 +1642,7 @@
     <string name="mobile_insert_sim_card" msgid="7594550403454243732">"Insereix la targeta SIM i reinicia"</string>
     <string name="mobile_connect_to_internet" msgid="6031886097365170913">"Connecta a Internet"</string>
     <string name="location_title" msgid="8664674161765477168">"La meva ubicació"</string>
-    <string name="managed_profile_location_switch_title" msgid="8157384427925389680">"Ubicació perfil professional"</string>
+    <string name="managed_profile_location_switch_title" msgid="8157384427925389680">"Ubicació perfil de treball"</string>
     <string name="location_app_level_permissions" msgid="1298041503927632960">"Permís d\'aplicacions"</string>
     <string name="location_app_permission_summary_location_off" msgid="541372845344796336">"La ubicació està desactivada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="7904821382328758218">
@@ -1761,19 +1763,19 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Mostra el patró del perfil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"Vibra en tocar"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"El botó d\'engegada bloqueja"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Excepte si <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> manté el dispositiu desbloquejat"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Excepte si està desbloquejat per <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Defineix el patró de desbloqueig"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Com crear un patró de desbloqueig"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"Has superat el nombre d\'intents incorrectes permesos. Torna-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
     <string name="activity_not_found" msgid="3492413375341165453">"L\'aplicació no està instal·lada al telèfon."</string>
-    <string name="lock_settings_profile_title" msgid="3928992050074556160">"Seguretat del perfil professional"</string>
-    <string name="lock_settings_profile_screen_lock_title" msgid="285267471459162203">"Bloqueig de pantalla del perfil professional"</string>
+    <string name="lock_settings_profile_title" msgid="3928992050074556160">"Seguretat del perfil de treball"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="285267471459162203">"Bloqueig de pantalla del perfil de treball"</string>
     <string name="lock_settings_profile_unification_title" msgid="2629698644191935287">"Utilitza un sol bloqueig"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="4797188229308317207">"Utilitza un sol bloqueig per al perfil professional i per a la pantalla del dispositiu"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="4797188229308317207">"Utilitza un sol bloqueig per al perfil de treball i per a la pantalla del dispositiu"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="1690211342491067179">"Vols utilitzar un sol bloqueig?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="8629158560032603101">"El dispositiu utilitzarà el bloqueig de pantalla del teu perfil professional. S\'aplicaran les polítiques professionals a tots dos bloquejos."</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="1217609779267643474">"El bloqueig del perfil professional no compleix els requisits de seguretat de la teva organització. Pots fer servir el mateix bloqueig per a la pantalla del dispositiu i per al perfil professional, però s\'aplicaran les polítiques de bloqueig professionals que hi pugui haver."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="8629158560032603101">"El dispositiu utilitzarà el bloqueig de pantalla del teu perfil de treball. S\'aplicaran les polítiques professionals a tots dos bloquejos."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="1217609779267643474">"El bloqueig del perfil de treball no compleix els requisits de seguretat de la teva organització. Pots fer servir el mateix bloqueig per a la pantalla del dispositiu i per al perfil de treball, però s\'aplicaran les polítiques de bloqueig professionals que hi pugui haver."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="888942752619181804">"Utilitza un sol bloqueig"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8046452284593057185">"Utilitza un sol bloqueig"</string>
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"El mateix bloqueig de pantalla que el del dispositiu"</string>
@@ -1795,7 +1797,7 @@
     <string name="storage_label" msgid="1109537840103290384">"Emmagatzematge"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"Obrir de manera determinada"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"Valors predeterminats"</string>
-    <string name="screen_compatibility_label" msgid="3638271673726075815">"Compatibilitat amb la pantalla"</string>
+    <string name="screen_compatibility_label" msgid="3638271673726075815">"Compatibilitat de la pantalla"</string>
     <string name="permissions_label" msgid="7341733648403464213">"Permisos"</string>
     <string name="cache_header_label" msgid="3202284481380361966">"Memòria cau"</string>
     <string name="clear_cache_btn_text" msgid="107507684844780651">"Esborra memòria cau"</string>
@@ -1966,7 +1968,7 @@
     <string name="show_ime_summary" msgid="3246628154011464373">"Mantén-lo en pantalla mentre el teclat físic està actiu"</string>
     <string name="keyboard_shortcuts_helper" msgid="6574386807271399788">"Ajuda per a les dreceres de teclat"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="8024313306403779742">"Mostra les dreceres de teclat disponibles"</string>
-    <string name="language_and_input_for_work_category_title" msgid="2053255944038892588">"Teclats i eines del perfil professional"</string>
+    <string name="language_and_input_for_work_category_title" msgid="2053255944038892588">"Teclats i eines del perfil de treball"</string>
     <string name="virtual_keyboards_for_work_title" msgid="3968291646938204523">"Teclat virtual per a la feina"</string>
     <string name="default_keyboard_layout" msgid="9171704064451242230">"Predeterminat"</string>
     <string name="pointer_speed" msgid="800691982011350432">"Velocitat del punter"</string>
@@ -2052,8 +2054,8 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Toca tres cops per fer zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Toca un botó per fer zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"Per ampliar la imatge"</b>", fes tres tocs ràpids a la pantalla.\n"<ul><li>"Arrossega dos dits o més per desplaçar-la"</li>\n<li>"Pinça la pantalla unint dos dits o més per ajustar el zoom"</li></ul>\n\n<b>"Per fer zoom de manera temporal"</b>", fes tres tocs ràpids a la pantalla i mantén-la premuda al tercer toc.\n"<ul><li>"Arrossega el dit per desplaçar-te per la pantalla"</li>\n<li>"Aixeca\'l per allunyar la imatge"</li></ul>\n\n"No pots fer zoom al teclat ni a la barra de navegació."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Quan la funció d\'ampliació està activada, utilitza el botó Accessibilitat que hi ha a la part inferior de la pantalla per ampliar-la ràpidament.\n\n"<b>"Per ampliar la imatge"</b>", toca el botó Accessibilitat i, a continuació, toca qualsevol punt de la pantalla.\n"<ul><li>"Arrossega dos dits o més per desplaçar-te"</li>\n<li>"Pinça unint dos dits o més dits per ajustar el zoom"</li></ul>\n\n<b>"Per ampliar la imatge temporalment"</b>", toca el botó Accessibilitat i, a continuació, toca i mantén premut qualsevol punt de la pantalla.\n"<ul><li>"Arrossega el dit per desplaçar-te per la pantalla"</li>\n<li>"Aixeca\'l per allunyar la imatge"</li></ul>\n\n"No pots fer zoom al teclat ni a la barra de navegació."</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"El botó Accessibilitat està configurat per a <xliff:g id="SERVICE">%1$s</xliff:g>. Per utilitzar la funció d\'ampliació, toca i mantén premut el botó Accessibilitat i, a continuació, selecciona l\'ampliació."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Quan la funció d\'ampliació està activada, utilitza el botó d\'accessibilitat que hi ha a la part inferior de la pantalla per ampliar-la ràpidament.\n\n"<b>"Per ampliar la imatge"</b>", toca el botó d\'accessibilitat i, a continuació, toca qualsevol punt de la pantalla.\n"<ul><li>"Arrossega dos dits o més per desplaçar-te"</li>\n<li>"Pinça unint dos dits o més dits per ajustar el zoom"</li></ul>\n\n<b>"Per ampliar la imatge temporalment"</b>", toca el botó d\'accessibilitat i, a continuació, toca i mantén premut qualsevol punt de la pantalla.\n"<ul><li>"Arrossega el dit per desplaçar-te per la pantalla"</li>\n<li>"Aixeca\'l per allunyar la imatge"</li></ul>\n\n"No pots fer zoom al teclat ni a la barra de navegació."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"El botó d\'accessibilitat està configurat per a <xliff:g id="SERVICE">%1$s</xliff:g>. Per utilitzar la funció d\'ampliació, toca i mantén premut el botó d\'accessibilitat i, a continuació, selecciona l\'ampliació."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Drecera per a tecles de volum"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Servei associat a la drecera"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Permet a la pantalla de bloqueig"</string>
@@ -2245,7 +2247,7 @@
     <string name="battery_stats_screen_on_label" msgid="1223495366609581497">"Pantalla activada"</string>
     <string name="battery_stats_gps_on_label" msgid="3944533098574423359">"GPS activat"</string>
     <string name="battery_stats_camera_on_label" msgid="557892808497848886">"Càmera activada"</string>
-    <string name="battery_stats_flashlight_on_label" msgid="162279812156241905">"Llanterna activada"</string>
+    <string name="battery_stats_flashlight_on_label" msgid="162279812156241905">"Llanterna encesa"</string>
     <string name="battery_stats_wifi_running_label" msgid="3223557320252465826">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="670884103452713535">"Activa"</string>
     <string name="battery_stats_phone_signal_label" msgid="2502589944816260503">"Senyal de xarxa mòbil"</string>
@@ -2499,7 +2501,7 @@
     <string name="voice_input_settings" msgid="4983011614890521505">"Configuració de l\'entrada de veu"</string>
     <string name="voice_input_settings_title" msgid="6865032806501269306">"Entrada de veu"</string>
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"Serveis d\'entrada de veu"</string>
-    <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"Paraula activa i interacció completes"</string>
+    <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"Paraula d\'activació i interacció completes"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"Conversió de parla a text simple"</string>
     <string name="voice_interaction_security_warning" msgid="4986261746316889768">"Aquest servei d\'entrada de veu podrà supervisar sempre la veu i controlar les aplicacions compatibles amb l\'entrada de veu en nom teu. Procedeix de l\'aplicació <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Vols activar l\'ús d\'aquest servei?"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"Motor preferent"</string>
@@ -2547,7 +2549,7 @@
     <string name="backup_data_title" msgid="4461508563849583624">"Còpia de seguretat de les meves dades"</string>
     <string name="backup_data_summary" msgid="555459891017933746">"Fes una còpia de seguretat als servidors de Google de dades d\'aplicacions, contrasenyes Wi-Fi i altres opcions de configuració"</string>
     <string name="backup_configure_account_title" msgid="1534734650559070294">"Compte de còpia de seguretat"</string>
-    <string name="backup_data_management_title" msgid="6299288795610243508">"Gestiona el compte per a la còpia de seguretat"</string>
+    <string name="backup_data_management_title" msgid="6299288795610243508">"Gestiona el compte de còpia de seguretat"</string>
     <string name="include_app_data_title" msgid="6117211611131913293">"Inclou dades de l\'aplicació"</string>
     <string name="auto_restore_title" msgid="8367486774010915221">"Restauració automàtica"</string>
     <string name="auto_restore_summary" msgid="1941047568966428377">"Quan tornis a instal·lar una aplicació, restaura la configuració i les dades incloses a la còpia de seguretat"</string>
@@ -2556,7 +2558,7 @@
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
     <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Vols deixar de crear còpies de seguretat de les contrasenyes de Wi-Fi, de les adreces d\'interès, d\'altres opcions i dades d\'aplicacions i, a més, esborrar totes les còpies dels servidors de Google?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Vols deixar de crear còpies de seguretat de les dades del dispositiu (com ara les contrasenyes de Wi-Fi o l\'historial de trucades) i de les aplicacions (com ara les configuracions i els fitxers que desin) i, a més, esborrar totes les còpies dels servidors remots?"</string>
-    <string name="fullbackup_data_summary" msgid="406274198094268556">"Crea còpies de seguretat automàtiques de les dades del dispositiu (com ara les contrasenyes de la Wi-Fi o l\'historial de trucades) i de les aplicacions (com ara les configuracions i els fitxers que desin) de manera remota.\n\nQuan activis les còpies de seguretat automàtiques, les dades dels dispositius i de les aplicacions s\'emmagatzemaran periòdicament de manera remota. Les dades de les aplicacions poden ser qualsevol informació que desin (en funció de la configuració del desenvolupador), incloses les dades potencialment confidencials, com ara contactes, missatges i fotos."</string>
+    <string name="fullbackup_data_summary" msgid="406274198094268556">"Crea còpies de seguretat automàtiques de les dades del dispositiu (com ara les contrasenyes de la Wi-Fi o l\'historial de trucades) i de les aplicacions (com ara les configuracions i els fitxers que desin) de manera remota.\n\nQuan activis les còpies de seguretat automàtiques, les dades dels dispositius i de les aplicacions s\'emmagatzemaran periòdicament de manera remota. Les dades de les aplicacions poden ser qualsevol mena de dada que hagi desat una aplicació (en funció de la configuració del desenvolupador), incloses les dades potencialment confidencials, com ara contactes, missatges i fotos."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"Configuració de l\'administrador del dispositiu"</string>
     <string name="active_device_admin_msg" msgid="6929247869516924549">"Aplicació d\'administració del dispositiu"</string>
     <string name="remove_device_admin" msgid="4413438593788336400">"Desactiva aquesta aplicació d\'administració del dispositiu"</string>
@@ -2590,11 +2592,11 @@
     <string name="account_sync_settings_title" msgid="3344538161552327748">"Sincronització"</string>
     <string name="sync_is_failing" msgid="8284618104132302644">"La sincronització té problemes. Tornarà a funcionar aviat."</string>
     <string name="add_account_label" msgid="4461298847239641874">"Afegeix un compte"</string>
-    <string name="managed_profile_not_available_label" msgid="8784246681719821917">"El perfil professional encara no està disponible."</string>
-    <string name="work_mode_label" msgid="6845849194740195757">"Perfil professional"</string>
+    <string name="managed_profile_not_available_label" msgid="8784246681719821917">"El perfil de treball encara no està disponible."</string>
+    <string name="work_mode_label" msgid="6845849194740195757">"Perfil de treball"</string>
     <string name="work_mode_on_summary" msgid="1682781113156323592">"Gestionat per la teva organització"</string>
     <string name="work_mode_off_summary" msgid="1688885392211178315">"Les aplicacions i les notificacions estan desactivades"</string>
-    <string name="remove_managed_profile_label" msgid="4625542553784793536">"Suprimeix el perfil professional"</string>
+    <string name="remove_managed_profile_label" msgid="4625542553784793536">"Suprimeix el perfil de treball"</string>
     <string name="background_data" msgid="8275750862371471171">"Dades en segon pla"</string>
     <string name="background_data_summary" msgid="799640633948841990">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"Desactiva dades segon pla?"</string>
@@ -2623,8 +2625,8 @@
     <string name="header_add_an_account" msgid="8482614556580804956">"Afegeix un compte"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Vols suprimir el compte?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Si elimines aquest compte, se\'n suprimiran tots els missatges, els contactes i les altres dades de la tauleta."</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Si suprimeixes aquest compte, se n\'eliminaran tots els missatges, els contactes i altres dades del telèfon."</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Si suprimeixes aquest compte, se\'n suprimiran tots els missatges, els contactes i la resta de dades del dispositiu."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Si suprimeixes aquest compte, se\'n suprimiran tots els missatges, els contactes i altres dades del telèfon."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Si suprimeixes aquest compte, se\'n suprimiran tots els missatges, els contactes i altres dades del dispositiu."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"L\'administrador no permet aquest canvi"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"No es pot sincronitzar manualment"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades en segon pla i la sincronització automàtica."</string>
@@ -2792,7 +2794,7 @@
     <string name="vpn_lockdown_summary" msgid="6770030025737770861">"Selecciona un perfil de VPN per estar-hi sempre connectat. El trànsit de la xarxa només es permetrà quan estiguis connectat a aquesta VPN."</string>
     <string name="vpn_lockdown_none" msgid="3789288793603394679">"Cap"</string>
     <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"Per tenir la VPN sempre activada cal una adreça IP per al servidor i per al DNS."</string>
-    <string name="vpn_no_network" msgid="8313250136194588023">"No hi ha cap connexió de xarxa. Torna-ho a provar més tard."</string>
+    <string name="vpn_no_network" msgid="8313250136194588023">"No hi ha cap connexió a la xarxa. Torna-ho a provar més tard."</string>
     <string name="vpn_disconnected" msgid="4597953053220332539">"T\'has desconnectat de la VPN"</string>
     <string name="vpn_disconnected_summary" msgid="3784118965271376808">"Cap"</string>
     <string name="vpn_missing_cert" msgid="2713254242731992902">"Falta un certificat. Prova d\'editar el perfil."</string>
@@ -2832,8 +2834,8 @@
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha instal·lat una autoritat de certificació al teu dispositiu, de manera que podrà supervisar-ne l\'activitat a la xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb l\'administrador.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="8271858091418779584">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha instal·lat autoritats de certificació per al teu perfil professional, de manera que podrà supervisar la teva activitat professional a la xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquests certificats, contacta amb l\'administrador.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha instal·lat una autoritat de certificació per al teu perfil professional, de manera que podrà supervisar la teva activitat professional a la xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb l\'administrador.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha instal·lat autoritats de certificació per al teu perfil de treball, de manera que podrà supervisar la teva activitat professional a la xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquests certificats, contacta amb l\'administrador.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha instal·lat una autoritat de certificació per al teu perfil de treball, de manera que podrà supervisar la teva activitat professional a la xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació sobre aquest certificat, contacta amb l\'administrador.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"Un tercer pot supervisar la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nHi ha una credencial de confiança instal·lada al teu dispositiu que ho fa possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
@@ -2852,7 +2854,7 @@
     <string name="user_set_lock_button" msgid="4660971133148866612">"Defineix un bloqueig"</string>
     <string name="user_summary_not_set_up" msgid="6436691939044332679">"No configurat"</string>
     <string name="user_summary_restricted_not_set_up" msgid="896552290436689508">"No configurat: perfil restringit"</string>
-    <string name="user_summary_managed_profile_not_set_up" msgid="3032986082684011281">"El perfil professional no està configurat."</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="3032986082684011281">"El perfil de treball no està configurat."</string>
     <string name="user_admin" msgid="805802526361071709">"Administrador"</string>
     <string name="user_you" msgid="8212549708652717106">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="1088216221559125529">"Àlies"</string>
@@ -2881,7 +2883,7 @@
     <string name="user_confirm_remove_self_title" msgid="6739480453680217543">"Et vols suprimir a tu mateix?"</string>
     <string name="user_confirm_remove_title" msgid="1034498514019462084">"Vols suprimir l\'usuari?"</string>
     <string name="user_profile_confirm_remove_title" msgid="6138684743385947063">"Vols suprimir el perfil?"</string>
-    <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Vols suprimir el perfil professional?"</string>
+    <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"Vols suprimir el perfil de treball?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"Perdràs l\'espai i les dades de la tauleta. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"Perdràs l\'espai i les dades del telèfon. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_message" msgid="5202150470271756013">"Se suprimiran totes les dades i totes les aplicacions."</string>
@@ -3035,13 +3037,13 @@
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Aplicacions i notificacions"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistent, aplicacions recents, aplicacions predeterminades"</string>
-    <string name="notification_settings_work_profile" msgid="7190550347842400029">"Les aplicacions del perfil professional no tenen accés a les notificacions."</string>
+    <string name="notification_settings_work_profile" msgid="7190550347842400029">"Les aplicacions del perfil de treball no tenen accés a les notificacions."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Comptes"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"No s\'ha afegit cap compte"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"Aplicacions predeterminades"</string>
     <string name="system_dashboard_summary" msgid="6582464466735779394">"Idiomes, gestos, hora, còpia de seguretat"</string>
     <string name="search_results_title" msgid="4160717656435503940">"Configuració"</string>
-    <string name="keywords_wifi" msgid="8477688080895466846">"wi-fi, Wi-Fi, connexió de xarxa, Internet, sense fil, dades, wifi"</string>
+    <string name="keywords_wifi" msgid="8477688080895466846">"wi-fi, Wi-Fi, connexió a la xarxa, Internet, sense fil, dades, wifi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"notificació Wi‑Fi, notificació wifi"</string>
     <string name="keywords_auto_brightness" msgid="5007188989783072428">"Brillantor adaptativa"</string>
     <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"aturar la vibració, tocar, teclat"</string>
@@ -3086,7 +3088,7 @@
     <string name="keywords_color_temperature" msgid="2255253972992035046">"color, temperatura, D65, D73, blanc, groc, blau, càlid, fred"</string>
     <string name="keywords_lockscreen" msgid="4936846554280830394">"fer lliscar el dit per desbloquejar, contrasenya, patró, PIN"</string>
     <string name="keywords_profile_challenge" msgid="8653718001253979611">"desafiament per accedir a contingut de feina, feina, perfil"</string>
-    <string name="keywords_unification" msgid="2020759909366983593">"perfil professional, perfil gestionat, unificar, unificació, feina, perfil"</string>
+    <string name="keywords_unification" msgid="2020759909366983593">"perfil de treball, perfil gestionat, unificar, unificació, feina, perfil"</string>
     <string name="keywords_gesture" msgid="5031323247529869644">"gestos"</string>
     <string name="keywords_payment_settings" msgid="4745023716567666052">"paga, toca, pagaments"</string>
     <string name="keywords_backup" msgid="7433356270034921627">"còpia de seguretat, crear una còpia de seguretat"</string>
@@ -3245,8 +3247,8 @@
     </plurals>
     <string name="zen_mode_duration_summary_time_minutes" msgid="6988728116715208859">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuts (tret que s\'activi automàticament)"</string>
     <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="8527428833487709278">
-      <item quantity="other">Es poden activar automàticament <xliff:g id="ON_COUNT">%d</xliff:g> programacions</item>
-      <item quantity="one">Es pot activar automàticament 1 programació</item>
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programacions es poden activar automàticament</item>
+      <item quantity="one">1 programació es pot activar automàticament</item>
     </plurals>
     <string name="zen_category_behavior" msgid="7695750848671443532">"Silencia el dispositiu, però permet excepcions"</string>
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Excepcions"</string>
@@ -3273,23 +3275,23 @@
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"No veuràs ni sentiràs notificacions. Estan permeses les trucades dels contactes destacats i les trucades repetides."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(configuració actual)"</string>
     <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"Vols canviar la configuració de notificacions del mode No molestis?"</string>
-    <string name="sound_work_settings" msgid="4140215240360927923">"Sons del perfil professional"</string>
+    <string name="sound_work_settings" msgid="4140215240360927923">"Sons del perfil de treball"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Utilitza sons del perfil pers."</string>
-    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Els sons del perfil professional i personal són els mateixos"</string>
+    <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Els sons del perfil de treball i personal són els mateixos"</string>
     <string name="work_ringtone_title" msgid="5499360583947410224">"So de trucada de la feina"</string>
     <string name="work_notification_ringtone_title" msgid="8059159087214025757">"So de notificació de la feina predeterminat"</string>
     <string name="work_alarm_ringtone_title" msgid="5328487181385375130">"So d\'alarma de la feina predeterminat"</string>
     <string name="work_sound_same_as_personal" msgid="7728560881697159758">"Igual que al perfil personal"</string>
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"Vols substituir els sons?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"Substitueix"</string>
-    <string name="work_sync_dialog_message" msgid="944233463059129156">"S\'utilitzaran els sons del perfil personal per al perfil professional"</string>
+    <string name="work_sync_dialog_message" msgid="944233463059129156">"S\'utilitzaran els sons del perfil personal per al perfil de treball"</string>
     <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"Vols afegir un so personalitzat?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="6683649115132255452">"Aquest fitxer es copiarà a la carpeta <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="4491932700769815470">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"Notificacions"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Enviades fa poc"</string>
-    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Mostra-les totes des de fa 7 dies"</string>
+    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Mostra totes les dels 7 darrers dies"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"Configuració avançada"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Notificacions de la feina"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Prioritat de les notificacions automàtiques"</string>
@@ -3313,7 +3315,7 @@
     <string name="swipe_direction_rtl" msgid="4521416787262888813">"Llisca cap a l\'esquerra per ignorar o cap a la dreta per mostrar el menú"</string>
     <string name="notification_pulse_title" msgid="4861418327614907116">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6889072265118747835">"A la pantalla de bloqueig"</string>
-    <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"Si perfil professional bloquejat"</string>
+    <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"Si perfil de treball bloquejat"</string>
     <string name="lock_screen_notifications_summary_show" msgid="5788874994455257378">"Mostra tot el contingut de les notificacions"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="3668806866535260143">"Amaga el contingut sensible"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3259929507369817672">"No mostris les notificacions"</string>
@@ -3354,7 +3356,7 @@
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"Aproximadament <xliff:g id="NUMBER">%1$s</xliff:g> a la setmana"</string>
     <string name="notifications_sent_never" msgid="237997329598144638">"Mai"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"Accés a les notificacions"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"S\'ha bloquejat l\'accés a les notificacions del perfil professional"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"S\'ha bloquejat l\'accés a les notificacions del perfil de treball"</string>
     <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"Les aplicacions no poden llegir notificacions"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
       <item quantity="other">%d aplicacions poden llegir notificacions</item>
@@ -3553,7 +3555,7 @@
     <string name="screen_pinning_unlock_pin" msgid="1441705536015645023">"Demana el codi PIN per deixar de fixar"</string>
     <string name="screen_pinning_unlock_password" msgid="1017776884000170841">"Demana la contrasenya per deixar de fixar"</string>
     <string name="screen_pinning_unlock_none" msgid="9183040569733226911">"Bloqueja el dispositiu en deixar de fixar"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2350380017136403670">"L\'administrador d\'aquest perfil professional és:"</string>
+    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2350380017136403670">"L\'administrador d\'aquest perfil de treball és:"</string>
     <string name="managing_admin" msgid="3212584016377581608">"Gestionat per <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="5903223408406906322">"(Experimental)"</string>
     <string name="encryption_interstitial_header" msgid="3298397268731647519">"Inici segur"</string>
@@ -3581,7 +3583,7 @@
     <string name="imei_information_title" msgid="7666097743700170757">"Informació sobre l\'IMEI"</string>
     <string name="imei_information_summary" msgid="716516316022275083">"Informació relativa a l\'IMEI"</string>
     <string name="slot_number" msgid="785422579177068698">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
-    <string name="launch_by_default" msgid="6106985160202769725">"Obre de manera determinada"</string>
+    <string name="launch_by_default" msgid="6106985160202769725">"Obre de manera predeterminada"</string>
     <string name="app_launch_domain_links_title" msgid="2987289657348349133">"Obertura d\'enllaços"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"Obrir els enllaços admesos"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"Obre sense demanar-ho"</string>
@@ -3757,7 +3759,7 @@
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Permet que l\'aplicació d\'assistència accedeixi a una imatge de la pantalla"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Fes centellejar la pantalla"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"Fa centellejar les vores de la pantalla quan l\'aplicació d\'assistència accedeix al text d\'una pantalla o d\'una captura de pantalla"</string>
-    <string name="assist_footer" msgid="7030121180457472165">"Les aplicacions d\'assistència et poden ajudar en funció de la informació que es mostri a la pantalla. Algunes aplicacions admeten tant els serveis de menú d\'aplicacions com els d\'entrada de veu per oferir-te una assistència integrada."</string>
+    <string name="assist_footer" msgid="7030121180457472165">"Les aplicacions d\'assistència et poden ajudar en funció de la informació que es mostri a la pantalla. Algunes aplicacions admeten tant el menú d\'aplicacions com els serveis d\'entrada de veu per oferir-te una assistència integrada."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"Ús mitjà de la memòria"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"Ús màxim de la memòria"</string>
     <string name="memory_usage" msgid="7963253555330830906">"Ús de la memòria"</string>
@@ -3790,7 +3792,7 @@
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"Es recomana per allargar la bateria"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"Vols permetre que <xliff:g id="APP">%s</xliff:g> ignori les optimitzacions de la bateria?"</string>
     <string name="app_list_preference_none" msgid="7100409177446935028">"Cap"</string>
-    <string name="work_profile_usage_access_warning" msgid="403208064382097510">"Encara que es desactivi l\'accés a dades d\'ús d\'aquesta aplicació, l\'administrador podrà continuar fent el seguiment de l\'ús de dades de les aplicacions del perfil professional"</string>
+    <string name="work_profile_usage_access_warning" msgid="403208064382097510">"Encara que es desactivi l\'accés a dades d\'ús d\'aquesta aplicació, l\'administrador podrà continuar fent el seguiment de l\'ús de dades de les aplicacions del perfil de treball"</string>
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"Caràcters utilitzats: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="draw_overlay" msgid="2878665072530660668">"Mostra sobre altres aplicacions"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Mostra sobre altres aplicacions"</string>
@@ -3851,7 +3853,7 @@
     <string name="notification_summary_none" msgid="5003043219430054784">"Activades per a totes les aplicacions"</string>
     <string name="apps_summary" msgid="8355759446490212195">"S\'han instal·lat <xliff:g id="COUNT">%1$d</xliff:g> aplicacions"</string>
     <string name="apps_summary_example" msgid="3011143598675185269">"24 aplicacions instal·lades"</string>
-    <string name="storage_summary" msgid="4835916510511133784">"Espai utilitzat: <xliff:g id="PERCENTAGE">%1$s</xliff:g>. Espai lliure: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
+    <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> utilitzat - <xliff:g id="FREE_SPACE">%2$s</xliff:g> lliures"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"Emmagatzematge intern: <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilitzat, <xliff:g id="FREE_SPACE">%2$s</xliff:g> lliure"</string>
     <string name="display_summary" msgid="5725269449657325797">"Entra en repòs després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="display_dashboard_summary" msgid="7678566148167010682">"Fons de pantalla, repòs, mida de la lletra"</string>
@@ -3873,7 +3875,7 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"No es pot obrir aquesta aplicació"</string>
     <string name="default_admin_support_msg" msgid="5789424433689798637">"Si tens cap dubte, contacta amb l\'administrador de TI"</string>
     <string name="admin_support_more_info" msgid="8737842638087863477">"Més detalls"</string>
-    <string name="admin_profile_owner_message" msgid="3199544166281052845">"L\'administrador pot supervisar i gestionar les aplicacions i les dades associades al teu perfil professional, com ara la configuració, els permisos, l\'accés corporatiu, l\'activitat de xarxa i la informació d\'ubicació del dispositiu."</string>
+    <string name="admin_profile_owner_message" msgid="3199544166281052845">"L\'administrador pot supervisar i gestionar les aplicacions i les dades associades al teu perfil de treball, com ara la configuració, els permisos, l\'accés corporatiu, l\'activitat de xarxa i la informació d\'ubicació del dispositiu."</string>
     <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"L\'administrador pot supervisar i gestionar les aplicacions i les dades associades a aquest usuari, com ara la configuració, els permisos, l\'accés corporatiu, l\'activitat de xarxa i la informació d\'ubicació del dispositiu."</string>
     <string name="admin_device_owner_message" msgid="1823477572459610869">"L\'administrador pot supervisar i gestionar les aplicacions i les dades associades a aquest dispositiu, com ara la configuració, els permisos, l\'accés corporatiu, l\'activitat de xarxa i la informació d\'ubicació del dispositiu."</string>
     <string name="condition_turn_off" msgid="4395150881365143558">"Desactiva"</string>
@@ -3892,7 +3894,7 @@
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Només es pot accedir a Internet per Wi‑Fi"</string>
     <string name="condition_bg_data_title" msgid="184684435298857712">"Economitzador de dades"</string>
     <string name="condition_bg_data_summary" msgid="5194942860807136682">"Hi ha funcions restringides"</string>
-    <string name="condition_work_title" msgid="9046811302347490371">"Perfil professional desactivat"</string>
+    <string name="condition_work_title" msgid="9046811302347490371">"Perfil de treball desactivat"</string>
     <string name="condition_work_summary" msgid="5586134491975748565">"Per a les aplicacions i les notificacions"</string>
     <string name="condition_device_muted_action_turn_on_sound" msgid="5849285946804815263">"Activa el so"</string>
     <string name="condition_device_muted_title" msgid="3930542786434609976">"S\'ha silenciat el timbre"</string>
@@ -4074,7 +4076,7 @@
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Mosaics de configuració ràpida per a desenvolupadors"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Traça de Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Sensors desactivats"</string>
-    <string name="managed_profile_settings_title" msgid="4340409321523532402">"Configuració del perfil professional"</string>
+    <string name="managed_profile_settings_title" msgid="4340409321523532402">"Configuració del perfil de treball"</string>
     <string name="managed_profile_contact_search_title" msgid="7337225196804457095">"Cerca de contactes"</string>
     <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"Permet que la teva organització cerqui contactes per identificar els remitents i els contactes"</string>
     <string name="cross_profile_calendar_title" msgid="2351605904015067145">"Calendari multiperfil"</string>
@@ -4113,11 +4115,11 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Per canviar d\'aplicació, llisca cap amunt al botó d\'inici. Torna a lliscar cap amunt per veure totes les aplicacions. Funciona des de qualsevol pantalla. El botó Aplicacions recents ja no es mostrarà a la part inferior dreta de la pantalla."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"Prova el botó d\'inici nou"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"Activa el gest nou per canviar d\'aplicació"</string>
-    <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Doble toc per consultar-lo"</string>
+    <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Doble toc per consultar el telèfon"</string>
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"Per consultar la tauleta, fes-hi doble toc"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"Per consultar el dispositiu, fes-hi doble toc"</string>
     <string name="ambient_display_summary" msgid="4882910328216411109">"Per veure l\'hora, les notificacions i altres dades, fes doble toc a la pantalla."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Aixeca per consultar el telèfon"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Aixeca per consultar-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="1555456400210301959">"Per consultar la tauleta, aixeca-la"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="2480126522988135037">"Aixeca el dispositiu per consultar-lo"</string>
     <string name="ambient_display_wake_screen_title" msgid="3376988352851077102">"Activa la pantalla"</string>
@@ -4190,11 +4192,11 @@
     <string name="enterprise_privacy_input_method_name" msgid="439610095825218563">"Mètode definit: <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="2022700916516458213">"S\'ha activat l\'opció VPN sempre activada"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="5644065780843002044">"S\'ha activat l\'opció VPN sempre activada al teu perfil personal"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"S\'ha activat l\'opció VPN sempre activada al teu perfil professional"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="6443089897985373564">"S\'ha activat l\'opció VPN sempre activada al teu perfil de treball"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="3862135895716080830">"S\'ha definit el servidor intermediari HTTP global"</string>
     <string name="enterprise_privacy_ca_certs_device" msgid="7715658848470643878">"Certificats de confiança"</string>
     <string name="enterprise_privacy_ca_certs_personal" msgid="1356447417193483802">"Certificats de confiança al teu perfil personal"</string>
-    <string name="enterprise_privacy_ca_certs_work" msgid="836419648894546893">"Certificats de confiança al teu perfil professional"</string>
+    <string name="enterprise_privacy_ca_certs_work" msgid="836419648894546893">"Certificats de confiança al teu perfil de treball"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="7953528945502561752">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> certificats de CA com a mínim</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> certificat de CA com a mínim</item>
@@ -4202,7 +4204,7 @@
     <string name="enterprise_privacy_lock_device" msgid="1533125067038409945">"L\'administrador pot bloquejar el dispositiu i restablir-ne la contrasenya"</string>
     <string name="enterprise_privacy_wipe_device" msgid="7555287990273929922">"L\'administrador pot suprimir totes les dades del dispositiu"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="4101502079202483156">"Intents fallits d\'introduir la contrasenya abans que se suprimeixin totes les dades del dispositiu"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2881646286634693392">"Intents fallits d\'introduir la contrasenya abans que se suprimeixin les dades del perfil professional"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2881646286634693392">"Intents fallits d\'introduir la contrasenya abans que se suprimeixin les dades del perfil de treball"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="562550414712223382">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> intents</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> intent</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Aquesta funció alentirà el telèfon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Força mesuraments de GNSS complets"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Fes un seguiment de totes les freqüències i constel·lacions de GNSS sense cicle de treball"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Depura el canvi d\'usuari"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Mostra informació detallada durant el canvi d\'usuari"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permet l\'inici d\'activitats en segon pla"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permet tots els inicis d\'activitats en segon pla"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Mostra sempre el quadre de diàleg de bloqueig"</string>
diff --git a/tests/CarDeveloperOptions/res/values-cs-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-cs-nokeys/strings.xml
new file mode 100644
index 0000000..dadfa32
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-cs-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Správa aplikací"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-cs/arrays.xml b/tests/CarDeveloperOptions/res/values-cs/arrays.xml
new file mode 100644
index 0000000..815a6f0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-cs/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Evropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asie"</item>
+    <item msgid="6683489385344409742">"Austrálie"</item>
+    <item msgid="5194868215515664953">"Tichomoří"</item>
+    <item msgid="7044520255415007865">"Vše"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 s"</item>
+    <item msgid="772029947136115322">"30 sekund"</item>
+    <item msgid="8743663928349474087">"1 minuta"</item>
+    <item msgid="1506508631223164814">"2 minuty"</item>
+    <item msgid="8664703938127907662">"5 minut"</item>
+    <item msgid="5827960506924849753">"10 minut"</item>
+    <item msgid="6677424950124253938">"30 minut"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikdy"</item>
+    <item msgid="2517785806387977252">"15 sekund"</item>
+    <item msgid="6347954399441173672">"30 sekund"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minuty"</item>
+    <item msgid="2788593551142462622">"5 minut"</item>
+    <item msgid="8012672183888404961">"10 minut"</item>
+    <item msgid="8271452751594598661">"30 minut"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Okamžitě"</item>
+    <item msgid="2038544972632026612">"5 sekund"</item>
+    <item msgid="5558060663472279597">"15 sekund"</item>
+    <item msgid="45341168505452037">"30 sekund"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minuty"</item>
+    <item msgid="4376575879222393045">"5 minut"</item>
+    <item msgid="811192536981678974">"10 minut"</item>
+    <item msgid="7258394417241706272">"30 minut"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Malé"</item>
+    <item msgid="591935967183159581">"Výchozí"</item>
+    <item msgid="1714184661981538355">"Velké"</item>
+    <item msgid="6195563047686707484">"Největší"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Vyhledávání..."</item>
+    <item msgid="5597394826455877834">"Připojování…"</item>
+    <item msgid="5848277343965362748">"Ověřování..."</item>
+    <item msgid="3391238031431440676">"Načítání IP adresy…"</item>
+    <item msgid="5257597310494000224">"Připojeno"</item>
+    <item msgid="8472497592913050396">"Pozastaveno"</item>
+    <item msgid="1228072488815999109">"Odpojování..."</item>
+    <item msgid="7253087004422991731">"Odpojeno"</item>
+    <item msgid="4169850917304751227">"Neúspěšné"</item>
+    <item msgid="6266658166690831131">"Blokované"</item>
+    <item msgid="4517230805854909775">"Dočasné předcházení slabému připojení"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Vyhledávání..."</item>
+    <item msgid="8058143476674427024">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Ověřování v síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Získávání IP adresy ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Pozastaveno"</item>
+    <item msgid="4133290864821295785">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Odpojeno"</item>
+    <item msgid="2847316776634969068">"Neúspěšné"</item>
+    <item msgid="4390990424746035383">"Blokované"</item>
+    <item msgid="3618248791367063949">"Dočasné předcházení slabému připojení"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Stisknutí tlačítka"</item>
+    <item msgid="7401896200768713930">"PIN ze sdíleného zařízení"</item>
+    <item msgid="4526848028011846710">"PIN z tohoto zaříz."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Připojeno"</item>
+    <item msgid="983792611851499732">"Pozvané"</item>
+    <item msgid="5438273405428201793">"Neúspěšné"</item>
+    <item msgid="4646663015449312554">"Dostupné"</item>
+    <item msgid="3230556734162006146">"Mimo dosah"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuty"</item>
+    <item msgid="2759776603549270587">"5 minut"</item>
+    <item msgid="167772676068860015">"1 hodina"</item>
+    <item msgid="5985477119043628504">"Bez časového limitu"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Použít výchozí nastavení systému: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slabý"</item>
+    <item msgid="7882129634982603782">"Slabý"</item>
+    <item msgid="6457357501905996224">"Velmi dobrý"</item>
+    <item msgid="405271628162918841">"Dobrý"</item>
+    <item msgid="999948812884919584">"Vynikající"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Posledních 30 dní"</item>
+    <item msgid="3211287705232736964">"Zadat cyklus počítání..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Doba použití"</item>
+    <item msgid="2784401352592276015">"Naposledy použito"</item>
+    <item msgid="249854287216326349">"Název aplikace"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Žádné"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Žádné"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Žádné"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statická"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Žádné"</item>
+    <item msgid="1464741437353223198">"Příručka"</item>
+    <item msgid="5793600062487886090">"Autom. konfigurace proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Žádné"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP nebo CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nespecifikováno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1×RTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Žádné"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interní úložiště zařízení"</item>
+    <item msgid="3186681694079967527">"Vyjímatelná karta SD"</item>
+    <item msgid="6902033473986647035">"Automaticky vybere systém"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Poloha"</item>
+    <item msgid="6842381562497597649">"Osobní"</item>
+    <item msgid="3966700236695683444">"SMS a MMS"</item>
+    <item msgid="8563996233342430477">"Média"</item>
+    <item msgid="5323851085993963783">"Zařízení"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"přibližná poloha"</item>
+    <item msgid="1830619568689922920">"přesná poloha"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrace"</item>
+    <item msgid="8632513128515114092">"čtení kontaktů"</item>
+    <item msgid="3741042113569620272">"úprava kontaktů"</item>
+    <item msgid="4204420969709009931">"čtení seznamu hovorů"</item>
+    <item msgid="2260380357119423209">"úprava seznamu hovorů"</item>
+    <item msgid="6550710385014530934">"čtení kalendáře"</item>
+    <item msgid="3575906174264853951">"úprava kalendáře"</item>
+    <item msgid="4319843242568057174">"vyhledání sítí Wi-Fi"</item>
+    <item msgid="2981791890467303819">"oznámení"</item>
+    <item msgid="6617825156152476692">"vyhledání vysílače mobilní sítě"</item>
+    <item msgid="8865260890611559753">"volání na telefon"</item>
+    <item msgid="3254999273961542982">"čtení zpráv SMS"</item>
+    <item msgid="7711446453028825171">"psaní zpráv SMS"</item>
+    <item msgid="6123238544099198034">"příjem zpráv SMS"</item>
+    <item msgid="838342167431596036">"příjem nouzových SMS"</item>
+    <item msgid="8554432731560956686">"příjem zpráv MMS"</item>
+    <item msgid="7464863464299515059">"příjem zpráv WAP push"</item>
+    <item msgid="310463075729606765">"odesílání zpráv SMS"</item>
+    <item msgid="7338021933527689514">"čtení ICC SMS"</item>
+    <item msgid="6130369335466613036">"psaní ICC SMS"</item>
+    <item msgid="6536865581421670942">"úprava nastavení"</item>
+    <item msgid="4547203129183558973">"vykreslení navrch"</item>
+    <item msgid="9080347512916542840">"přístup k oznámením"</item>
+    <item msgid="5332718516635907742">"fotoaparát"</item>
+    <item msgid="6098422447246167852">"nahrávání zvuku"</item>
+    <item msgid="9182794235292595296">"přehrávání zvuku"</item>
+    <item msgid="8760743229597702019">"číst obsah schránky"</item>
+    <item msgid="2266923698240538544">"upravit obsah schránky"</item>
+    <item msgid="1801619438618539275">"tlačítka médií"</item>
+    <item msgid="31588119965784465">"priorita přehrávání"</item>
+    <item msgid="7565226799008076833">"hlavní hlasitost"</item>
+    <item msgid="5420704980305018295">"hlasitost hlasu"</item>
+    <item msgid="5797363115508970204">"hlasitost vyzvánění"</item>
+    <item msgid="8233154098550715999">"hlasitost médií"</item>
+    <item msgid="5196715605078153950">"hlasitost budíku"</item>
+    <item msgid="394030698764284577">"hlasitost oznámení"</item>
+    <item msgid="8952898972491680178">"hlasitost Bluetooth"</item>
+    <item msgid="8506227454543690851">"Zakázat režim spánku"</item>
+    <item msgid="1108160036049727420">"sledovat polohu"</item>
+    <item msgid="1496205959751719491">"sledování energeticky náročného určování polohy"</item>
+    <item msgid="3776296279910987380">"načíst statistiky o využívání"</item>
+    <item msgid="8827100324471975602">"vypnout nebo zapnout zvuk mikrofonu"</item>
+    <item msgid="6880736730520126864">"zobrazit zprávu"</item>
+    <item msgid="4933375960222609935">"promítat média"</item>
+    <item msgid="8357907018938895462">"aktivovat VPN"</item>
+    <item msgid="8143812849911310973">"zápis tapety"</item>
+    <item msgid="6266277260961066535">"struktura asistence"</item>
+    <item msgid="7715498149883482300">"snímek obrazovky asistence"</item>
+    <item msgid="4046679376726313293">"zjištění stavu telefonu"</item>
+    <item msgid="6329507266039719587">"přidat hlasovou zprávu"</item>
+    <item msgid="7692440726415391408">"použít SIP"</item>
+    <item msgid="8572453398128326267">"zpracovat odchozí hovor"</item>
+    <item msgid="7775674394089376306">"otisk prstu"</item>
+    <item msgid="3182815133441738779">"tělesné senzory"</item>
+    <item msgid="2793100005496829513">"čtení zpráv informačních služeb"</item>
+    <item msgid="2633626056029384366">"zkušební poloha"</item>
+    <item msgid="8356842191824684631">"čtení úložiště"</item>
+    <item msgid="5671906070163291500">"zápis úložiště"</item>
+    <item msgid="2791955098549340418">"zapnout obrazovku"</item>
+    <item msgid="5599435119609178367">"načíst účty"</item>
+    <item msgid="1165623660533024666">"spustit na pozadí"</item>
+    <item msgid="6423861043647911030">"hlasitost zvuků pro usnadnění přístupu"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Poloha"</item>
+    <item msgid="6656077694190491067">"Poloha"</item>
+    <item msgid="8790228218278477369">"Poloha"</item>
+    <item msgid="7836406246005211990">"Vibrace"</item>
+    <item msgid="3951439024549922598">"Čtení kontaktů"</item>
+    <item msgid="8802152411647068">"Úprava kontaktů"</item>
+    <item msgid="229544934599698735">"Čtení seznamu hovorů"</item>
+    <item msgid="7396102294405899613">"Úprava seznamu hovorů"</item>
+    <item msgid="3597797992398484655">"Čtení kalendáře"</item>
+    <item msgid="2705975774250907343">"Úprava kalendáře"</item>
+    <item msgid="4668747371441932697">"Poloha"</item>
+    <item msgid="1487578921720243646">"Přidání oznámení"</item>
+    <item msgid="4636080349724146638">"Poloha"</item>
+    <item msgid="673510900286463926">"Volání na telefon"</item>
+    <item msgid="542083422784609790">"Čtení SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Psaní SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Příjem SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Příjem SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Příjem SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Příjem SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Odesílání SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Čtení SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Psaní SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Úprava nastavení"</item>
+    <item msgid="8705854389991425629">"Vykreslení navrch"</item>
+    <item msgid="5861356020344153651">"Přístup k oznámením"</item>
+    <item msgid="78432174621628659">"Fotoaparát"</item>
+    <item msgid="3986116419882154794">"Nahrávání zvuku"</item>
+    <item msgid="4516840825756409490">"Přehrávání zvuku"</item>
+    <item msgid="6811712502798183957">"Číst obsah schránky"</item>
+    <item msgid="2780369012602289114">"Upravit obsah schránky"</item>
+    <item msgid="2331359440170850868">"Tlačítka médií"</item>
+    <item msgid="6133599737122751231">"Priorita přehrávání"</item>
+    <item msgid="6844485713404805301">"Hlavní hlasitost"</item>
+    <item msgid="1600379420669104929">"Hlasitost hlasu"</item>
+    <item msgid="6296768210470214866">"Hlasitost vyzvánění"</item>
+    <item msgid="510690696071629241">"Hlasitost médií"</item>
+    <item msgid="406861638631430109">"Hlasitost budíku"</item>
+    <item msgid="4715864795872233884">"Hlasitost oznámení"</item>
+    <item msgid="2311478519251301183">"Hlasitost Bluetooth"</item>
+    <item msgid="5133991377896747027">"Zakázat režim spánku"</item>
+    <item msgid="2464189519136248621">"Poloha"</item>
+    <item msgid="2062677934050803037">"Poloha"</item>
+    <item msgid="1735171933192715957">"Načíst statistiky o využívání"</item>
+    <item msgid="1014093788778383554">"Vypnout nebo zapnout zvuk mikrofonu"</item>
+    <item msgid="4199297950608622850">"Zobrazit zprávu"</item>
+    <item msgid="2527962435313398821">"Promítat média"</item>
+    <item msgid="5117506254221861929">"Aktivovat VPN"</item>
+    <item msgid="8291198322681891160">"Zápis tapety"</item>
+    <item msgid="7106921284621230961">"Struktura asistence"</item>
+    <item msgid="4496533640894624799">"Snímek obrazovky asistence"</item>
+    <item msgid="2598847264853993611">"Zjistit stav telefonu"</item>
+    <item msgid="9215610846802973353">"Přidat hlasovou zprávu"</item>
+    <item msgid="9186411956086478261">"Použít SIP"</item>
+    <item msgid="6884763100104539558">"Zpracovat odchozí hovor"</item>
+    <item msgid="125513972170580692">"Otisk prstu"</item>
+    <item msgid="2556071024281275619">"Tělesné senzory"</item>
+    <item msgid="617168514928339387">"Čtení zpráv informačních služeb"</item>
+    <item msgid="7134693570516523585">"Zkušební poloha"</item>
+    <item msgid="7224489175375229399">"Čtení úložiště"</item>
+    <item msgid="8472735063903258202">"Zápis úložiště"</item>
+    <item msgid="4069276819909595110">"Zapnout obrazovku"</item>
+    <item msgid="1228338896751121025">"Načíst účty"</item>
+    <item msgid="3181581793459233672">"Spustit na pozadí"</item>
+    <item msgid="2340936043025374076">"Hlasitost zvuků pro usnadnění přístupu"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Krátká"</item>
+    <item msgid="4816511817309094890">"Střední"</item>
+    <item msgid="8305084671259331134">"Dlouhá"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Výchozí"</item>
+    <item msgid="4147246073737933622">"Bezpatkové"</item>
+    <item msgid="3117680749167407907">"Bezpatkové zúžené"</item>
+    <item msgid="6529379119163117545">"Bezpatkové neproporcionální"</item>
+    <item msgid="1487203730637617924">"Patkové"</item>
+    <item msgid="4937790671987480464">"Patkové neproporcionální"</item>
+    <item msgid="4448481989108928248">"Neformální"</item>
+    <item msgid="4627069151979553527">"Kurzíva"</item>
+    <item msgid="6896773537705206194">"Kapitálky"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Velmi malé"</item>
+    <item msgid="5091603983404027034">"Malé"</item>
+    <item msgid="176844712416932112">"Normální"</item>
+    <item msgid="2784236342175159295">"Velké"</item>
+    <item msgid="218913203203160606">"Velmi velké"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Výchozí"</item>
+    <item msgid="6488643537808152001">"Žádné"</item>
+    <item msgid="552332815156010137">"Obrys"</item>
+    <item msgid="7187891159463789272">"Stín"</item>
+    <item msgid="8019330250538856521">"Zvýšený"</item>
+    <item msgid="8987385315647049787">"Snížený"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Použít výchozí"</item>
+    <item msgid="8611890312638868524">"Bílé na černém"</item>
+    <item msgid="5891360837786277638">"Černé na bílém"</item>
+    <item msgid="2798457065945456853">"Žluté na černém"</item>
+    <item msgid="5799049811524553967">"Žluté na modrém"</item>
+    <item msgid="3673930830658169860">"Vlastní"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN s protokolem PPTP"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN s předsdílenými klíči"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN s certifikáty"</item>
+    <item msgid="312397853907741968">"IPSec VPN s předsdílenými klíči a ověřením Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN s certifikáty a ověřením Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN s certifikáty a hybridním ověřením"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Žádný"</item>
+    <item msgid="1157046369795346308">"Příručka"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Odpojeno"</item>
+    <item msgid="8754480102834556765">"Inicializace…"</item>
+    <item msgid="3351334355574270250">"Připojování…"</item>
+    <item msgid="8303882153995748352">"Připojeno"</item>
+    <item msgid="9135049670787351881">"Časový limit"</item>
+    <item msgid="2124868417182583926">"Neúspěšné"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Zeptat se"</item>
+    <item msgid="7718817231348607934">"Nepovolit nikdy"</item>
+    <item msgid="8184570120217958741">"Vždy povolit"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Trvalé"</item>
+    <item msgid="167418068739176448">"Nejvyšší aktivita"</item>
+    <item msgid="4760813290195199773">"Důležité (v popředí)"</item>
+    <item msgid="2328684826817647595">"Důležité (na pozadí)"</item>
+    <item msgid="7746406490652867365">"Záloha"</item>
+    <item msgid="5597404364389196754">"Těžká váha"</item>
+    <item msgid="1290888779300174556">"Služba (spuštěno)"</item>
+    <item msgid="7241098542073939046">"Služba (restartuje se)"</item>
+    <item msgid="6610439017684111046">"Přijímač"</item>
+    <item msgid="7367606086319921117">"Plocha"</item>
+    <item msgid="3344660712396741826">"Poslední aktivita"</item>
+    <item msgid="5006559348883303865">"V mezipaměti (aktivita)"</item>
+    <item msgid="8633480732468137525">"V mezipaměti (klient aktivity)"</item>
+    <item msgid="6248998242443333892">"V mezipaměti (prázdné)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Šedozelená"</item>
+    <item msgid="3228505970082457852">"Modrá"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Nachová"</item>
+    <item msgid="5932337981182999919">"Růžová"</item>
+    <item msgid="5642914536624000094">"Červená"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Starší než 30 dní"</item>
+    <item msgid="8699273238891265610">"Starší než 60 dní"</item>
+    <item msgid="8346279419423837266">"Starší než 90 dní"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Zjistit automaticky"</item>
+    <item msgid="773943026484148895">"Považovat za měřenou síť"</item>
+    <item msgid="1008268820118852416">"Považovat za neměřenou síť"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Použít náhodně vygenerovanou adresu MAC"</item>
+    <item msgid="214234417308375326">"Použít adresu MAC zařízení"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ne"</item>
+    <item msgid="1930581185557754880">"Ano"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tmavý"</item>
+    <item msgid="5079453644557603349">"Světlý"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Vypnuto"</item>
+    <item msgid="4072198137051566919">"Ladění"</item>
+    <item msgid="2473005316958868509">"Podrobné"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Pouze plocha"</item>
+    <item msgid="1161026694891024702">"Automaticky"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA – preferováno"</item>
+    <item msgid="7581481130337402578">"Pouze GSM"</item>
+    <item msgid="8579197487913425819">"Pouze WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA – automaticky"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo – automaticky"</item>
+    <item msgid="4219607161971472471">"CDMA bez EvDo"</item>
+    <item msgid="7278975240951052041">"Pouze EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globální"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Pouze TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globální"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-cs/strings.xml b/tests/CarDeveloperOptions/res/values-cs/strings.xml
index ed2c4c7..d3caaf0 100644
--- a/tests/CarDeveloperOptions/res/values-cs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-cs/strings.xml
@@ -356,7 +356,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Okamžitě po režimu spánku, pokud odemknutí není udržováno pomocí agenta <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po přechodu do spánku, pokud odemknutí není udržováno funkcí <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Zobrazovat vlastníka na zamčené obrazovce"</string>
-    <string name="owner_info_settings_title" msgid="2537966178998339896">"Zpráva na zamčené obrazovce"</string>
+    <string name="owner_info_settings_title" msgid="2537966178998339896">"Zpráva na obr.uzamčení"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Aktivovat widgety"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Zakázáno administrátorem"</string>
     <string name="lockdown_settings_title" msgid="4534779922580115990">"Zobrazit možnost uzamčení"</string>
@@ -389,7 +389,7 @@
     <string name="decryption_settings_summary" product="default" msgid="7401802133199522441">"Telefon není šifrován"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"Zařízení je zašifrováno"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"Zařízení není šifrováno"</string>
-    <string name="lockscreen_settings_title" msgid="1221505938891948413">"Zobrazení na obrazovce uzamčení"</string>
+    <string name="lockscreen_settings_title" msgid="1221505938891948413">"Vzhled obrazovky uzamčení"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"Co zobrazit"</string>
     <string name="security_settings_summary" msgid="5210109100643223686">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="1783066617800041869">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Ochraňte svůj tablet pomocí zámku obrazovky, aby ho v případě ztráty či odcizení nemohl použít nikdo cizí. Zámek obrazovky budete také potřebovat, pokud si budete chtít nastavit ověření obličejem. Klepněte na Zrušit a poté si nastavte PIN nebo zvolte jiný typ zámku obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Ochraňte své zařízení pomocí zámku obrazovky, aby ho v případě ztráty či odcizení nemohl použít nikdo cizí. Zámek obrazovky budete také potřebovat, pokud si budete chtít nastavit ověření obličejem. Klepněte na Zrušit a poté si nastavte PIN nebo zvolte jiný typ zámku obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Ochraňte svůj telefon pomocí zámku obrazovky, aby ho v případě ztráty či odcizení nemohl použít nikdo cizí. Zámek obrazovky budete také potřebovat, pokud si budete chtít nastavit ověření obličejem. Klepněte na Zrušit a poté si nastavte PIN nebo zvolte jiný typ zámku obrazovky."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Přeskočit nastavení PINu?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Přeskočit nastavení hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Přeskočit nastavení gesta?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nastavit zámek obrazovky"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilní"</item>
+    <item msgid="6007360612667098926">"Pouze Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2317,9 +2319,9 @@
     <string name="controls_subtitle" msgid="6920199888882834620">"Upravit spotřebu energie"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"Zahrnuté balíčky"</string>
     <string name="battery_tip_summary_title" msgid="2750922152518825526">"Aplikace běží normálně"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"V telefonu dochází k běžnému využití baterie na pozadí"</string>
-    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"V tabletu dochází k běžnému využití baterie na pozadí"</string>
-    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"V zařízení dochází k běžnému využití baterie na pozadí"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"V telefonu dochází k běžnému využívání baterie na pozadí"</string>
+    <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"V tabletu dochází k běžnému využívání baterie na pozadí"</string>
+    <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"V zařízení dochází k běžnému využívání baterie na pozadí"</string>
     <string name="battery_tip_low_battery_title" msgid="6784043681672161175">"Nízká kapacita baterie"</string>
     <string name="battery_tip_low_battery_summary" msgid="9151355911381188604">"Baterie není schopna zajistit dobrou výdrž"</string>
     <string name="battery_tip_smart_battery_title" product="default" msgid="5517122075918038665">"Zvyšte životnost baterie telefonu"</string>
@@ -3180,7 +3182,7 @@
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"finanční aplikace, sms, oprávnění"</string>
     <string name="keywords_systemui_theme" msgid="9150908170417305866">"tmavý motiv"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"chyba"</string>
-    <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Ambientní displej, displej zámku obrazovky"</string>
+    <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Ambientní displej, vzhled obrazovky uzamčení"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"oznámení na obrazovce uzamčení, oznámení"</string>
     <string name="keywords_face_settings" msgid="4117345666006836599">"obličej"</string>
     <string name="keywords_fingerprint_settings" msgid="902902368701134163">"otisk prstu, přidat otisk prstu"</string>
@@ -3872,7 +3874,7 @@
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"Použití snímku obrazovky"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Asistenční aplikace bude mít přístup k obrazu na obrazovce"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Zablikání obrazovky"</string>
-    <string name="assist_flash_summary" msgid="6697095786317559129">"Když asistenční aplikace na obrazovce nebo snímku obrazovky narazí na text, okraje obrazovky zablikají"</string>
+    <string name="assist_flash_summary" msgid="6697095786317559129">"Když asistenční aplikace z obrazovky nebo snímku obrazovky získá text, okraje obrazovky zablikají"</string>
     <string name="assist_footer" msgid="7030121180457472165">"Asistenční aplikace vám může pomoci na základě informací na zobrazené obrazovce. Některé aplikace podporují Launcher i hlasový vstup a nabízejí integrovanou asistenci."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"Průměrné využití paměti"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"Maximální využití paměti"</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Bude zpomalovat telefon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Vynutit úplné měření GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Sledovat všechny konstelace a frekvence GNSS bez cyklického vypínání a zapínání"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Ladění přepínání uživatele"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Zobrazit podrobné informace během přepínání uživatele"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Povolit zahájení aktivity na pozadí"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Povolí veškerá zahájení aktivity na pozadí"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vždy zobrazit dialog o pádu"</string>
@@ -4488,7 +4492,7 @@
     <string name="empty_networks_list" msgid="5170020017144403884">"Žádná síť nebyla nalezena."</string>
     <string name="network_query_error" msgid="525635151099480463">"Nebyla nalezena žádná síť. Zkuste to znovu."</string>
     <string name="forbidden_network" msgid="8493827960968261182">"(zakázáno)"</string>
-    <string name="no_sim_card" msgid="3708682108324275635">"Není vložena SIM karta"</string>
+    <string name="no_sim_card" msgid="3708682108324275635">"Chybí SIM karta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="6899270534608086704">"Preferovaný režim sítě: preferováno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3688217977701592962">"Preferovaný režim sítě: pouze GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="745707973728245943">"Preferovaný režim sítě: pouze WCDMA"</string>
diff --git a/tests/CarDeveloperOptions/res/values-da-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-da-nokeys/strings.xml
new file mode 100644
index 0000000..a6e708e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-da-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Programadministration"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-da/arrays.xml b/tests/CarDeveloperOptions/res/values-da/arrays.xml
new file mode 100644
index 0000000..11985ea
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-da/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asien"</item>
+    <item msgid="6683489385344409742">"Australien"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"Alle"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekunder"</item>
+    <item msgid="772029947136115322">"30 sekunder"</item>
+    <item msgid="8743663928349474087">"1 minut"</item>
+    <item msgid="1506508631223164814">"2 minutter"</item>
+    <item msgid="8664703938127907662">"5 minutter"</item>
+    <item msgid="5827960506924849753">"10 minutter"</item>
+    <item msgid="6677424950124253938">"30 minutter"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Aldrig"</item>
+    <item msgid="2517785806387977252">"15 sekunder"</item>
+    <item msgid="6347954399441173672">"30 sekunder"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minutter"</item>
+    <item msgid="2788593551142462622">"5 minutter"</item>
+    <item msgid="8012672183888404961">"10 minutter"</item>
+    <item msgid="8271452751594598661">"30 minutter"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Straks"</item>
+    <item msgid="2038544972632026612">"5 sekunder"</item>
+    <item msgid="5558060663472279597">"15 sekunder"</item>
+    <item msgid="45341168505452037">"30 sekunder"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minutter"</item>
+    <item msgid="4376575879222393045">"5 minutter"</item>
+    <item msgid="811192536981678974">"10 minutter"</item>
+    <item msgid="7258394417241706272">"30 minutter"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Lille"</item>
+    <item msgid="591935967183159581">"Standard"</item>
+    <item msgid="1714184661981538355">"Stor"</item>
+    <item msgid="6195563047686707484">"Størst"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanner ..."</item>
+    <item msgid="5597394826455877834">"Opretter forbindelse..."</item>
+    <item msgid="5848277343965362748">"Godkender..."</item>
+    <item msgid="3391238031431440676">"Henter IP-adresse…"</item>
+    <item msgid="5257597310494000224">"Tilsluttet"</item>
+    <item msgid="8472497592913050396">"Sat på pause"</item>
+    <item msgid="1228072488815999109">"Afbryder ..."</item>
+    <item msgid="7253087004422991731">"Afbrudt"</item>
+    <item msgid="4169850917304751227">"Mislykkedes"</item>
+    <item msgid="6266658166690831131">"Blokeret"</item>
+    <item msgid="4517230805854909775">"Undgår midlertidigt dårlig forbindelse"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Søger..."</item>
+    <item msgid="8058143476674427024">"Opretter forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="7547609081339573756">"Godkender med <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Forbundet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Sat på pause"</item>
+    <item msgid="4133290864821295785">"Afbryder fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="3980154971187953257">"Afbrudt"</item>
+    <item msgid="2847316776634969068">"Mislykkedes"</item>
+    <item msgid="4390990424746035383">"Blokeret"</item>
+    <item msgid="3618248791367063949">"Undgår midlertidigt dårlig forbindelse"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Tryk på knappen"</item>
+    <item msgid="7401896200768713930">"Pinkode fra din vens enhed"</item>
+    <item msgid="4526848028011846710">"Pinkode fra denne enhed"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Tilsluttet"</item>
+    <item msgid="983792611851499732">"Inviteret"</item>
+    <item msgid="5438273405428201793">"Mislykkedes"</item>
+    <item msgid="4646663015449312554">"Tilgængeligt"</item>
+    <item msgid="3230556734162006146">"Uden for rækkevidde"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutter"</item>
+    <item msgid="2759776603549270587">"5 minutter"</item>
+    <item msgid="167772676068860015">"1 time"</item>
+    <item msgid="5985477119043628504">"Aldrig timeout"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Brug systemstandarden <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dårlig"</item>
+    <item msgid="7882129634982603782">"Dårlig"</item>
+    <item msgid="6457357501905996224">"Rimelig"</item>
+    <item msgid="405271628162918841">"God"</item>
+    <item msgid="999948812884919584">"Fremragende"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"De seneste 30 dage"</item>
+    <item msgid="3211287705232736964">"Angiv cyklus for brug..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Brugstid"</item>
+    <item msgid="2784401352592276015">"Sidst anvendt"</item>
+    <item msgid="249854287216326349">"Navn på app"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Intet"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ingen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Intet"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statisk"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Intet"</item>
+    <item msgid="1464741437353223198">"Brugervejledning"</item>
+    <item msgid="5793600062487886090">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Intet"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP eller CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ikke angivet"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EV-DO_B"</item>
+    <item msgid="3440758673769932256">"EV-DO_A"</item>
+    <item msgid="1782525731958596741">"EV-DO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ingen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Intern lagerplads på enheden"</item>
+    <item msgid="3186681694079967527">"SD-kort, der kan fjernes"</item>
+    <item msgid="6902033473986647035">"Lad systemet vælge"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Placering"</item>
+    <item msgid="6842381562497597649">"Personlig"</item>
+    <item msgid="3966700236695683444">"Beskeder"</item>
+    <item msgid="8563996233342430477">"Medier"</item>
+    <item msgid="5323851085993963783">"Enhed"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"omtrentlig placering"</item>
+    <item msgid="1830619568689922920">"nøjagtig placering"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrer"</item>
+    <item msgid="8632513128515114092">"læs kontakter"</item>
+    <item msgid="3741042113569620272">"rediger kontakter"</item>
+    <item msgid="4204420969709009931">"læse opkaldsliste"</item>
+    <item msgid="2260380357119423209">"rediger opkaldslisten"</item>
+    <item msgid="6550710385014530934">"læs kalenderen"</item>
+    <item msgid="3575906174264853951">"rediger kalenderen"</item>
+    <item msgid="4319843242568057174">"Wi-Fi-søgning"</item>
+    <item msgid="2981791890467303819">"notifikation"</item>
+    <item msgid="6617825156152476692">"mobilscanning"</item>
+    <item msgid="8865260890611559753">"ring til telefon"</item>
+    <item msgid="3254999273961542982">"læs sms"</item>
+    <item msgid="7711446453028825171">"skriv sms"</item>
+    <item msgid="6123238544099198034">"modtag sms"</item>
+    <item msgid="838342167431596036">"modtag nød-sms"</item>
+    <item msgid="8554432731560956686">"modtag mms"</item>
+    <item msgid="7464863464299515059">"modtag WAP-push"</item>
+    <item msgid="310463075729606765">"send sms"</item>
+    <item msgid="7338021933527689514">"læs ICC-sms"</item>
+    <item msgid="6130369335466613036">"skriv ICC-sms"</item>
+    <item msgid="6536865581421670942">"skift indstillinger"</item>
+    <item msgid="4547203129183558973">"tegn ovenpå"</item>
+    <item msgid="9080347512916542840">"notifikationer om adgang"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"optag lyd"</item>
+    <item msgid="9182794235292595296">"afspil lyd"</item>
+    <item msgid="8760743229597702019">"læs udklipsholder"</item>
+    <item msgid="2266923698240538544">"rediger udklipsholder"</item>
+    <item msgid="1801619438618539275">"medieknapper"</item>
+    <item msgid="31588119965784465">"lydfokusering"</item>
+    <item msgid="7565226799008076833">"generel lydstyrke"</item>
+    <item msgid="5420704980305018295">"lydstyrke for stemme"</item>
+    <item msgid="5797363115508970204">"lydstyrke for ringetone"</item>
+    <item msgid="8233154098550715999">"lydstyrke for medier"</item>
+    <item msgid="5196715605078153950">"lydstyrke for alarmer"</item>
+    <item msgid="394030698764284577">"lydstyrke for notifikationer"</item>
+    <item msgid="8952898972491680178">"lydstyrke for bluetooth"</item>
+    <item msgid="8506227454543690851">"lås ikke"</item>
+    <item msgid="1108160036049727420">"overvåg placering"</item>
+    <item msgid="1496205959751719491">"overvåg placering med højt strømforbrug"</item>
+    <item msgid="3776296279910987380">"hent brugsstatistik"</item>
+    <item msgid="8827100324471975602">"slå mikrofonlyd til/fra"</item>
+    <item msgid="6880736730520126864">"vis toast"</item>
+    <item msgid="4933375960222609935">"medieprojektion"</item>
+    <item msgid="8357907018938895462">"aktivér VPN"</item>
+    <item msgid="8143812849911310973">"skriv til baggrund"</item>
+    <item msgid="6266277260961066535">"forslagsstruktur"</item>
+    <item msgid="7715498149883482300">"forslagsscreenshot"</item>
+    <item msgid="4046679376726313293">"læse telefonstatus"</item>
+    <item msgid="6329507266039719587">"tilføj telefonsvarer"</item>
+    <item msgid="7692440726415391408">"brug SIP"</item>
+    <item msgid="8572453398128326267">"håndter udgående opkald"</item>
+    <item msgid="7775674394089376306">"fingeraftryk"</item>
+    <item msgid="3182815133441738779">"kropssensorer"</item>
+    <item msgid="2793100005496829513">"læs Cell Broadcast-meddelelser"</item>
+    <item msgid="2633626056029384366">"imiteret placering"</item>
+    <item msgid="8356842191824684631">"læs lager"</item>
+    <item msgid="5671906070163291500">"skriv til lager"</item>
+    <item msgid="2791955098549340418">"tænd skærmen"</item>
+    <item msgid="5599435119609178367">"hent konti"</item>
+    <item msgid="1165623660533024666">"kør i baggrunden"</item>
+    <item msgid="6423861043647911030">"lydstyrke for hjælpefunktioner"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Placering"</item>
+    <item msgid="6656077694190491067">"Placering"</item>
+    <item msgid="8790228218278477369">"Placering"</item>
+    <item msgid="7836406246005211990">"Vibrer"</item>
+    <item msgid="3951439024549922598">"Læs kontakter"</item>
+    <item msgid="8802152411647068">"Rediger kontakter"</item>
+    <item msgid="229544934599698735">"Læs opkaldslisten"</item>
+    <item msgid="7396102294405899613">"Rediger opkaldslisten"</item>
+    <item msgid="3597797992398484655">"Læs kalenderen"</item>
+    <item msgid="2705975774250907343">"Rediger kalenderen"</item>
+    <item msgid="4668747371441932697">"Placering"</item>
+    <item msgid="1487578921720243646">"Send notifikation"</item>
+    <item msgid="4636080349724146638">"Placering"</item>
+    <item msgid="673510900286463926">"Ring til telefon"</item>
+    <item msgid="542083422784609790">"Læs sms/mms"</item>
+    <item msgid="1033780373029588436">"Skriv sms/mms"</item>
+    <item msgid="5647111115517787488">"Modtag sms/mms"</item>
+    <item msgid="8591105601108455893">"Modtag sms/mms"</item>
+    <item msgid="7730995008517841903">"Modtag sms/mms"</item>
+    <item msgid="2613033109026626086">"Modtag sms/mms"</item>
+    <item msgid="3037159047591081136">"Send sms/mms"</item>
+    <item msgid="4726682243833913568">"Læs sms/mms"</item>
+    <item msgid="6555678522277865572">"Skriv sms/mms"</item>
+    <item msgid="6981734935578130884">"Skift indstillinger"</item>
+    <item msgid="8705854389991425629">"Tegn ovenpå"</item>
+    <item msgid="5861356020344153651">"Notifikationer om adgang"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Optag lyd"</item>
+    <item msgid="4516840825756409490">"Afspil lyd"</item>
+    <item msgid="6811712502798183957">"Læs udklipsholder"</item>
+    <item msgid="2780369012602289114">"Rediger udklipsholder"</item>
+    <item msgid="2331359440170850868">"Medieknapper"</item>
+    <item msgid="6133599737122751231">"Lydfokusering"</item>
+    <item msgid="6844485713404805301">"Generel lydstyrke"</item>
+    <item msgid="1600379420669104929">"Lydstyrke for stemme"</item>
+    <item msgid="6296768210470214866">"Lydstyrke for ringetone"</item>
+    <item msgid="510690696071629241">"Lydstyrke for medier"</item>
+    <item msgid="406861638631430109">"Lydstyrke for alarmer"</item>
+    <item msgid="4715864795872233884">"Lydstyrke for notifikationer"</item>
+    <item msgid="2311478519251301183">"Lydstyrke for bluetooth"</item>
+    <item msgid="5133991377896747027">"Lås ikke"</item>
+    <item msgid="2464189519136248621">"Placering"</item>
+    <item msgid="2062677934050803037">"Placering"</item>
+    <item msgid="1735171933192715957">"Hent brugsstatistik"</item>
+    <item msgid="1014093788778383554">"Slå mikrofonlyd til/fra"</item>
+    <item msgid="4199297950608622850">"Vis toast"</item>
+    <item msgid="2527962435313398821">"Projicer medie"</item>
+    <item msgid="5117506254221861929">"Aktivér VPN"</item>
+    <item msgid="8291198322681891160">"Skriv baggrund"</item>
+    <item msgid="7106921284621230961">"Forslagsstruktur"</item>
+    <item msgid="4496533640894624799">"Forslagsscreenshot"</item>
+    <item msgid="2598847264853993611">"Læs telefonstatus"</item>
+    <item msgid="9215610846802973353">"Tilføj telefonsvarer"</item>
+    <item msgid="9186411956086478261">"Brug SIP"</item>
+    <item msgid="6884763100104539558">"Håndter udgående opkald"</item>
+    <item msgid="125513972170580692">"Fingeraftryk"</item>
+    <item msgid="2556071024281275619">"Kropssensorer"</item>
+    <item msgid="617168514928339387">"Læs Cell Broadcast-meddelelser"</item>
+    <item msgid="7134693570516523585">"Imiteret placering"</item>
+    <item msgid="7224489175375229399">"Læs lager"</item>
+    <item msgid="8472735063903258202">"Skriv til lager"</item>
+    <item msgid="4069276819909595110">"Tænd skærmen"</item>
+    <item msgid="1228338896751121025">"Hent konti"</item>
+    <item msgid="3181581793459233672">"Kør i baggrunden"</item>
+    <item msgid="2340936043025374076">"Lydstyrke for hjælpefunktioner"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kort"</item>
+    <item msgid="4816511817309094890">"Middel"</item>
+    <item msgid="8305084671259331134">"Lang"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Standard"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif, kondenseret"</item>
+    <item msgid="6529379119163117545">"Sans-serif, enkelt tegnafstand"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif, enkelt tegnafstand"</item>
+    <item msgid="4448481989108928248">"Uformel"</item>
+    <item msgid="4627069151979553527">"Kursiv"</item>
+    <item msgid="6896773537705206194">"Små versaler"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Meget lille"</item>
+    <item msgid="5091603983404027034">"Lille"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Stor"</item>
+    <item msgid="218913203203160606">"Meget stor"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Standard"</item>
+    <item msgid="6488643537808152001">"Intet"</item>
+    <item msgid="552332815156010137">"Omrids"</item>
+    <item msgid="7187891159463789272">"Dropskygge"</item>
+    <item msgid="8019330250538856521">"Hævet"</item>
+    <item msgid="8987385315647049787">"Sænket skrift"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Anvend appstandarder"</item>
+    <item msgid="8611890312638868524">"Hvidt på sort"</item>
+    <item msgid="5891360837786277638">"Sort på hvidt"</item>
+    <item msgid="2798457065945456853">"Gult på sort"</item>
+    <item msgid="5799049811524553967">"Gult på blåt"</item>
+    <item msgid="3673930830658169860">"Tilpasset"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP-VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPsec VPN med forhåndsdelte nøgler"</item>
+    <item msgid="6128519070545038358">"L2TP/IPsec VPN med certifikater"</item>
+    <item msgid="312397853907741968">"IPSec VPN med forhåndsdelte nøgler og Xauth- godkendelse"</item>
+    <item msgid="3319427315593649917">"IPSec VPN med certifikater og Xauth-godkendelse"</item>
+    <item msgid="8258927774145391041">"IPSec VPN med certifikater og hybridgodkendelse"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ingen"</item>
+    <item msgid="1157046369795346308">"Brugervejledning"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Afbrudt"</item>
+    <item msgid="8754480102834556765">"Initialiserer..."</item>
+    <item msgid="3351334355574270250">"Opretter forbindelse..."</item>
+    <item msgid="8303882153995748352">"Tilsluttet"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Mislykkedes"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Spørg"</item>
+    <item msgid="7718817231348607934">"Tillad aldrig"</item>
+    <item msgid="8184570120217958741">"Tillad altid"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Vedvarende"</item>
+    <item msgid="167418068739176448">"Topaktivitet"</item>
+    <item msgid="4760813290195199773">"Vigtigt (forgrund)"</item>
+    <item msgid="2328684826817647595">"Vigtigt (baggrund)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Sværvægt"</item>
+    <item msgid="1290888779300174556">"Tjeneste (kører)"</item>
+    <item msgid="7241098542073939046">"Tjeneste (genstartes)"</item>
+    <item msgid="6610439017684111046">"Modtager"</item>
+    <item msgid="7367606086319921117">"Startskærm"</item>
+    <item msgid="3344660712396741826">"Seneste aktivitet"</item>
+    <item msgid="5006559348883303865">"Cachelagret (aktivitet)"</item>
+    <item msgid="8633480732468137525">"Cachelagret (aktivitetsklient)"</item>
+    <item msgid="6248998242443333892">"Cachelagret (tom)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Turkis"</item>
+    <item msgid="3228505970082457852">"Blå"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Lilla"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Rød"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Mere end 30 dage gamle"</item>
+    <item msgid="8699273238891265610">"Mere end 60 dage gamle"</item>
+    <item msgid="8346279419423837266">"Mere end 90 dage gamle"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Find automatisk"</item>
+    <item msgid="773943026484148895">"Håndter som forbrugsbaseret netværk"</item>
+    <item msgid="1008268820118852416">"Håndter som ubegrænset netværk"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Anvend tilfældig MAC (standard)"</item>
+    <item msgid="214234417308375326">"Anvend enhedens MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nej"</item>
+    <item msgid="1930581185557754880">"Ja"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Mørkt"</item>
+    <item msgid="5079453644557603349">"Lyst"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Fra"</item>
+    <item msgid="4072198137051566919">"Fejlretning"</item>
+    <item msgid="2473005316958868509">"Omfattende"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Kun hjemme"</item>
+    <item msgid="1161026694891024702">"Automatisk"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA foretrækkes"</item>
+    <item msgid="7581481130337402578">"Kun GSM"</item>
+    <item msgid="8579197487913425819">"Kun WCDMA"</item>
+    <item msgid="8465243227505412498">"Automatisk GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automatisk CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA uden EvDo"</item>
+    <item msgid="7278975240951052041">"Kun EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA+LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Kun TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-da/strings.xml b/tests/CarDeveloperOptions/res/values-da/strings.xml
index a2c527a..beadd32 100644
--- a/tests/CarDeveloperOptions/res/values-da/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-da/strings.xml
@@ -33,10 +33,10 @@
     <string name="header_category_system" msgid="4045988717359334410">"System"</string>
     <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"Aktivér dataforbindelse"</string>
     <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"Deaktiver dataforbindelse"</string>
-    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE er aktiveret"</string>
-    <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Videoopkald aktiveret"</string>
-    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Wi-Fi-opkald aktiveret"</string>
-    <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/tilstedeværelse aktiveret"</string>
+    <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE er provisioneret"</string>
+    <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"Videoopkald er provisioneret"</string>
+    <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"Wi-Fi-opkald er provisioneret"</string>
+    <string name="eab_provisioned_switch_string" msgid="3921103790584572430">"EAB/tilstedeværelse er provisioneret"</string>
     <string name="cbrs_data_switch_string" msgid="9120919504831536183">"CBRS-data"</string>
     <string name="dsds_switch_string" msgid="2606482598327613264">"Aktivér DSDS"</string>
     <string name="dsds_dialog_title" msgid="3279829304547130217">"Vil du genstarte enheden?"</string>
@@ -253,8 +253,8 @@
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="5419085128792417589">"USB-lageret er ikke monteret."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="5831286239151349794">"Der er intet SD-kort."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="2392868635606041278">"Ledige bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="5888349723543445382">"USB-lageret bruges som masselagringsenhed."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="637014061735266364">"SD-kortet bruges som masselagringsenhed."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="5888349723543445382">"USB-lageret bruges som masselagerenhed."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="637014061735266364">"SD-kortet bruges som masselagerenhed."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1489916516292644696">"Du kan nu fjerne USB-lageret."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="6250598657624241686">"Du kan nu fjerne SD-kortet."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="4694941967864756404">"USB-lager fjernet under brug!"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Beskyt din tablet med en skærmlås, så ingen kan bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtsgodkendelse. Tryk på Annuller, og angiv derefter en PIN-kode, eller vælg en anden type skærmlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Beskyt din enhed med en skærmlås, så ingen kan bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtsgodkendelse. Tryk på Annuller, og angiv derefter en PIN-kode, eller vælg en anden type skærmlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Beskyt din telefon med en skærmlås, så ingen kan bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtsgodkendelse. Tryk på Annuller, og angiv derefter en PIN-kode, eller vælg en anden type skærmlås."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Spring SIM-konfiguration over?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Spring adgangskodekonf. over?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Spring mønsterkonf. over?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfigurer skærmlås"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Kun Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1199,16 +1201,16 @@
     <string name="auto_brightness_description" msgid="8209140379089535411">"Skærmens lysstyrke tilpasses automatisk på baggrund af dine omgivelser og dine aktiviteter. Du kan flytte skyderen manuelt for at hjælpe Automatisk lysstyrke med at lære dine præferencer."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"Skærmens hvidbalance"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Opmærksom skærm"</string>
-    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Aktiveret/Skærmen slukker ikke, når du kigger på den"</string>
+    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Aktiveret. Skærmen slukker ikke, når du kigger på den"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Fra"</string>
-    <string name="adaptive_sleep_description" msgid="812673735459170009">"Forhindrer at din skærm slukker, når du kigger på den."</string>
+    <string name="adaptive_sleep_description" msgid="812673735459170009">"Holder din skærm tændt, så længe du kigger på den."</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Den opmærksomme skærm bruger frontkameraet til at tjekke, om der er nogen, der kigger på skærmen. Funktionen fungerer kun lokalt på enheden, og den gemmer ikke billeder eller sender billeder til Google."</string>
     <string name="night_display_title" msgid="1305002424893349814">"Nattelys"</string>
     <string name="night_display_text" msgid="5330502493684652527">"Nattelys gør farverne på din skærm mere gullige. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn."</string>
     <string name="night_display_auto_mode_title" msgid="8493573087102481588">"Tidsplan"</string>
     <string name="night_display_auto_mode_never" msgid="2897444637217807088">"Ingen"</string>
     <string name="night_display_auto_mode_custom" msgid="1400891076453963151">"Aktiveres på valgt tidspunkt"</string>
-    <string name="night_display_auto_mode_twilight" msgid="4000162110017520674">"Aktiveres fra sol ned til sol op"</string>
+    <string name="night_display_auto_mode_twilight" msgid="4000162110017520674">"Aktiveres fra solnedgang til solopgang"</string>
     <string name="night_display_start_time_title" msgid="1069255169673371077">"Starttidspunkt"</string>
     <string name="night_display_end_time_title" msgid="2760793157124245911">"Sluttidspunkt"</string>
     <string name="night_display_status_title" msgid="1727020934735770319">"Status"</string>
@@ -1232,7 +1234,7 @@
     <string name="screen_timeout_title" msgid="150117777762864112">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="8644192861778491060">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
     <string name="wallpaper_settings_title" msgid="347390905813529607">"Baggrund"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Stilarter og baggrunde"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"Stil og baggrunde"</string>
     <string name="wallpaper_settings_summary_default" msgid="2626880032742784599">"Standard"</string>
     <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"Tilpasset"</string>
     <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"Skift baggrund"</string>
@@ -2090,7 +2092,7 @@
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"Vibration ved berøring"</string>
     <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"Brug tjenesten"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"Brug farvekorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Brug tekster"</string>
+    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Brug undertekster"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"Fortsæt"</string>
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Høreapparater"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Der er ikke tilknyttet nogen høreapparater"</string>
@@ -2106,7 +2108,7 @@
     <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"Fra"</string>
     <string name="accessibility_summary_state_stopped" msgid="3170264683616172746">"Kører ikke. Tryk for at få flere oplysninger."</string>
     <string name="accessibility_description_state_stopped" msgid="7666178628053039493">"Denne tjeneste fungerer ikke korrekt."</string>
-    <string name="enable_quick_setting" msgid="1580451877998661255">"Vis i Hurtige indstillinger"</string>
+    <string name="enable_quick_setting" msgid="1580451877998661255">"Vis i Kvikmenu"</string>
     <string name="daltonizer_type" msgid="6890356081036026791">"Korrektionstilstand"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="3810676455925024813">
       <item quantity="one">Ekstremt lille forsinkelse (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -2327,7 +2329,7 @@
     <string name="restricted_app_time_summary" msgid="5205881852523135226">"Blev begrænset <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="restricted_app_detail_footer" msgid="482460517275754465">"Disse apps har brugt batteri i baggrunden. Begrænsede apps fungerer muligvis ikke korrekt, og notifikationer kan være forsinkede."</string>
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"Brug batteriadministration"</string>
-    <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Registrer, nå apps dræner batteriet"</string>
+    <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Registrer, når apps dræner batteriet"</string>
     <string name="battery_manager_on" msgid="5626982529932239656">"Til/Registrerer, når apps dræner batteriet"</string>
     <string name="battery_manager_off" msgid="9114027524232450371">"Fra"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
@@ -2411,7 +2413,7 @@
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"Denne app har muligvis indstillinger, der kan reducere batteriforbruget"</string>
     <string name="battery_desc_users" msgid="3736510265433457165">"Brugerens batteriforbrug"</string>
     <string name="battery_desc_unaccounted" msgid="1713437127406964501">"Strømforbrug, diverse"</string>
-    <string name="battery_msg_unaccounted" msgid="5888813672440667255">"Batteriforbrug er en tilnærmet beregning af strømforbruget og omfatter ikke alle årsager til afladning af batteriet. \"Diverse\" er forskellen mellem den tilnærmede beregning af strømforbruget og det faktiske forbrug, der er registreret for batteriet."</string>
+    <string name="battery_msg_unaccounted" msgid="5888813672440667255">"Batteriforbrug er en tilnærmet beregning af strømforbruget og omfatter ikke alle årsager til, at batteriet drænes. \"Diverse\" er forskellen mellem den tilnærmede beregning af strømforbruget og det faktiske forbrug, der er registreret for batteriet."</string>
     <string name="battery_desc_overcounted" msgid="1161323884612252420">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="4464040534945398122">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="battery_used_for" msgid="5550036547864960627">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
@@ -2588,7 +2590,7 @@
     <string name="sync_failed" msgid="3142663443336915051">"Synkroniseringen mislykkedes"</string>
     <string name="sync_active" msgid="1112604707180806364">"Synkronisering er aktiveret"</string>
     <string name="account_sync_settings_title" msgid="3344538161552327748">"Synkronisering"</string>
-    <string name="sync_is_failing" msgid="8284618104132302644">"Der er i øjeblikket problemer med synkroniseringen. Den etableres igen om lidt."</string>
+    <string name="sync_is_failing" msgid="8284618104132302644">"Der er i øjeblikket problemer med synkroniseringen. Den fortsætter om et øjeblik."</string>
     <string name="add_account_label" msgid="4461298847239641874">"Tilføj konto"</string>
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"Arbejdsprofilen er endnu ikke tilgængelig"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"Arbejdsprofil"</string>
@@ -3039,7 +3041,7 @@
     <string name="account_dashboard_title" msgid="4734300939532555885">"Konti"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"Ingen konti er tilføjet"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"Standardapps"</string>
-    <string name="system_dashboard_summary" msgid="6582464466735779394">"Sprog, bevægelser, klokkeslæt, bckup"</string>
+    <string name="system_dashboard_summary" msgid="6582464466735779394">"Sprog, bevægelser, klokkeslæt, backup"</string>
     <string name="search_results_title" msgid="4160717656435503940">"Indstillinger"</string>
     <string name="keywords_wifi" msgid="8477688080895466846">"wifi, wi-fi, netværksforbindelse, internet, trådløs, data, wi fi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"Wi‑Fi-notifikation, wifi-notifikation"</string>
@@ -3703,7 +3705,7 @@
     <string name="high_power_on" msgid="3573501822510580334">"Ikke-optimeret"</string>
     <string name="high_power_off" msgid="5906679734326490426">"Optimerer batteriforbruget"</string>
     <string name="high_power_system" msgid="739584574711292753">"Batterioptimering er ikke tilgængelig"</string>
-    <string name="high_power_desc" msgid="333756885680362741">"Undlad at anvende batterioptimering. Batteriet aflades muligvis hurtigere."</string>
+    <string name="high_power_desc" msgid="333756885680362741">"Undlad at anvende batterioptimering. Dette kan dræne batteriet hurtigere."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"Vil du give appen tilladelse til altid at køre i baggrunden?"</string>
     <string name="high_power_prompt_body" msgid="8067395096053552289">"Hvis du giver <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til altid at køre i baggrunden, kan det reducere batteritiden. \n\nDu kan ændre dette senere under Indstillinger &gt; Apps og notifikationer."</string>
     <string name="battery_summary" msgid="4345690800899981339">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> brugt siden sidste fulde opladning"</string>
@@ -3786,7 +3788,7 @@
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Alle Forstyr ikke-regler, der er oprettet af denne app, fjernes."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"Undlad at optimere"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimer"</string>
-    <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"Kan medføre, at batteriet aflades hurtigere. Appen forhindres ikke længere i at bruge batteri i baggrunden."</string>
+    <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"Dette kan dræne batteriet hurtigere. Appen forhindres ikke længere i at bruge batteri i baggrunden."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"Anbefales for længere batteritid"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"Vil du tillade, at <xliff:g id="APP">%s</xliff:g> ignorerer batterioptimeringer?"</string>
     <string name="app_list_preference_none" msgid="7100409177446935028">"Ingen"</string>
@@ -3883,7 +3885,7 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Hotspot er aktiveret"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"Flytilstand er slået til"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Ingen tilgængelige netværk"</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"Forstyr ikke er aktiveret."</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"Forstyr ikke er aktiveret"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Telefonen er på lydløs"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Med undtagelser"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"Batterisparefunktion er slået til"</string>
@@ -4071,7 +4073,7 @@
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Vælg tema"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Denne indstilling gælder også for apps"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Understøttede apps skifter også til mørkt tema"</string>
-    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Felter for udviklere til Hurtige indstillinger"</string>
+    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Felter for udviklere til Kvikmenu"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Sporing af Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Sensorer er slået fra"</string>
     <string name="managed_profile_settings_title" msgid="4340409321523532402">"Indstillinger for arbejdsprofil"</string>
@@ -4117,7 +4119,7 @@
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"Tryk to gange for at tjekke din tablet"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"Tryk to gange for at tjekke enheden"</string>
     <string name="ambient_display_summary" msgid="4882910328216411109">"Tryk to gange på skærmen for at se klokkeslæt, notifikationer og andre oplysninger."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Løft for at tjekke telefon"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Løft for at tjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="1555456400210301959">"Løft for at tjekke din tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="2480126522988135037">"Løft for at tjekke enheden"</string>
     <string name="ambient_display_wake_screen_title" msgid="3376988352851077102">"Aktivering af skærm"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Den gør din telefon langsommere"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Gennemtving fuld GNSS-måling"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Registrer alle GNSS-konstellationer og -frekvenser uden opgavegennemløb"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Fejlret ved brugerskift"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Se detaljerede oplysninger under brugerskift"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Tillad opstart af aktiviteter i baggrunden"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Tillader alle opstarter af aktiviteter i baggrunden"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vis altid dialogboks med nedbrud"</string>
@@ -4436,7 +4440,7 @@
     <string name="mobile_network_mode_error" msgid="6818434186286086554">"Ugyldig netværkstilstand <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorer."</string>
     <string name="mobile_network_apn_title" msgid="5628635067747404382">"Adgangspunkter"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"Utilgængelig ved forbindelse til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
-    <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Helbredoplysninger, kontakter til nødsituationer"</string>
+    <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Helbredoplysninger, kontaktpersoner ved nødsituationer"</string>
     <string name="see_more" msgid="7463940160389802632">"Se mere"</string>
     <string name="see_less" msgid="3718892257002813387">"Se mindre"</string>
     <string name="network_connection_request_dialog_title" msgid="3150489262902506588">"Enhed, der skal bruges sammen med <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
@@ -4475,7 +4479,7 @@
     <string name="search_bar_account_avatar_content_description" msgid="947628881535053409"></string>
     <string name="permission_bar_chart_empty_text" msgid="5893326513700540130">"0 apps har anvendt tilladelser"</string>
     <string name="permission_bar_chart_title" msgid="874145405516650073">"Brug af tilladelse i de sidste 24 timer"</string>
-    <string name="permission_bar_chart_details" msgid="942094334321073927">"Se alt i betjeningspanelet"</string>
+    <string name="permission_bar_chart_details" msgid="942094334321073927">"Se alt i kontrolpanelet"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="2831305719356562097">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> app</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> apps</item>
diff --git a/tests/CarDeveloperOptions/res/values-de-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-de-nokeys/strings.xml
new file mode 100644
index 0000000..2a94f70
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-de-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Apps verwalten"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-de/arrays.xml b/tests/CarDeveloperOptions/res/values-de/arrays.xml
new file mode 100644
index 0000000..4ee4f1b
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-de/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asien"</item>
+    <item msgid="6683489385344409742">"Australien"</item>
+    <item msgid="5194868215515664953">"Pazifik"</item>
+    <item msgid="7044520255415007865">"Alle"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 Sekunden"</item>
+    <item msgid="772029947136115322">"30 Sekunden"</item>
+    <item msgid="8743663928349474087">"1 Minute"</item>
+    <item msgid="1506508631223164814">"2 Minuten"</item>
+    <item msgid="8664703938127907662">"5 Minuten"</item>
+    <item msgid="5827960506924849753">"10 Minuten"</item>
+    <item msgid="6677424950124253938">"30 Minuten"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nie"</item>
+    <item msgid="2517785806387977252">"15 Sekunden"</item>
+    <item msgid="6347954399441173672">"30 Sekunden"</item>
+    <item msgid="4858305253279921789">"1 Minute"</item>
+    <item msgid="8109273437140044073">"2 Minuten"</item>
+    <item msgid="2788593551142462622">"5 Minuten"</item>
+    <item msgid="8012672183888404961">"10 Minuten"</item>
+    <item msgid="8271452751594598661">"30 Minuten"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Sofort"</item>
+    <item msgid="2038544972632026612">"5 Sekunden"</item>
+    <item msgid="5558060663472279597">"Nach 15 Sekunden"</item>
+    <item msgid="45341168505452037">"30 Sekunden"</item>
+    <item msgid="227647485917789272">"1 Minute"</item>
+    <item msgid="3367011891231217504">"2 Minuten"</item>
+    <item msgid="4376575879222393045">"Nach 5 Minuten"</item>
+    <item msgid="811192536981678974">"Nach 10 Minuten"</item>
+    <item msgid="7258394417241706272">"30 Minuten"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Klein"</item>
+    <item msgid="591935967183159581">"Standard"</item>
+    <item msgid="1714184661981538355">"Groß"</item>
+    <item msgid="6195563047686707484">"Am größten"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scan läuft…"</item>
+    <item msgid="5597394826455877834">"Verbindung wird hergestellt..."</item>
+    <item msgid="5848277343965362748">"Authentifizierung..."</item>
+    <item msgid="3391238031431440676">"IP-Adresse wird abgerufen..."</item>
+    <item msgid="5257597310494000224">"Verbunden"</item>
+    <item msgid="8472497592913050396">"Angehalten"</item>
+    <item msgid="1228072488815999109">"Verbindung wird getrennt..."</item>
+    <item msgid="7253087004422991731">"Nicht verbunden"</item>
+    <item msgid="4169850917304751227">"Fehlgeschlagen"</item>
+    <item msgid="6266658166690831131">"Blockiert"</item>
+    <item msgid="4517230805854909775">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Scannen..."</item>
+    <item msgid="8058143476674427024">"Verbindung mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird hergestellt..."</item>
+    <item msgid="7547609081339573756">"Authentifizierung bei <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"IP-Adresse wird von <xliff:g id="NETWORK_NAME">%1$s</xliff:g> abgerufen..."</item>
+    <item msgid="3283243151651124831">"Verbunden mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Angehalten"</item>
+    <item msgid="4133290864821295785">"Verbindung mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird getrennt..."</item>
+    <item msgid="3980154971187953257">"Nicht verbunden"</item>
+    <item msgid="2847316776634969068">"Fehlgeschlagen"</item>
+    <item msgid="4390990424746035383">"Blockiert"</item>
+    <item msgid="3618248791367063949">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Push-Taste"</item>
+    <item msgid="7401896200768713930">"PIN von Peer-Gerät"</item>
+    <item msgid="4526848028011846710">"PIN von diesem Gerät"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Verbunden"</item>
+    <item msgid="983792611851499732">"Eingeladen"</item>
+    <item msgid="5438273405428201793">"Fehlgeschlagen"</item>
+    <item msgid="4646663015449312554">"Verfügbar"</item>
+    <item msgid="3230556734162006146">"Außerhalb des Bereichs"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 Minuten"</item>
+    <item msgid="2759776603549270587">"5 Minuten"</item>
+    <item msgid="167772676068860015">"1 Stunde"</item>
+    <item msgid="5985477119043628504">"Keine Zeitüberschreitung"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Systemstandard verwenden: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Schwach"</item>
+    <item msgid="7882129634982603782">"Schwach"</item>
+    <item msgid="6457357501905996224">"Ausreichend"</item>
+    <item msgid="405271628162918841">"Gut"</item>
+    <item msgid="999948812884919584">"Sehr gut"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Letzte 30 Tage"</item>
+    <item msgid="3211287705232736964">"Nutzungszyklus wählen…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Nutzungszeit"</item>
+    <item msgid="2784401352592276015">"Zuletzt verwendet"</item>
+    <item msgid="249854287216326349">"App-Name"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Keine"</item>
+    <item msgid="8655686691660180616">"MS-CHAP v2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Keine"</item>
+    <item msgid="212906109313512425">"MS-CHAP v2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Keine"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MS-CHAP v2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statisch"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Keine"</item>
+    <item msgid="1464741437353223198">"Handbuch"</item>
+    <item msgid="5793600062487886090">"Autom. Proxykonfiguration"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Keine"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP oder CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Keine Angabe"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Keiner"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interner Gerätespeicher"</item>
+    <item msgid="3186681694079967527">"Austauschbare SD-Karte"</item>
+    <item msgid="6902033473986647035">"Auswahl durch das System"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Standort"</item>
+    <item msgid="6842381562497597649">"Nutzer"</item>
+    <item msgid="3966700236695683444">"Messaging"</item>
+    <item msgid="8563996233342430477">"Medien"</item>
+    <item msgid="5323851085993963783">"Gerät"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"Ungefährer Standort"</item>
+    <item msgid="1830619568689922920">"Genauer Standort"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"Vibration"</item>
+    <item msgid="8632513128515114092">"Kontakte lesen"</item>
+    <item msgid="3741042113569620272">"Kontakte ändern"</item>
+    <item msgid="4204420969709009931">"Anrufliste lesen"</item>
+    <item msgid="2260380357119423209">"Anrufliste ändern"</item>
+    <item msgid="6550710385014530934">"Kalender lesen"</item>
+    <item msgid="3575906174264853951">"Kalender ändern"</item>
+    <item msgid="4319843242568057174">"WLAN-Scan"</item>
+    <item msgid="2981791890467303819">"Benachrichtigung"</item>
+    <item msgid="6617825156152476692">"Mobilfunknetz-Scan"</item>
+    <item msgid="8865260890611559753">"Telefonieren"</item>
+    <item msgid="3254999273961542982">"SMS lesen"</item>
+    <item msgid="7711446453028825171">"SMS schreiben"</item>
+    <item msgid="6123238544099198034">"SMS empfangen"</item>
+    <item msgid="838342167431596036">"Notfall-SMS empfangen"</item>
+    <item msgid="8554432731560956686">"MMS empfangen"</item>
+    <item msgid="7464863464299515059">"WAP-Push-Nachricht empfangen"</item>
+    <item msgid="310463075729606765">"SMS senden"</item>
+    <item msgid="7338021933527689514">"ICC-SMS lesen"</item>
+    <item msgid="6130369335466613036">"ICC-SMS schreiben"</item>
+    <item msgid="6536865581421670942">"Einstellungen ändern"</item>
+    <item msgid="4547203129183558973">"An oberste Position ziehen"</item>
+    <item msgid="9080347512916542840">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="5332718516635907742">"Kamera"</item>
+    <item msgid="6098422447246167852">"Audio aufnehmen"</item>
+    <item msgid="9182794235292595296">"Audio wiedergeben"</item>
+    <item msgid="8760743229597702019">"Zwischenablage lesen"</item>
+    <item msgid="2266923698240538544">"Zwischenablage ändern"</item>
+    <item msgid="1801619438618539275">"Medienschaltflächen"</item>
+    <item msgid="31588119965784465">"Audiofokus"</item>
+    <item msgid="7565226799008076833">"Gesamtlautstärke"</item>
+    <item msgid="5420704980305018295">"Sprachlautstärke"</item>
+    <item msgid="5797363115508970204">"Klingeltonlautstärke"</item>
+    <item msgid="8233154098550715999">"Medienlautstärke"</item>
+    <item msgid="5196715605078153950">"Weckruflautstärke"</item>
+    <item msgid="394030698764284577">"Benachrichtigungslautstärke"</item>
+    <item msgid="8952898972491680178">"Bluetooth-Lautstärke"</item>
+    <item msgid="8506227454543690851">"aktiv lassen"</item>
+    <item msgid="1108160036049727420">"Standort beobachten"</item>
+    <item msgid="1496205959751719491">"Orte mit hohem Stromverbrauch überwachen"</item>
+    <item msgid="3776296279910987380">"Nutzungsstatistiken abrufen"</item>
+    <item msgid="8827100324471975602">"Mikrofon aus- oder einschalten"</item>
+    <item msgid="6880736730520126864">"Toast anzeigen"</item>
+    <item msgid="4933375960222609935">"Projektion von Medieninhalten"</item>
+    <item msgid="8357907018938895462">"VPN aktivieren"</item>
+    <item msgid="8143812849911310973">"Hintergrund schreiben"</item>
+    <item msgid="6266277260961066535">"Strukturassistent"</item>
+    <item msgid="7715498149883482300">"Screenshotassistent"</item>
+    <item msgid="4046679376726313293">"Telefonstatus lesen"</item>
+    <item msgid="6329507266039719587">"Mailboxnachricht hinzufügen"</item>
+    <item msgid="7692440726415391408">"SIP verwenden"</item>
+    <item msgid="8572453398128326267">"Ausgehende Anrufe bearbeiten"</item>
+    <item msgid="7775674394089376306">"Fingerabdruck"</item>
+    <item msgid="3182815133441738779">"Körpersensoren"</item>
+    <item msgid="2793100005496829513">"Cell Broadcasts lesen"</item>
+    <item msgid="2633626056029384366">"Standort simulieren"</item>
+    <item msgid="8356842191824684631">"Speicher lesen"</item>
+    <item msgid="5671906070163291500">"Speicher schreiben"</item>
+    <item msgid="2791955098549340418">"Display aktivieren"</item>
+    <item msgid="5599435119609178367">"Konten erstellen"</item>
+    <item msgid="1165623660533024666">"Im Hintergrund ausführen"</item>
+    <item msgid="6423861043647911030">"Laustärke der Bedienungshilfen"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Standort"</item>
+    <item msgid="6656077694190491067">"Standort"</item>
+    <item msgid="8790228218278477369">"Standort"</item>
+    <item msgid="7836406246005211990">"Vibration"</item>
+    <item msgid="3951439024549922598">"Kontakte lesen"</item>
+    <item msgid="8802152411647068">"Kontakte ändern"</item>
+    <item msgid="229544934599698735">"Anrufliste lesen"</item>
+    <item msgid="7396102294405899613">"Anrufliste ändern"</item>
+    <item msgid="3597797992398484655">"Kalender lesen"</item>
+    <item msgid="2705975774250907343">"Kalender ändern"</item>
+    <item msgid="4668747371441932697">"Standort"</item>
+    <item msgid="1487578921720243646">"Benachrichtigung posten"</item>
+    <item msgid="4636080349724146638">"Standort"</item>
+    <item msgid="673510900286463926">"Telefonieren"</item>
+    <item msgid="542083422784609790">"SMS/MMS lesen"</item>
+    <item msgid="1033780373029588436">"SMS/MMS schreiben"</item>
+    <item msgid="5647111115517787488">"SMS/MMS empfangen"</item>
+    <item msgid="8591105601108455893">"SMS/MMS empfangen"</item>
+    <item msgid="7730995008517841903">"SMS/MMS empfangen"</item>
+    <item msgid="2613033109026626086">"SMS/MMS empfangen"</item>
+    <item msgid="3037159047591081136">"SMS/MMS senden"</item>
+    <item msgid="4726682243833913568">"SMS/MMS lesen"</item>
+    <item msgid="6555678522277865572">"SMS/MMS schreiben"</item>
+    <item msgid="6981734935578130884">"Einstellungen ändern"</item>
+    <item msgid="8705854389991425629">"An oberste Position ziehen"</item>
+    <item msgid="5861356020344153651">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Audio aufnehmen"</item>
+    <item msgid="4516840825756409490">"Audio wiedergeben"</item>
+    <item msgid="6811712502798183957">"Zwischenablage lesen"</item>
+    <item msgid="2780369012602289114">"Zwischenablage ändern"</item>
+    <item msgid="2331359440170850868">"Medienschaltflächen"</item>
+    <item msgid="6133599737122751231">"Audiofokus"</item>
+    <item msgid="6844485713404805301">"Gesamtlautstärke"</item>
+    <item msgid="1600379420669104929">"Sprachlautstärke"</item>
+    <item msgid="6296768210470214866">"Klingeltonlautstärke"</item>
+    <item msgid="510690696071629241">"Medienlautstärke"</item>
+    <item msgid="406861638631430109">"Weckruflautstärke"</item>
+    <item msgid="4715864795872233884">"Benachrichtigungslautstärke"</item>
+    <item msgid="2311478519251301183">"Bluetooth-Lautstärke"</item>
+    <item msgid="5133991377896747027">"Aktiv lassen"</item>
+    <item msgid="2464189519136248621">"Standort"</item>
+    <item msgid="2062677934050803037">"Standort"</item>
+    <item msgid="1735171933192715957">"Nutzungsstatistiken abrufen"</item>
+    <item msgid="1014093788778383554">"Mikrofon aus- oder einschalten"</item>
+    <item msgid="4199297950608622850">"Toast anzeigen"</item>
+    <item msgid="2527962435313398821">"Medieninhalte projizieren"</item>
+    <item msgid="5117506254221861929">"VPN aktivieren"</item>
+    <item msgid="8291198322681891160">"Hintergrund schreiben"</item>
+    <item msgid="7106921284621230961">"Strukturassistent"</item>
+    <item msgid="4496533640894624799">"Screenshotassistent"</item>
+    <item msgid="2598847264853993611">"Telefonstatus lesen"</item>
+    <item msgid="9215610846802973353">"Mailboxnachricht hinzufügen"</item>
+    <item msgid="9186411956086478261">"SIP verwenden"</item>
+    <item msgid="6884763100104539558">"Ausgehende Anrufe bearbeiten"</item>
+    <item msgid="125513972170580692">"Fingerabdruck"</item>
+    <item msgid="2556071024281275619">"Körpersensoren"</item>
+    <item msgid="617168514928339387">"Cell Broadcasts lesen"</item>
+    <item msgid="7134693570516523585">"Standort simulieren"</item>
+    <item msgid="7224489175375229399">"Speicher lesen"</item>
+    <item msgid="8472735063903258202">"Speicher schreiben"</item>
+    <item msgid="4069276819909595110">"Display aktivieren"</item>
+    <item msgid="1228338896751121025">"Konten erstellen"</item>
+    <item msgid="3181581793459233672">"Im Hintergrund ausführen"</item>
+    <item msgid="2340936043025374076">"Laustärke der Bedienungshilfen"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kurz"</item>
+    <item msgid="4816511817309094890">"Mittel"</item>
+    <item msgid="8305084671259331134">"Lang"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Standard"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif, schmal"</item>
+    <item msgid="6529379119163117545">"Sans Serif Monospace"</item>
+    <item msgid="1487203730637617924">"Serife"</item>
+    <item msgid="4937790671987480464">"Serif Monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Kursiv"</item>
+    <item msgid="6896773537705206194">"Kapitälchen"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Sehr klein"</item>
+    <item msgid="5091603983404027034">"Klein"</item>
+    <item msgid="176844712416932112">"Mittel"</item>
+    <item msgid="2784236342175159295">"Groß"</item>
+    <item msgid="218913203203160606">"Sehr groß"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Standard"</item>
+    <item msgid="6488643537808152001">"Keine"</item>
+    <item msgid="552332815156010137">"Umriss"</item>
+    <item msgid="7187891159463789272">"Schlagschatten"</item>
+    <item msgid="8019330250538856521">"Erhöht"</item>
+    <item msgid="8987385315647049787">"Vertieft"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"App-Standard verwenden"</item>
+    <item msgid="8611890312638868524">"Weiß auf Schwarz"</item>
+    <item msgid="5891360837786277638">"Schwarz auf Weiß"</item>
+    <item msgid="2798457065945456853">"Gelb auf Schwarz"</item>
+    <item msgid="5799049811524553967">"Gelb auf Blau"</item>
+    <item msgid="3673930830658169860">"Benutzerdefiniert"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP-VPN"</item>
+    <item msgid="1349760781118368659">"L2TP-/IPSec-VPN mit vorinstallierten Schlüsseln"</item>
+    <item msgid="6128519070545038358">"L2TP-/IPSec-VPN mit Zertifikaten"</item>
+    <item msgid="312397853907741968">"IPSec-VPN mit vorinstallierten Schlüsseln und Xauth-Authentifizierung"</item>
+    <item msgid="3319427315593649917">"IPSec-VPN mit Zertifikaten und Xauth-Authentifizierung"</item>
+    <item msgid="8258927774145391041">"IPSec-VPN mit Zertifikaten und Hybrid-Authentifizierung"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ohne"</item>
+    <item msgid="1157046369795346308">"Handbuch"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Nicht verbunden"</item>
+    <item msgid="8754480102834556765">"Initialisierung läuft..."</item>
+    <item msgid="3351334355574270250">"Verbindung wird hergestellt..."</item>
+    <item msgid="8303882153995748352">"Verbunden"</item>
+    <item msgid="9135049670787351881">"Zeitüberschreitung"</item>
+    <item msgid="2124868417182583926">"Fehlgeschlagen"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Fragen"</item>
+    <item msgid="7718817231348607934">"Nie zulassen"</item>
+    <item msgid="8184570120217958741">"Immer zulassen"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Permanent"</item>
+    <item msgid="167418068739176448">"Topaktivität"</item>
+    <item msgid="4760813290195199773">"Wichtig (Vordergrund)"</item>
+    <item msgid="2328684826817647595">"Wichtig (Hintergrund)"</item>
+    <item msgid="7746406490652867365">"Sicherung"</item>
+    <item msgid="5597404364389196754">"Hohe Auslastung"</item>
+    <item msgid="1290888779300174556">"Dienst (aktiv)"</item>
+    <item msgid="7241098542073939046">"Dienst (wird neu gestartet)"</item>
+    <item msgid="6610439017684111046">"Empfänger"</item>
+    <item msgid="7367606086319921117">"Startseite"</item>
+    <item msgid="3344660712396741826">"Letzte Aktivität"</item>
+    <item msgid="5006559348883303865">"Im Cache gespeichert (Aktivität)"</item>
+    <item msgid="8633480732468137525">"Im Cache gespeichert (Aktivitätsclient)"</item>
+    <item msgid="6248998242443333892">"Im Cache gespeichert (leer)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Blaugrün"</item>
+    <item msgid="3228505970082457852">"Blau"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Lila"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Rot"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Nach 30 Tagen"</item>
+    <item msgid="8699273238891265610">"Nach 60 Tagen"</item>
+    <item msgid="8346279419423837266">"Nach 90 Tagen"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Automatisch erkennen"</item>
+    <item msgid="773943026484148895">"Wie \"kostenpflichtig\" behandeln"</item>
+    <item msgid="1008268820118852416">"Wie \"kostenlos\" behandeln"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Zufällige MAC-Adresse verwenden (Standard)"</item>
+    <item msgid="214234417308375326">"MAC-Adresse des Geräts verwenden"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nein"</item>
+    <item msgid="1930581185557754880">"\"Ja\""</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Dunkel"</item>
+    <item msgid="5079453644557603349">"Hell"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Aus"</item>
+    <item msgid="4072198137051566919">"Fehler beheben"</item>
+    <item msgid="2473005316958868509">"Ausführlich"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Nur Heimatnetz"</item>
+    <item msgid="1161026694891024702">"Automatisch"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA bevorzugt"</item>
+    <item msgid="7581481130337402578">"Nur GSM"</item>
+    <item msgid="8579197487913425819">"Nur WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA (automatisch)"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo (automatisch)"</item>
+    <item msgid="4219607161971472471">"CDMA ohne EvDo"</item>
+    <item msgid="7278975240951052041">"Nur EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Nur TD-SCDMA"</item>
+    <item msgid="4346392996298714633">"TD-SCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TD-SCDMA"</item>
+    <item msgid="9191730167201068525">"TD-SCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TD-SCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TD-SCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TD-SCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TD-SCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TD-SCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TD-SCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-de/strings.xml b/tests/CarDeveloperOptions/res/values-de/strings.xml
index d59cf49..61c564f 100644
--- a/tests/CarDeveloperOptions/res/values-de/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-de/strings.xml
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Mit der Displaysperre kannst du dein Tablet schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\", um eine PIN festzulegen oder eine andere Methode für die Displaysperre auszuwählen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Mit der Displaysperre kannst du dein Gerät schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\", um eine PIN festzulegen oder eine andere Methode für die Displaysperre auszuwählen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Mit der Displaysperre kannst du dein Smartphone schützen, damit niemand es verwenden kann, falls es verloren gehen oder gestohlen werden sollte. Die Displaysperre ist auch für die Gesichtserkennung erforderlich. Tippe auf \"Abbrechen\", um eine PIN festzulegen oder eine andere Methode für die Displaysperre auszuwählen."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN-Einrichtung überspringen?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Einrichtung überspringen?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Einrichtung überspringen?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Displaysperre einrichten"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WLAN"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Nur WLAN"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1163,7 +1165,7 @@
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"Privates Konto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="5809250790214921377">"Suche"</string>
     <string name="display_settings" msgid="1045535829232307190">"Display"</string>
-    <string name="accelerometer_title" msgid="2427487734964971453">"Display automatisch drehen"</string>
+    <string name="accelerometer_title" msgid="2427487734964971453">"Bildschirm automatisch drehen"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"Farben"</string>
     <string name="color_mode_option_natural" msgid="1292837781836645320">"Natürlich"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"Verstärkt"</string>
@@ -2078,7 +2080,7 @@
     <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Zeit zum Reagieren"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Hier kannst du auswählen, wie lange Nachrichten sichtbar sind, die du lesen musst, die aber nur vorübergehend angezeigt werden.\n\nDiese Einstellung wird nicht von allen Apps unterstützt."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Hier kannst du auswählen, wie lange Nachrichten sichtbar sind, die eine Reaktion erfordern, aber nur vorübergehend angezeigt werden.\n\nDiese Einstellung wird nicht von allen Apps unterstützt."</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Reaktionszeit Berühren/Halten"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"\"Berühren und halten\"-Reaktionszeit"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"Farbumkehr"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"Kann sich auf die Leistung auswirken"</string>
     <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"Verweildauer"</string>
@@ -2907,7 +2909,7 @@
     <string name="application_restrictions" msgid="6871981013736536763">"Apps und Inhalte zulassen"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Apps mit Einschränkungen"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"App-Einstellungen erweitern"</string>
-    <string name="nfc_payment_settings_title" msgid="5070077706735415291">"Mobil bezahlen"</string>
+    <string name="nfc_payment_settings_title" msgid="5070077706735415291">"Kontaktlos bezahlen"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"Funktionsweise"</string>
     <string name="nfc_payment_no_apps" msgid="8844440783395420860">"Mit deinem Smartphone in Geschäften bezahlen"</string>
     <string name="nfc_payment_default" msgid="7869273092463612271">"Standard-App für Zahlungen"</string>
@@ -2916,14 +2918,14 @@
     <string name="nfc_payment_use_default" msgid="3098724195746409476">"Standard-App verwenden"</string>
     <string name="nfc_payment_favor_default" msgid="7555356982142464260">"Immer"</string>
     <string name="nfc_payment_favor_open" msgid="3739055715000436749">"Außer wenn eine andere Zahlungs-App geöffnet ist"</string>
-    <string name="nfc_payment_pay_with" msgid="8412558374792061266">"An einem Terminal für mobiles Bezahlen folgende App nutzen:"</string>
+    <string name="nfc_payment_pay_with" msgid="8412558374792061266">"An einem Terminal für kontaktloses Bezahlen folgende App nutzen:"</string>
     <string name="nfc_how_it_works_title" msgid="6531433737926327904">"An der Kasse bezahlen"</string>
     <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Richte eine Zahlungs-App ein. Halte die Rückseite deines Smartphones an eine beliebige Kasse mit dem Symbol zum mobilen Bezahlen."</string>
     <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"Ok"</string>
     <string name="nfc_more_title" msgid="2825856411836382264">"Mehr…"</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"Als bevorzugte Einstellung festlegen?"</string>
-    <string name="nfc_payment_set_default" msgid="1186837502664412132">"Beim mobilen Bezahlen immer <xliff:g id="APP">%1$s</xliff:g> verwenden?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="5746952277762109289">"Beim mobilen Bezahlen immer <xliff:g id="APP_0">%1$s</xliff:g> statt <xliff:g id="APP_1">%2$s</xliff:g> verwenden?"</string>
+    <string name="nfc_payment_set_default" msgid="1186837502664412132">"Zum kontaktlosen Bezahlen immer <xliff:g id="APP">%1$s</xliff:g> verwenden?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5746952277762109289">"Zum kontaktlosen Bezahlen immer <xliff:g id="APP_0">%1$s</xliff:g> statt <xliff:g id="APP_1">%2$s</xliff:g> verwenden?"</string>
     <string name="restriction_settings_title" msgid="4143751894908963736">"Einschränkungen"</string>
     <string name="restriction_menu_reset" msgid="3642252461410370554">"Einschränkungen aufheben"</string>
     <string name="restriction_menu_change_pin" msgid="592512748243421101">"PIN ändern"</string>
@@ -3088,7 +3090,7 @@
     <string name="keywords_profile_challenge" msgid="8653718001253979611">"herausforderung bei der arbeit, arbeit, profil"</string>
     <string name="keywords_unification" msgid="2020759909366983593">"arbeitsprofil, verwaltetes profil, gruppieren, gruppierung, arbeit, profil"</string>
     <string name="keywords_gesture" msgid="5031323247529869644">"Bewegungen, gesten, touch-gesten"</string>
-    <string name="keywords_payment_settings" msgid="4745023716567666052">"Bezahlen, tippen, Zahlungen"</string>
+    <string name="keywords_payment_settings" msgid="4745023716567666052">"bezahlen, kontaktlos, Zahlungen"</string>
     <string name="keywords_backup" msgid="7433356270034921627">"Sicherung, sicherung"</string>
     <string name="keywords_assist_gesture_launch" msgid="2711433664837843513">"bewegung, geste, touch-geste"</string>
     <string name="keywords_face_unlock" msgid="651615819291927262">"Face, Unlock, Gesichtserkennung, Anmeldung"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Sie würde dieses Smartphone langsamer machen"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Vollständige GNSS-Messung erzwingen"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Alle GNSS-Konstellationen und -Frequenzen ohne GNSS-Zyklus erfassen"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Fehler bei Nutzerwechsel beheben"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Detaillierte Informationen bei Nutzerwechsel anzeigen"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Start von Hintergrundaktivitäten zulassen"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Alle Starts von Hintergrundaktivitäten zulassen"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Bei Absturz immer Absturz-Dialogfeld anzeigen"</string>
@@ -4337,32 +4341,32 @@
     <string name="network_query_error" msgid="525635151099480463">"Netzwerke nicht gefunden. Bitte versuch es noch einmal."</string>
     <string name="forbidden_network" msgid="8493827960968261182">"(nicht zulässig)"</string>
     <string name="no_sim_card" msgid="3708682108324275635">"Keine SIM-Karte"</string>
-    <string name="preferred_network_mode_wcdma_perf_summary" msgid="6899270534608086704">"Bevorzugter Netzwerkmodus: WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_summary" msgid="3688217977701592962">"Bevorzugter Netzwerkmodus: nur GSM"</string>
-    <string name="preferred_network_mode_wcdma_only_summary" msgid="745707973728245943">"Bevorzugter Netzwerkmodus: nur WCDMA"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="2806269270679037207">"Bevorzugter Netzwerkmodus: GSM/WCDMA"</string>
-    <string name="preferred_network_mode_cdma_summary" msgid="8700743807256101609">"Bevorzugter Netzwerkmodus: CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_summary" msgid="1372502271750378234">"Bevorzugter Netzwerkmodus: CDMA/EvDo"</string>
-    <string name="preferred_network_mode_cdma_only_summary" msgid="8393851880010526170">"Bevorzugter Netzwerkmodus: nur CDMA"</string>
-    <string name="preferred_network_mode_evdo_only_summary" msgid="8148632203339185299">"Bevorzugter Netzwerkmodus: nur EvDo"</string>
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="3810364557603437209">"Bevorzugter Netzwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_summary" msgid="4281029367896990461">"Bevorzugter Netzwerkmodus: LTE"</string>
-    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="149627151786465701">"Bevorzugter Netzwerkmodus: GSM/WCDMA/LTE"</string>
-    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="2892417308574212352">"Bevorzugter Netzwerkmodus: CDMA+LTE/EVDO"</string>
-    <string name="preferred_network_mode_global_summary" msgid="487001671043476488">"Bevorzugter Netzwerkmodus: global"</string>
-    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9029884385644299102">"Bevorzugter Netzwerkmodus: LTE/WCDMA"</string>
-    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="6583001637967763033">"Bevorzugter Netzwerkmodus: LTE/GSM/UMTS"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="344294371859765484">"Bevorzugter Netzwerkmodus: LTE/CDMA"</string>
-    <string name="preferred_network_mode_tdscdma_summary" msgid="621070193408655408">"Bevorzugter Netzwerkmodus: TD-SCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="5967498256205109566">"Bevorzugter Netzwerkmodus: TD-SCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="218300483814835829">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="318381056810686364">"Bevorzugter Netzwerkmodus: TD-SCDMA/GSM"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="4477885365810861079">"Bevorzugter Netzwerkmodus: LTE/GSM/TD-SCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1508391245597120784">"Bevorzugter Netzwerkmodus: TD-SCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="5805702212787217683">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2082837743469275809">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4696176070100797082">"Bevorzugter Netzwerkmodus: TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4772519343414575091">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="6899270534608086704">"Bevorzugter Netzmodus: WCDMA"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3688217977701592962">"Bevorzugter Netzmodus: nur GSM"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="745707973728245943">"Bevorzugter Netzmodus: nur WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="2806269270679037207">"Bevorzugter Netzmodus: GSM/WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="8700743807256101609">"Bevorzugter Netzmodus: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="1372502271750378234">"Bevorzugter Netzmodus: CDMA/EvDo"</string>
+    <string name="preferred_network_mode_cdma_only_summary" msgid="8393851880010526170">"Bevorzugter Netzmodus: nur CDMA"</string>
+    <string name="preferred_network_mode_evdo_only_summary" msgid="8148632203339185299">"Bevorzugter Netzmodus: nur EvDo"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="3810364557603437209">"Bevorzugter Netzmodus: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="4281029367896990461">"Bevorzugter Netzmodus: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="149627151786465701">"Bevorzugter Netzmodus: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="2892417308574212352">"Bevorzugter Netzmodus: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="487001671043476488">"Bevorzugter Netzmodus: global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9029884385644299102">"Bevorzugter Netzmodus: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="6583001637967763033">"Bevorzugter Netzmodus: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="344294371859765484">"Bevorzugter Netzmodus: LTE/CDMA"</string>
+    <string name="preferred_network_mode_tdscdma_summary" msgid="621070193408655408">"Bevorzugter Netzmodus: TD-SCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="5967498256205109566">"Bevorzugter Netzmodus: TD-SCDMA/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="218300483814835829">"Bevorzugter Netzmodus: LTE/TD-SCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="318381056810686364">"Bevorzugter Netzmodus: TD-SCDMA/GSM"</string>
+    <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="4477885365810861079">"Bevorzugter Netzmodus: LTE/GSM/TD-SCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1508391245597120784">"Bevorzugter Netzmodus: TD-SCDMA/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="5805702212787217683">"Bevorzugter Netzmodus: LTE/TD-SCDMA/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2082837743469275809">"Bevorzugter Netzmodus: LTE/TD-SCDMA/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4696176070100797082">"Bevorzugter Netzmodus: TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="4772519343414575091">"Bevorzugter Netzmodus: LTE/TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
     <string name="network_lte" msgid="7625153311926730667">"LTE (empfohlen)"</string>
     <string name="network_4G" msgid="8031294930350019608">"4G (empfohlen)"</string>
     <string name="network_global" msgid="2208957917962600214">"Global"</string>
@@ -4415,7 +4419,7 @@
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"SIM kann nicht gelöscht werden"</string>
     <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Diese SIM kann aufgrund eines Fehlers nicht gelöscht werden.\n\nStarte dein Gerät neu und versuche es noch einmal."</string>
     <string name="preferred_network_mode_title" msgid="8324526359482124770">"Bevorzugter Netztyp"</string>
-    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Netzwerkmodus ändern"</string>
+    <string name="preferred_network_mode_summary" msgid="388957154320426335">"Netzmodus ändern"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="5448698073828567428">"Bevorzugter Netztyp"</string>
     <string name="carrier_settings_euicc" msgid="7723199738771996732">"Mobilfunkanbieter"</string>
     <string name="carrier_settings_version" msgid="2657511289029828425">"Einstellungen-Version"</string>
@@ -4433,7 +4437,7 @@
     <string name="roaming_alert_title" msgid="1849237823113454475">"Daten-Roaming zulassen?"</string>
     <string name="roaming_check_price_warning" msgid="5883499714594419439">"Wenn du Informationen zu Preisen erhalten möchtest, wende dich bitte an deinen Netzwerkanbieter."</string>
     <string name="mobile_data_usage_title" msgid="2376358672434990037">"Datennutzung durch Apps"</string>
-    <string name="mobile_network_mode_error" msgid="6818434186286086554">"Ungültiger Netzwerkmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorieren."</string>
+    <string name="mobile_network_mode_error" msgid="6818434186286086554">"Ungültiger Netzmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorieren."</string>
     <string name="mobile_network_apn_title" msgid="5628635067747404382">"Zugriffspunktnamen"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
     <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"Medizinische Informationen und Notfallkontakte"</string>
diff --git a/tests/CarDeveloperOptions/res/values-el-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-el-nokeys/strings.xml
new file mode 100644
index 0000000..69a9e03
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-el-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Διαχείριση εφαρμογών"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-el/arrays.xml b/tests/CarDeveloperOptions/res/values-el/arrays.xml
new file mode 100644
index 0000000..6b208c6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-el/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Αμερική"</item>
+    <item msgid="4791956477275129121">"Ευρώπη"</item>
+    <item msgid="3812126832016254559">"Αφρική"</item>
+    <item msgid="2765816300353408280">"Ασία"</item>
+    <item msgid="6683489385344409742">"Αυστραλία"</item>
+    <item msgid="5194868215515664953">"Ειρηνικός"</item>
+    <item msgid="7044520255415007865">"Όλες"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 δευτερόλεπτα"</item>
+    <item msgid="772029947136115322">"30 δευτερόλεπτα"</item>
+    <item msgid="8743663928349474087">"1 λεπτό"</item>
+    <item msgid="1506508631223164814">"2 λεπτά"</item>
+    <item msgid="8664703938127907662">"5 λεπτά"</item>
+    <item msgid="5827960506924849753">"10 λεπτά"</item>
+    <item msgid="6677424950124253938">"30 λεπτά"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"ποτέ"</item>
+    <item msgid="2517785806387977252">"15 δευτερόλεπτα"</item>
+    <item msgid="6347954399441173672">"30 δευτερόλεπτα"</item>
+    <item msgid="4858305253279921789">"1 λεπτό"</item>
+    <item msgid="8109273437140044073">"2 λεπτά"</item>
+    <item msgid="2788593551142462622">"5 λεπτά"</item>
+    <item msgid="8012672183888404961">"10 λεπτά"</item>
+    <item msgid="8271452751594598661">"30 λεπτά"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Άμεσα"</item>
+    <item msgid="2038544972632026612">"5 δευτερόλεπτα"</item>
+    <item msgid="5558060663472279597">"15 δευτερόλεπτα"</item>
+    <item msgid="45341168505452037">"30 δευτερόλεπτα"</item>
+    <item msgid="227647485917789272">"1 λεπτό"</item>
+    <item msgid="3367011891231217504">"2 λεπτά"</item>
+    <item msgid="4376575879222393045">"5 λεπτά"</item>
+    <item msgid="811192536981678974">"10 λεπτά"</item>
+    <item msgid="7258394417241706272">"30 λεπτά"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Μικρό"</item>
+    <item msgid="591935967183159581">"Προεπιλογή"</item>
+    <item msgid="1714184661981538355">"Μεγάλο"</item>
+    <item msgid="6195563047686707484">"Μεγαλύτερο"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Σάρωση..."</item>
+    <item msgid="5597394826455877834">"Γίνεται σύνδεση..."</item>
+    <item msgid="5848277343965362748">"Έλεγχος ταυτότητας..."</item>
+    <item msgid="3391238031431440676">"Λήψη διεύθυνσης IP…"</item>
+    <item msgid="5257597310494000224">"Συνδέθηκε"</item>
+    <item msgid="8472497592913050396">"Σε αναστολή"</item>
+    <item msgid="1228072488815999109">"Αποσύνδεση..."</item>
+    <item msgid="7253087004422991731">"Αποσυνδέθηκε"</item>
+    <item msgid="4169850917304751227">"Ανεπιτυχής"</item>
+    <item msgid="6266658166690831131">"Έχει αποκλειστεί"</item>
+    <item msgid="4517230805854909775">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Σάρωση..."</item>
+    <item msgid="8058143476674427024">"Σύνδεση σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Έλεγχος ταυτότητας με το δίκτυο <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Λήψη διεύθυνσης IP από το δίκτυο <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Συνδεδεμένο σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Σε αναστολή"</item>
+    <item msgid="4133290864821295785">"Αποσύνδεση από <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Αποσυνδέθηκε"</item>
+    <item msgid="2847316776634969068">"Ανεπιτυχής"</item>
+    <item msgid="4390990424746035383">"Έχει αποκλειστεί"</item>
+    <item msgid="3618248791367063949">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Κουμπί Push"</item>
+    <item msgid="7401896200768713930">"PIN από ομότιμη συσκευή"</item>
+    <item msgid="4526848028011846710">"PIN από τη συσκευή"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Συνδέθηκε"</item>
+    <item msgid="983792611851499732">"Προσκεκλημένος"</item>
+    <item msgid="5438273405428201793">"Ανεπιτυχής"</item>
+    <item msgid="4646663015449312554">"Διαθέσιμη"</item>
+    <item msgid="3230556734162006146">"Εκτός εμβέλειας"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 λεπτά"</item>
+    <item msgid="2759776603549270587">"5 λεπτά"</item>
+    <item msgid="167772676068860015">"1 ώρα"</item>
+    <item msgid="5985477119043628504">"Να μην λήγει ποτέ το χρονικό όριο"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Χρήση προεπιλογής συστήματος: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Χαμηλό"</item>
+    <item msgid="7882129634982603782">"Χαμηλό"</item>
+    <item msgid="6457357501905996224">"Επαρκές"</item>
+    <item msgid="405271628162918841">"Καλό"</item>
+    <item msgid="999948812884919584">"Εξαιρετική"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 τελευταίες ημέρες"</item>
+    <item msgid="3211287705232736964">"Ορισμός κύκλου χρήσης…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Χρόνος χρήσης"</item>
+    <item msgid="2784401352592276015">"Τελευταία χρήση"</item>
+    <item msgid="249854287216326349">"Όνομα εφαρμογής"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Κανένα"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Κανένα"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Κανένα"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Στατικό"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Κανένα"</item>
+    <item msgid="1464741437353223198">"Εγχειρίδιο χρήσης"</item>
+    <item msgid="5793600062487886090">"Αυτ. διαμ.διακομ.μεσολ."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Κανένα"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ή CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Μη ορισμένο"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Κανένα"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Εσωτερικός αποθηκευτικός χώρος της συσκευής"</item>
+    <item msgid="3186681694079967527">"Αφαιρούμενη κάρτα SD"</item>
+    <item msgid="6902033473986647035">"Να αποφασίζει το σύστημα"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Τοποθεσία"</item>
+    <item msgid="6842381562497597649">"Προσωπικό"</item>
+    <item msgid="3966700236695683444">"Ανταλλαγή μηνυμάτων"</item>
+    <item msgid="8563996233342430477">"Μέσα"</item>
+    <item msgid="5323851085993963783">"Συσκευή"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"τοποθεσία κατά προσέγγιση"</item>
+    <item msgid="1830619568689922920">"ακριβής τοποθεσία"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"δόνηση"</item>
+    <item msgid="8632513128515114092">"ανάγνωση επαφών"</item>
+    <item msgid="3741042113569620272">"τροποποίηση επαφών"</item>
+    <item msgid="4204420969709009931">"ανάγνωση αρχείου καταγραφής κλήσεων"</item>
+    <item msgid="2260380357119423209">"τροποποίηση αρχείου κλήσεων"</item>
+    <item msgid="6550710385014530934">"ανάγνωση ημερολογίου"</item>
+    <item msgid="3575906174264853951">"τροποποίηση ημερολογίου"</item>
+    <item msgid="4319843242568057174">"σάρωση Wi-Fi"</item>
+    <item msgid="2981791890467303819">"ειδοποίηση"</item>
+    <item msgid="6617825156152476692">"σάρωση κυψέλης"</item>
+    <item msgid="8865260890611559753">"κλήση τηλεφώνου"</item>
+    <item msgid="3254999273961542982">"ανάγνωση SMS"</item>
+    <item msgid="7711446453028825171">"σύνταξη SMS"</item>
+    <item msgid="6123238544099198034">"λήψη SMS"</item>
+    <item msgid="838342167431596036">"λήψη SMS έκτακτης ανάγκης"</item>
+    <item msgid="8554432731560956686">"λήψη MMS"</item>
+    <item msgid="7464863464299515059">"λήψη μηνύματος push μέσω WAP"</item>
+    <item msgid="310463075729606765">"αποστολή SMS"</item>
+    <item msgid="7338021933527689514">"ανάγνωση ICC SMS"</item>
+    <item msgid="6130369335466613036">"σύνταξη ICC SMS"</item>
+    <item msgid="6536865581421670942">"τροποποίηση ρυθμίσεων"</item>
+    <item msgid="4547203129183558973">"μεταφορά στην κορυφή"</item>
+    <item msgid="9080347512916542840">"πρόσβαση στις ειδοποιήσεις"</item>
+    <item msgid="5332718516635907742">"κάμερα"</item>
+    <item msgid="6098422447246167852">"εγγραφή ήχου"</item>
+    <item msgid="9182794235292595296">"αναπαραγωγή ήχου"</item>
+    <item msgid="8760743229597702019">"ανάγνωση περιεχόμενων προχείρου"</item>
+    <item msgid="2266923698240538544">"τροποποίηση περιεχομένων προχείρου"</item>
+    <item msgid="1801619438618539275">"κουμπιά μέσων"</item>
+    <item msgid="31588119965784465">"εστίαση ήχου"</item>
+    <item msgid="7565226799008076833">"κύρια ένταση ήχου"</item>
+    <item msgid="5420704980305018295">"έντασης ήχου φωνής"</item>
+    <item msgid="5797363115508970204">"ένταση ήχου κλήσης"</item>
+    <item msgid="8233154098550715999">"ένταση ήχου μέσων"</item>
+    <item msgid="5196715605078153950">"ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="394030698764284577">"ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="8952898972491680178">"ένταση ήχου Bluetooth"</item>
+    <item msgid="8506227454543690851">"διατήρηση λειτουργίας"</item>
+    <item msgid="1108160036049727420">"παρακολούθηση τοποθεσίας"</item>
+    <item msgid="1496205959751719491">"παρακολούθηση θέσης υψηλής ισχύος"</item>
+    <item msgid="3776296279910987380">"λήψη στατιστικών στοιχείων χρήσης"</item>
+    <item msgid="8827100324471975602">"σίγαση/κατάργηση σίγασης μικροφώνου"</item>
+    <item msgid="6880736730520126864">"εμφάνιση αναδυόμενης ειδοποίησης"</item>
+    <item msgid="4933375960222609935">"προβολή μέσου"</item>
+    <item msgid="8357907018938895462">"ενεργοποίηση VPN"</item>
+    <item msgid="8143812849911310973">"σύνταξης ταπετσαρίας"</item>
+    <item msgid="6266277260961066535">"βοήθεια δομής"</item>
+    <item msgid="7715498149883482300">"βοήθεια στιγμιότυπου οθόνης"</item>
+    <item msgid="4046679376726313293">"ανάγνωση κατάστασης τηλεφώνου"</item>
+    <item msgid="6329507266039719587">"προσθήκη αυτόματου τηλεφωνητή"</item>
+    <item msgid="7692440726415391408">"χρήση SIP"</item>
+    <item msgid="8572453398128326267">"επεξεργασία εξερχόμενης κλήσης"</item>
+    <item msgid="7775674394089376306">"δακτυλικό αποτύπωμα"</item>
+    <item msgid="3182815133441738779">"αισθητήρες σώματος"</item>
+    <item msgid="2793100005496829513">"ανάγνωση εκπομπών κινητής τηλεφωνίας"</item>
+    <item msgid="2633626056029384366">"εικονική τοποθεσία"</item>
+    <item msgid="8356842191824684631">"ανάγνωση αποθηκευτικού χώρου"</item>
+    <item msgid="5671906070163291500">"σύνταξη αποθηκευτικού χώρου"</item>
+    <item msgid="2791955098549340418">"ενεργοποίηση οθόνης"</item>
+    <item msgid="5599435119609178367">"λήψη λογαριασμών"</item>
+    <item msgid="1165623660533024666">"εκτέλεση στο παρασκήνιο"</item>
+    <item msgid="6423861043647911030">"ένταση ήχου προσβασιμότητας"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Τοποθεσία"</item>
+    <item msgid="6656077694190491067">"Τοποθεσία"</item>
+    <item msgid="8790228218278477369">"Τοποθεσία"</item>
+    <item msgid="7836406246005211990">"Δόνηση"</item>
+    <item msgid="3951439024549922598">"Ανάγνωση επαφών"</item>
+    <item msgid="8802152411647068">"Τροποποίηση επαφών"</item>
+    <item msgid="229544934599698735">"Ανάγνωση αρχείου καταγραφής κλήσεων"</item>
+    <item msgid="7396102294405899613">"Τροποποίηση αρχείου κλήσεων"</item>
+    <item msgid="3597797992398484655">"Ανάγνωση ημερολογίου"</item>
+    <item msgid="2705975774250907343">"Τροποποίηση ημερολογίου"</item>
+    <item msgid="4668747371441932697">"Τοποθεσία"</item>
+    <item msgid="1487578921720243646">"Δημοσίευση ειδοποίησης"</item>
+    <item msgid="4636080349724146638">"Τοποθεσία"</item>
+    <item msgid="673510900286463926">"Κλήση τηλεφώνου"</item>
+    <item msgid="542083422784609790">"Ανάγνωση SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Σύνταξη SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Λήψη SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Λήψη SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Λήψη SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Λήψη SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Αποστολή SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Ανάγνωση SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Σύνταξη SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Τροποποίηση ρυθμίσεων"</item>
+    <item msgid="8705854389991425629">"Μεταφορά στην κορυφή"</item>
+    <item msgid="5861356020344153651">"Πρόσβαση στις ειδοποιήσεις"</item>
+    <item msgid="78432174621628659">"Κάμερα"</item>
+    <item msgid="3986116419882154794">"Ηχογράφηση"</item>
+    <item msgid="4516840825756409490">"Αναπαραγωγή ήχου"</item>
+    <item msgid="6811712502798183957">"Ανάγνωση περιεχομένων προχείρου"</item>
+    <item msgid="2780369012602289114">"Τροποποίηση περιεχομένων προχείρου"</item>
+    <item msgid="2331359440170850868">"Κουμπιά μέσων"</item>
+    <item msgid="6133599737122751231">"Εστίαση ήχου"</item>
+    <item msgid="6844485713404805301">"Κύρια ένταση ήχου"</item>
+    <item msgid="1600379420669104929">"Έντασης ήχου φωνής"</item>
+    <item msgid="6296768210470214866">"Ένταση ήχου κλήσης"</item>
+    <item msgid="510690696071629241">"Ένταση ήχου πολυμέσων"</item>
+    <item msgid="406861638631430109">"Ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="4715864795872233884">"Ένταση ήχου ειδοποίησης"</item>
+    <item msgid="2311478519251301183">"Ένταση ήχου Bluetooth"</item>
+    <item msgid="5133991377896747027">"Διατήρηση λειτουρ."</item>
+    <item msgid="2464189519136248621">"Τοποθεσία"</item>
+    <item msgid="2062677934050803037">"Τοποθεσία"</item>
+    <item msgid="1735171933192715957">"Λήψη στατιστικών στοιχείων χρήσης"</item>
+    <item msgid="1014093788778383554">"Σίγαση/κατάργηση σίγασης μικροφώνου"</item>
+    <item msgid="4199297950608622850">"Εμφάνιση αναδυόμενης ειδοποίησης"</item>
+    <item msgid="2527962435313398821">"Προβολή μέσου"</item>
+    <item msgid="5117506254221861929">"Ενεργοποίηση VPN"</item>
+    <item msgid="8291198322681891160">"Ταπετσαρία σύνταξης"</item>
+    <item msgid="7106921284621230961">"Βοήθεια δομής"</item>
+    <item msgid="4496533640894624799">"Βοήθεια στιγμιότυπου οθόνης"</item>
+    <item msgid="2598847264853993611">"Ανάγνωση κατάστασης τηλεφώνου"</item>
+    <item msgid="9215610846802973353">"Προσθήκη αυτόματου τηλεφωνητή"</item>
+    <item msgid="9186411956086478261">"Χρήση SIP"</item>
+    <item msgid="6884763100104539558">"Επεξεργασία εξερχόμενης κλήσης"</item>
+    <item msgid="125513972170580692">"Δακτυλικό αποτύπωμα"</item>
+    <item msgid="2556071024281275619">"Αισθητήρες σώματος"</item>
+    <item msgid="617168514928339387">"Ανάγνωση εκπομπών κινητής τηλεφωνίας"</item>
+    <item msgid="7134693570516523585">"Εικονική τοποθεσία"</item>
+    <item msgid="7224489175375229399">"Ανάγνωση αποθηκευτικού χώρου"</item>
+    <item msgid="8472735063903258202">"Σύνταξη αποθηκευτικού χώρου"</item>
+    <item msgid="4069276819909595110">"Ενεργοποίηση οθόνης"</item>
+    <item msgid="1228338896751121025">"Λήψη λογαριασμών"</item>
+    <item msgid="3181581793459233672">"Εκτέλεση στο παρασκήνιο"</item>
+    <item msgid="2340936043025374076">"Ένταση ήχου προσβασιμότητας"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Σύντομο"</item>
+    <item msgid="4816511817309094890">"Μεσαία"</item>
+    <item msgid="8305084671259331134">"Παρατεταμένο"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Προεπιλογή"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Απλά"</item>
+    <item msgid="4627069151979553527">"Λοξά"</item>
+    <item msgid="6896773537705206194">"Μικρά κεφαλαία"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Πολύ μικρό"</item>
+    <item msgid="5091603983404027034">"Μικρό"</item>
+    <item msgid="176844712416932112">"Κανονικό"</item>
+    <item msgid="2784236342175159295">"Μεγάλο"</item>
+    <item msgid="218913203203160606">"Πολύ μεγάλο"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Προεπιλογή"</item>
+    <item msgid="6488643537808152001">"Κανένα"</item>
+    <item msgid="552332815156010137">"Περίγραμμα"</item>
+    <item msgid="7187891159463789272">"Αναπτυσσόμενη σκιά"</item>
+    <item msgid="8019330250538856521">"Υπερυψωμένο"</item>
+    <item msgid="8987385315647049787">"Συμπτυγμένο"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Χρήση προεπιλογών εφαρμογής"</item>
+    <item msgid="8611890312638868524">"Λευκό σε μαύρο"</item>
+    <item msgid="5891360837786277638">"Μαύρο σε λευκό"</item>
+    <item msgid="2798457065945456853">"Κίτρινο σε μαύρο"</item>
+    <item msgid="5799049811524553967">"Κίτρινο σε μπλε"</item>
+    <item msgid="3673930830658169860">"Προσαρμοσμένοι"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN με κλειδιά μοιρασμένα εκ των προτέρων"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN με πιστοποιητικά"</item>
+    <item msgid="312397853907741968">"IPSec VPN με ήδη κοινόχρηστα κλειδιά και έλεγχο ταυτότητας Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN με πιστοποιητικά και έλεγχο ταυτότητας Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN με πιστοποιητικά και υβριδικό έλεγχο ταυτότητας"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Κανένα"</item>
+    <item msgid="1157046369795346308">"Εγχειρίδιο χρήσης"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Αποσυνδέθηκε"</item>
+    <item msgid="8754480102834556765">"Προετοιμασία..."</item>
+    <item msgid="3351334355574270250">"Γίνεται σύνδεση..."</item>
+    <item msgid="8303882153995748352">"Συνδέθηκε"</item>
+    <item msgid="9135049670787351881">"Λήξη ορίου χρόνου"</item>
+    <item msgid="2124868417182583926">"Ανεπιτυχής"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Ερώτηση"</item>
+    <item msgid="7718817231348607934">"Να μην επιτρέπεται ποτέ"</item>
+    <item msgid="8184570120217958741">"Να επιτρέπεται πάντα"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Συνεχής"</item>
+    <item msgid="167418068739176448">"Κορυφαία δραστηριότητα"</item>
+    <item msgid="4760813290195199773">"Σημαντικό (προσκήνιο)"</item>
+    <item msgid="2328684826817647595">"Σημαντικό (παρασκήνιο)"</item>
+    <item msgid="7746406490652867365">"Δημιουργία αντιγράφων ασφαλείας"</item>
+    <item msgid="5597404364389196754">"Απαιτητική"</item>
+    <item msgid="1290888779300174556">"Υπηρεσία (σε εκτέλεση)"</item>
+    <item msgid="7241098542073939046">"Υπηρεσία (επανεκκίνηση)"</item>
+    <item msgid="6610439017684111046">"Δέκτης"</item>
+    <item msgid="7367606086319921117">"Αρχική οθόνη"</item>
+    <item msgid="3344660712396741826">"Τελευταία δραστηριότητα"</item>
+    <item msgid="5006559348883303865">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα)"</item>
+    <item msgid="8633480732468137525">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα πελάτη)"</item>
+    <item msgid="6248998242443333892">"Αποθηκευμένο στην κρυφή μνήμη (κενό)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Γαλαζοπράσινο"</item>
+    <item msgid="3228505970082457852">"Μπλε"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Μοβ"</item>
+    <item msgid="5932337981182999919">"Ροζ"</item>
+    <item msgid="5642914536624000094">"Κόκκινο"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Πάνω από 30 ημερών"</item>
+    <item msgid="8699273238891265610">"Πάνω από 60 ημερών"</item>
+    <item msgid="8346279419423837266">"Πάνω από 90 ημερών"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Αυτόματος εντοπισμός"</item>
+    <item msgid="773943026484148895">"Χρήση ως δικτύου με περιορισμούς"</item>
+    <item msgid="1008268820118852416">"Χρήση ως δικτύου χωρίς περιορισμούς"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Χρήση τυχαίου MAC (προεπιλογή)"</item>
+    <item msgid="214234417308375326">"Χρήση MAC συσκευής"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Όχι"</item>
+    <item msgid="1930581185557754880">"Ναι"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Σκοτεινό"</item>
+    <item msgid="5079453644557603349">"Φωτεινό"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Απενεργοποιημένη"</item>
+    <item msgid="4072198137051566919">"Εντοπισμός σφαλμάτων"</item>
+    <item msgid="2473005316958868509">"Λεπτομερής"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Μόνο αρχική σελίδα"</item>
+    <item msgid="1161026694891024702">"Αυτόματα"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Προτιμώνται GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Μόνο GSM"</item>
+    <item msgid="8579197487913425819">"Μόνο WCDMA"</item>
+    <item msgid="8465243227505412498">"Αυτόματο GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Αυτόματο EvDo/CDMA"</item>
+    <item msgid="4219607161971472471">"CDMA χωρίς EvDo"</item>
+    <item msgid="7278975240951052041">"Μόνο EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Παγκόσμιο"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Μόνο TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Παγκόσμιο"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-el/strings.xml b/tests/CarDeveloperOptions/res/values-el/strings.xml
index 839df90..0641a09 100644
--- a/tests/CarDeveloperOptions/res/values-el/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-el/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Προστατεύστε το tablet σας με μια επιλογή κλειδώματος οθόνης, έτσι ώστε κανείς να μην μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε τον έλεγχο ταυτότητας προσώπου. Πατήστε Ακύρωση και, έπειτα, ορίστε ένα PIN ή ορίστε κάποια άλλη επιλογή κλειδώματος οθόνης."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Προστατεύστε τη συσκευή σας με μια επιλογή κλειδώματος οθόνης, έτσι ώστε κανείς να μην μπορεί να τη χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε τον έλεγχο ταυτότητας προσώπου. Πατήστε Ακύρωση και, έπειτα, ορίστε ένα PIN ή ορίστε κάποια άλλη επιλογή κλειδώματος οθόνης."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Προστατεύστε το τηλέφωνό σας με μια επιλογή κλειδώματος οθόνης, έτσι ώστε κανείς να μην μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε τον έλεγχο ταυτότητας προσώπου. Πατήστε Ακύρωση και, έπειτα, ορίστε ένα PIN ή ορίστε κάποια άλλη επιλογή κλειδώματος οθόνης."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Παράβλεψη ρύθμισης PIN;"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Παράβλεψη ρύθμ. κωδ. πρόσβ.;"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Παράβλεψη ρύθμισης μοτίβου;"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ρύθμιση κλειδώματος οθόνης"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Δίκτυο κινητής τηλεφωνίας"</item>
+    <item msgid="6007360612667098926">"Μόνο Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2144,7 +2146,7 @@
     <string name="captioning_standard_options_title" msgid="4124898413348084226">"Βασικές επιλογές"</string>
     <string name="captioning_locale" msgid="4734464353806207943">"Γλώσσα"</string>
     <string name="captioning_text_size" msgid="1707122517246408084">"Μέγεθος κειμένου"</string>
-    <string name="captioning_preset" msgid="7429888317480872337">"Στυλ υποτίτλων"</string>
+    <string name="captioning_preset" msgid="7429888317480872337">"Στιλ υποτίτλων"</string>
     <string name="captioning_custom_options_title" msgid="4530479671071326732">"Προσαρμοσμένες επιλογές"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"Χρώμα φόντου"</string>
     <string name="captioning_background_opacity" msgid="8178926599201811936">"Αδιαφάνεια φόντου"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Θα επιβραδύνει αυτό το τηλέφωνο"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Αναγκαστικές πλήρεις μετρήσεις GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Παρακολούθηση όλων των πανοραμικών συνθέσεων και των συχνοτήτων GNSS χωρίς κύκλο λειτουργιών"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Εντοπισμός σφαλμάτων εναλλαγής χρήστη"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Εμφάνιση λεπτομερών πληροφοριών κατά την εναλλαγή χρήστη"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Να επιτρέπεται η έναρξη δραστηριοτήτων στο παρασκήνιο"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Επιτρέπει την έναρξη όλων των δραστηριοτήτων στο παρασκήνιο"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Να εμφανίζεται πάντα το παράθυρο διαλόγου σφάλματος"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rAU-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-en-rAU-nokeys/strings.xml
new file mode 100644
index 0000000..587a420
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rAU-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Manage applications"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml
new file mode 100644
index 0000000..f718198
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rAU/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"All"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 seconds"</item>
+    <item msgid="772029947136115322">"30 seconds"</item>
+    <item msgid="8743663928349474087">"1 minute"</item>
+    <item msgid="1506508631223164814">"2 minutes"</item>
+    <item msgid="8664703938127907662">"5 minutes"</item>
+    <item msgid="5827960506924849753">"10 minutes"</item>
+    <item msgid="6677424950124253938">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Small"</item>
+    <item msgid="591935967183159581">"Default"</item>
+    <item msgid="1714184661981538355">"Large"</item>
+    <item msgid="6195563047686707484">"Largest"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Scanning…"</item>
+    <item msgid="8058143476674427024">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspended"</item>
+    <item msgid="4133290864821295785">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Disconnected"</item>
+    <item msgid="2847316776634969068">"Unsuccessful"</item>
+    <item msgid="4390990424746035383">"Blocked"</item>
+    <item msgid="3618248791367063949">"Temporarily avoiding poor connection"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Push button"</item>
+    <item msgid="7401896200768713930">"PIN from peer device"</item>
+    <item msgid="4526848028011846710">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connected"</item>
+    <item msgid="983792611851499732">"Invited"</item>
+    <item msgid="5438273405428201793">"Unsuccessful"</item>
+    <item msgid="4646663015449312554">"Available"</item>
+    <item msgid="3230556734162006146">"Out of range"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutes"</item>
+    <item msgid="2759776603549270587">"5 minutes"</item>
+    <item msgid="167772676068860015">"1 hour"</item>
+    <item msgid="5985477119043628504">"Never time out"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Last 30 days"</item>
+    <item msgid="3211287705232736964">"Set usage cycle..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Usage time"</item>
+    <item msgid="2784401352592276015">"Last time used"</item>
+    <item msgid="249854287216326349">"App name"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"None"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"None"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"None"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"None"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP or CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Internal device storage"</item>
+    <item msgid="3186681694079967527">"Removable SD card"</item>
+    <item msgid="6902033473986647035">"Let the system decide"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Location"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Messaging"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"coarse location"</item>
+    <item msgid="1830619568689922920">"fine location"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrate"</item>
+    <item msgid="8632513128515114092">"read contacts"</item>
+    <item msgid="3741042113569620272">"modify contacts"</item>
+    <item msgid="4204420969709009931">"read call log"</item>
+    <item msgid="2260380357119423209">"modify call log"</item>
+    <item msgid="6550710385014530934">"read calendar"</item>
+    <item msgid="3575906174264853951">"modify calendar"</item>
+    <item msgid="4319843242568057174">"Wi-Fi scan"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"cell scan"</item>
+    <item msgid="8865260890611559753">"call phone"</item>
+    <item msgid="3254999273961542982">"read SMS"</item>
+    <item msgid="7711446453028825171">"write SMS"</item>
+    <item msgid="6123238544099198034">"receive SMS"</item>
+    <item msgid="838342167431596036">"receive emergency SMS"</item>
+    <item msgid="8554432731560956686">"receive MMS"</item>
+    <item msgid="7464863464299515059">"receive WAP push"</item>
+    <item msgid="310463075729606765">"send SMS"</item>
+    <item msgid="7338021933527689514">"read ICC SMS"</item>
+    <item msgid="6130369335466613036">"write ICC SMS"</item>
+    <item msgid="6536865581421670942">"modify settings"</item>
+    <item msgid="4547203129183558973">"draw on top"</item>
+    <item msgid="9080347512916542840">"access notifications"</item>
+    <item msgid="5332718516635907742">"camera"</item>
+    <item msgid="6098422447246167852">"record audio"</item>
+    <item msgid="9182794235292595296">"play audio"</item>
+    <item msgid="8760743229597702019">"read clipboard"</item>
+    <item msgid="2266923698240538544">"modify clipboard"</item>
+    <item msgid="1801619438618539275">"media buttons"</item>
+    <item msgid="31588119965784465">"audio focus"</item>
+    <item msgid="7565226799008076833">"master volume"</item>
+    <item msgid="5420704980305018295">"voice volume"</item>
+    <item msgid="5797363115508970204">"ring volume"</item>
+    <item msgid="8233154098550715999">"media volume"</item>
+    <item msgid="5196715605078153950">"alarm volume"</item>
+    <item msgid="394030698764284577">"notification volume"</item>
+    <item msgid="8952898972491680178">"Bluetooth volume"</item>
+    <item msgid="8506227454543690851">"keep awake"</item>
+    <item msgid="1108160036049727420">"monitor location"</item>
+    <item msgid="1496205959751719491">"monitor high power location"</item>
+    <item msgid="3776296279910987380">"get usage stats"</item>
+    <item msgid="8827100324471975602">"mute/unmute microphone"</item>
+    <item msgid="6880736730520126864">"show toast"</item>
+    <item msgid="4933375960222609935">"project media"</item>
+    <item msgid="8357907018938895462">"activate VPN"</item>
+    <item msgid="8143812849911310973">"write wallpaper"</item>
+    <item msgid="6266277260961066535">"assist structure"</item>
+    <item msgid="7715498149883482300">"assist screenshot"</item>
+    <item msgid="4046679376726313293">"read phone state"</item>
+    <item msgid="6329507266039719587">"add voicemail"</item>
+    <item msgid="7692440726415391408">"use sip"</item>
+    <item msgid="8572453398128326267">"process outgoing call"</item>
+    <item msgid="7775674394089376306">"fingerprint"</item>
+    <item msgid="3182815133441738779">"body sensors"</item>
+    <item msgid="2793100005496829513">"read mobile broadcasts"</item>
+    <item msgid="2633626056029384366">"mock location"</item>
+    <item msgid="8356842191824684631">"read storage"</item>
+    <item msgid="5671906070163291500">"write storage"</item>
+    <item msgid="2791955098549340418">"turn on screen"</item>
+    <item msgid="5599435119609178367">"get accounts"</item>
+    <item msgid="1165623660533024666">"run in background"</item>
+    <item msgid="6423861043647911030">"accessibility volume"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Short"</item>
+    <item msgid="4816511817309094890">"Medium"</item>
+    <item msgid="8305084671259331134">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Default"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Default"</item>
+    <item msgid="6488643537808152001">"None"</item>
+    <item msgid="552332815156010137">"Outline"</item>
+    <item msgid="7187891159463789272">"Drop shadow"</item>
+    <item msgid="8019330250538856521">"Raised"</item>
+    <item msgid="8987385315647049787">"Depressed"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Use app defaults"</item>
+    <item msgid="8611890312638868524">"White on black"</item>
+    <item msgid="5891360837786277638">"Black on white"</item>
+    <item msgid="2798457065945456853">"Yellow on black"</item>
+    <item msgid="5799049811524553967">"Yellow on blue"</item>
+    <item msgid="3673930830658169860">"Custom"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN with certificates"</item>
+    <item msgid="312397853907741968">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="3319427315593649917">"IPSec VPN with certificates and Xauth authentication"</item>
+    <item msgid="8258927774145391041">"IPSec VPN with certificates and hybrid authentication"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"None"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Disconnected"</item>
+    <item msgid="8754480102834556765">"Initialising..."</item>
+    <item msgid="3351334355574270250">"Connecting…"</item>
+    <item msgid="8303882153995748352">"Connected"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Unsuccessful"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Ask"</item>
+    <item msgid="7718817231348607934">"Never allow"</item>
+    <item msgid="8184570120217958741">"Always allow"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistent"</item>
+    <item msgid="167418068739176448">"Top activity"</item>
+    <item msgid="4760813290195199773">"Important (foreground)"</item>
+    <item msgid="2328684826817647595">"Important (background)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Heavy weight"</item>
+    <item msgid="1290888779300174556">"Service (running)"</item>
+    <item msgid="7241098542073939046">"Service (restarting)"</item>
+    <item msgid="6610439017684111046">"Receiver"</item>
+    <item msgid="7367606086319921117">"Home"</item>
+    <item msgid="3344660712396741826">"Last activity"</item>
+    <item msgid="5006559348883303865">"Cached (activity)"</item>
+    <item msgid="8633480732468137525">"Cached (activity client)"</item>
+    <item msgid="6248998242443333892">"Cached (empty)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"Blue"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Purple"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Red"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Over 30 days old"</item>
+    <item msgid="8699273238891265610">"Over 60 days old"</item>
+    <item msgid="8346279419423837266">"Over 90 days old"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detect automatically"</item>
+    <item msgid="773943026484148895">"Treat as metered"</item>
+    <item msgid="1008268820118852416">"Treat as unmetered"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Use randomised MAC (default)"</item>
+    <item msgid="214234417308375326">"Use device MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Yes"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Dark"</item>
+    <item msgid="5079453644557603349">"Light"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Off"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Home only"</item>
+    <item msgid="1161026694891024702">"Automatic"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferred"</item>
+    <item msgid="7581481130337402578">"GSM only"</item>
+    <item msgid="8579197487913425819">"WCDMA only"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA auto"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo auto"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo only"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA only"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
index 1b1faa9..0cf4a48 100644
--- a/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
@@ -185,7 +185,7 @@
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Previously connected"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="4652326177920814476">"Bluetooth turned on"</string>
     <string name="previous_connected_see_all" msgid="7237095013087310923">"See all"</string>
-    <string name="date_and_time" msgid="2957463607025909857">"Date &amp; time"</string>
+    <string name="date_and_time" msgid="2957463607025909857">"Date and time"</string>
     <string name="choose_timezone" msgid="8215332993926818147">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (2009833999785758727) -->
     <skip />
@@ -320,7 +320,7 @@
     <string name="roaming_reenable_title" msgid="6985082191178297921">"Allow data roaming?"</string>
     <string name="networks" msgid="3073876464102136771">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="8964744180598499121">"Choose a network operator"</string>
-    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Set date, time, time zone, &amp; formats"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Use network-provided time"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1607,7 +1609,7 @@
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot and tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot on, tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Hotspot on"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Tethering"</string>
@@ -1937,9 +1939,9 @@
     <string name="language_input_gesture_summary_on_with_assist" msgid="315262339899294132"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="6054599939153669225"></string>
     <string name="language_input_gesture_summary_off" msgid="4108509077072348546"></string>
-    <string name="language_settings" msgid="3551012802762495835">"Languages &amp; input"</string>
+    <string name="language_settings" msgid="3551012802762495835">"Languages and input"</string>
     <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"You don’t have permission to change the device language."</string>
-    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages and input"</string>
     <string name="input_assistance" msgid="6442646949054057707">"Tools"</string>
     <string name="keyboard_settings_category" msgid="5857591390023852850">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="8471728119195198790">"Languages"</string>
@@ -2052,7 +2054,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Tap a button to zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Shortcut service"</string>
@@ -3024,7 +3026,7 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="8288134139584687806">"Network &amp; Internet"</string>
+    <string name="network_dashboard_title" msgid="8288134139584687806">"Network and Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"hotspot"</string>
@@ -3033,7 +3035,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, driving mode"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps &amp; notifications"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps and notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistant, recent apps, default apps"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"Notification access is not available for apps in the work profile."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Accounts"</string>
@@ -4101,9 +4103,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Free up space now"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Gestures"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick gestures to control your phone"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick gestures to control your tablet"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick gestures to control your device"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick Gestures to control your phone"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick Gestures to control your tablet"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick Gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Open camera quickly"</string>
@@ -4229,7 +4231,7 @@
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="1890829312367477559">"Photos &amp; videos"</string>
-    <string name="storage_music_audio" msgid="3661289086715297149">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="3661289086715297149">"Music and audio"</string>
     <string name="storage_games" msgid="7740038143749092373">"Games"</string>
     <string name="storage_other_apps" msgid="3202407095387420842">"Other apps"</string>
     <string name="storage_files" msgid="2087824267937487880">"Files"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"It will slow down this phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Track all GNSS constellations and frequencies with no duty cycling"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Debug user switch"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Show detailed information during user switch"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Allow background activity starts"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Allow all background activity starts"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Always show crash dialogue"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rCA-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-en-rCA-nokeys/strings.xml
new file mode 100644
index 0000000..587a420
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rCA-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Manage applications"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml
new file mode 100644
index 0000000..f718198
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rCA/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"All"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 seconds"</item>
+    <item msgid="772029947136115322">"30 seconds"</item>
+    <item msgid="8743663928349474087">"1 minute"</item>
+    <item msgid="1506508631223164814">"2 minutes"</item>
+    <item msgid="8664703938127907662">"5 minutes"</item>
+    <item msgid="5827960506924849753">"10 minutes"</item>
+    <item msgid="6677424950124253938">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Small"</item>
+    <item msgid="591935967183159581">"Default"</item>
+    <item msgid="1714184661981538355">"Large"</item>
+    <item msgid="6195563047686707484">"Largest"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Scanning…"</item>
+    <item msgid="8058143476674427024">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspended"</item>
+    <item msgid="4133290864821295785">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Disconnected"</item>
+    <item msgid="2847316776634969068">"Unsuccessful"</item>
+    <item msgid="4390990424746035383">"Blocked"</item>
+    <item msgid="3618248791367063949">"Temporarily avoiding poor connection"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Push button"</item>
+    <item msgid="7401896200768713930">"PIN from peer device"</item>
+    <item msgid="4526848028011846710">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connected"</item>
+    <item msgid="983792611851499732">"Invited"</item>
+    <item msgid="5438273405428201793">"Unsuccessful"</item>
+    <item msgid="4646663015449312554">"Available"</item>
+    <item msgid="3230556734162006146">"Out of range"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutes"</item>
+    <item msgid="2759776603549270587">"5 minutes"</item>
+    <item msgid="167772676068860015">"1 hour"</item>
+    <item msgid="5985477119043628504">"Never time out"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Last 30 days"</item>
+    <item msgid="3211287705232736964">"Set usage cycle..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Usage time"</item>
+    <item msgid="2784401352592276015">"Last time used"</item>
+    <item msgid="249854287216326349">"App name"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"None"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"None"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"None"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"None"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP or CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Internal device storage"</item>
+    <item msgid="3186681694079967527">"Removable SD card"</item>
+    <item msgid="6902033473986647035">"Let the system decide"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Location"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Messaging"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"coarse location"</item>
+    <item msgid="1830619568689922920">"fine location"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrate"</item>
+    <item msgid="8632513128515114092">"read contacts"</item>
+    <item msgid="3741042113569620272">"modify contacts"</item>
+    <item msgid="4204420969709009931">"read call log"</item>
+    <item msgid="2260380357119423209">"modify call log"</item>
+    <item msgid="6550710385014530934">"read calendar"</item>
+    <item msgid="3575906174264853951">"modify calendar"</item>
+    <item msgid="4319843242568057174">"Wi-Fi scan"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"cell scan"</item>
+    <item msgid="8865260890611559753">"call phone"</item>
+    <item msgid="3254999273961542982">"read SMS"</item>
+    <item msgid="7711446453028825171">"write SMS"</item>
+    <item msgid="6123238544099198034">"receive SMS"</item>
+    <item msgid="838342167431596036">"receive emergency SMS"</item>
+    <item msgid="8554432731560956686">"receive MMS"</item>
+    <item msgid="7464863464299515059">"receive WAP push"</item>
+    <item msgid="310463075729606765">"send SMS"</item>
+    <item msgid="7338021933527689514">"read ICC SMS"</item>
+    <item msgid="6130369335466613036">"write ICC SMS"</item>
+    <item msgid="6536865581421670942">"modify settings"</item>
+    <item msgid="4547203129183558973">"draw on top"</item>
+    <item msgid="9080347512916542840">"access notifications"</item>
+    <item msgid="5332718516635907742">"camera"</item>
+    <item msgid="6098422447246167852">"record audio"</item>
+    <item msgid="9182794235292595296">"play audio"</item>
+    <item msgid="8760743229597702019">"read clipboard"</item>
+    <item msgid="2266923698240538544">"modify clipboard"</item>
+    <item msgid="1801619438618539275">"media buttons"</item>
+    <item msgid="31588119965784465">"audio focus"</item>
+    <item msgid="7565226799008076833">"master volume"</item>
+    <item msgid="5420704980305018295">"voice volume"</item>
+    <item msgid="5797363115508970204">"ring volume"</item>
+    <item msgid="8233154098550715999">"media volume"</item>
+    <item msgid="5196715605078153950">"alarm volume"</item>
+    <item msgid="394030698764284577">"notification volume"</item>
+    <item msgid="8952898972491680178">"Bluetooth volume"</item>
+    <item msgid="8506227454543690851">"keep awake"</item>
+    <item msgid="1108160036049727420">"monitor location"</item>
+    <item msgid="1496205959751719491">"monitor high power location"</item>
+    <item msgid="3776296279910987380">"get usage stats"</item>
+    <item msgid="8827100324471975602">"mute/unmute microphone"</item>
+    <item msgid="6880736730520126864">"show toast"</item>
+    <item msgid="4933375960222609935">"project media"</item>
+    <item msgid="8357907018938895462">"activate VPN"</item>
+    <item msgid="8143812849911310973">"write wallpaper"</item>
+    <item msgid="6266277260961066535">"assist structure"</item>
+    <item msgid="7715498149883482300">"assist screenshot"</item>
+    <item msgid="4046679376726313293">"read phone state"</item>
+    <item msgid="6329507266039719587">"add voicemail"</item>
+    <item msgid="7692440726415391408">"use sip"</item>
+    <item msgid="8572453398128326267">"process outgoing call"</item>
+    <item msgid="7775674394089376306">"fingerprint"</item>
+    <item msgid="3182815133441738779">"body sensors"</item>
+    <item msgid="2793100005496829513">"read mobile broadcasts"</item>
+    <item msgid="2633626056029384366">"mock location"</item>
+    <item msgid="8356842191824684631">"read storage"</item>
+    <item msgid="5671906070163291500">"write storage"</item>
+    <item msgid="2791955098549340418">"turn on screen"</item>
+    <item msgid="5599435119609178367">"get accounts"</item>
+    <item msgid="1165623660533024666">"run in background"</item>
+    <item msgid="6423861043647911030">"accessibility volume"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Short"</item>
+    <item msgid="4816511817309094890">"Medium"</item>
+    <item msgid="8305084671259331134">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Default"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Default"</item>
+    <item msgid="6488643537808152001">"None"</item>
+    <item msgid="552332815156010137">"Outline"</item>
+    <item msgid="7187891159463789272">"Drop shadow"</item>
+    <item msgid="8019330250538856521">"Raised"</item>
+    <item msgid="8987385315647049787">"Depressed"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Use app defaults"</item>
+    <item msgid="8611890312638868524">"White on black"</item>
+    <item msgid="5891360837786277638">"Black on white"</item>
+    <item msgid="2798457065945456853">"Yellow on black"</item>
+    <item msgid="5799049811524553967">"Yellow on blue"</item>
+    <item msgid="3673930830658169860">"Custom"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN with certificates"</item>
+    <item msgid="312397853907741968">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="3319427315593649917">"IPSec VPN with certificates and Xauth authentication"</item>
+    <item msgid="8258927774145391041">"IPSec VPN with certificates and hybrid authentication"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"None"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Disconnected"</item>
+    <item msgid="8754480102834556765">"Initialising..."</item>
+    <item msgid="3351334355574270250">"Connecting…"</item>
+    <item msgid="8303882153995748352">"Connected"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Unsuccessful"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Ask"</item>
+    <item msgid="7718817231348607934">"Never allow"</item>
+    <item msgid="8184570120217958741">"Always allow"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistent"</item>
+    <item msgid="167418068739176448">"Top activity"</item>
+    <item msgid="4760813290195199773">"Important (foreground)"</item>
+    <item msgid="2328684826817647595">"Important (background)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Heavy weight"</item>
+    <item msgid="1290888779300174556">"Service (running)"</item>
+    <item msgid="7241098542073939046">"Service (restarting)"</item>
+    <item msgid="6610439017684111046">"Receiver"</item>
+    <item msgid="7367606086319921117">"Home"</item>
+    <item msgid="3344660712396741826">"Last activity"</item>
+    <item msgid="5006559348883303865">"Cached (activity)"</item>
+    <item msgid="8633480732468137525">"Cached (activity client)"</item>
+    <item msgid="6248998242443333892">"Cached (empty)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"Blue"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Purple"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Red"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Over 30 days old"</item>
+    <item msgid="8699273238891265610">"Over 60 days old"</item>
+    <item msgid="8346279419423837266">"Over 90 days old"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detect automatically"</item>
+    <item msgid="773943026484148895">"Treat as metered"</item>
+    <item msgid="1008268820118852416">"Treat as unmetered"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Use randomised MAC (default)"</item>
+    <item msgid="214234417308375326">"Use device MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Yes"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Dark"</item>
+    <item msgid="5079453644557603349">"Light"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Off"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Home only"</item>
+    <item msgid="1161026694891024702">"Automatic"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferred"</item>
+    <item msgid="7581481130337402578">"GSM only"</item>
+    <item msgid="8579197487913425819">"WCDMA only"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA auto"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo auto"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo only"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA only"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
index 3e64085..f6ca7a1 100644
--- a/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
@@ -185,7 +185,7 @@
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Previously connected"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="4652326177920814476">"Bluetooth turned on"</string>
     <string name="previous_connected_see_all" msgid="7237095013087310923">"See all"</string>
-    <string name="date_and_time" msgid="2957463607025909857">"Date &amp; time"</string>
+    <string name="date_and_time" msgid="2957463607025909857">"Date and time"</string>
     <string name="choose_timezone" msgid="8215332993926818147">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (2009833999785758727) -->
     <skip />
@@ -320,7 +320,7 @@
     <string name="roaming_reenable_title" msgid="6985082191178297921">"Allow data roaming?"</string>
     <string name="networks" msgid="3073876464102136771">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="8964744180598499121">"Choose a network operator"</string>
-    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Set date, time, time zone, &amp; formats"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Use network-provided time"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1607,7 +1609,7 @@
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot and tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot on, tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Hotspot on"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Tethering"</string>
@@ -1937,9 +1939,9 @@
     <string name="language_input_gesture_summary_on_with_assist" msgid="315262339899294132"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="6054599939153669225"></string>
     <string name="language_input_gesture_summary_off" msgid="4108509077072348546"></string>
-    <string name="language_settings" msgid="3551012802762495835">"Languages &amp; input"</string>
+    <string name="language_settings" msgid="3551012802762495835">"Languages and input"</string>
     <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"You don’t have permission to change the device language."</string>
-    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages and input"</string>
     <string name="input_assistance" msgid="6442646949054057707">"Tools"</string>
     <string name="keyboard_settings_category" msgid="5857591390023852850">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="8471728119195198790">"Languages"</string>
@@ -2052,7 +2054,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Tap a button to zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Shortcut service"</string>
@@ -3024,7 +3026,7 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="8288134139584687806">"Network &amp; Internet"</string>
+    <string name="network_dashboard_title" msgid="8288134139584687806">"Network and Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"hotspot"</string>
@@ -3033,7 +3035,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, driving mode"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps &amp; notifications"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps and notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistant, recent apps, default apps"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"Notification access is not available for apps in the work profile."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Accounts"</string>
@@ -4101,9 +4103,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Free up space now"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Gestures"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick gestures to control your phone"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick gestures to control your tablet"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick gestures to control your device"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick Gestures to control your phone"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick Gestures to control your tablet"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick Gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Open camera quickly"</string>
@@ -4229,7 +4231,7 @@
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="1890829312367477559">"Photos &amp; videos"</string>
-    <string name="storage_music_audio" msgid="3661289086715297149">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="3661289086715297149">"Music and audio"</string>
     <string name="storage_games" msgid="7740038143749092373">"Games"</string>
     <string name="storage_other_apps" msgid="3202407095387420842">"Other apps"</string>
     <string name="storage_files" msgid="2087824267937487880">"Files"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"It will slow down this phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Track all GNSS constellations and frequencies with no duty cycling"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Debug user switch"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Show detailed information during user switch"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Allow background activity starts"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Allow all background activity starts"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Always show crash dialogue"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rGB-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-en-rGB-nokeys/strings.xml
new file mode 100644
index 0000000..587a420
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rGB-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Manage applications"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml
new file mode 100644
index 0000000..f718198
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rGB/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"All"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 seconds"</item>
+    <item msgid="772029947136115322">"30 seconds"</item>
+    <item msgid="8743663928349474087">"1 minute"</item>
+    <item msgid="1506508631223164814">"2 minutes"</item>
+    <item msgid="8664703938127907662">"5 minutes"</item>
+    <item msgid="5827960506924849753">"10 minutes"</item>
+    <item msgid="6677424950124253938">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Small"</item>
+    <item msgid="591935967183159581">"Default"</item>
+    <item msgid="1714184661981538355">"Large"</item>
+    <item msgid="6195563047686707484">"Largest"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Scanning…"</item>
+    <item msgid="8058143476674427024">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspended"</item>
+    <item msgid="4133290864821295785">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Disconnected"</item>
+    <item msgid="2847316776634969068">"Unsuccessful"</item>
+    <item msgid="4390990424746035383">"Blocked"</item>
+    <item msgid="3618248791367063949">"Temporarily avoiding poor connection"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Push button"</item>
+    <item msgid="7401896200768713930">"PIN from peer device"</item>
+    <item msgid="4526848028011846710">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connected"</item>
+    <item msgid="983792611851499732">"Invited"</item>
+    <item msgid="5438273405428201793">"Unsuccessful"</item>
+    <item msgid="4646663015449312554">"Available"</item>
+    <item msgid="3230556734162006146">"Out of range"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutes"</item>
+    <item msgid="2759776603549270587">"5 minutes"</item>
+    <item msgid="167772676068860015">"1 hour"</item>
+    <item msgid="5985477119043628504">"Never time out"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Last 30 days"</item>
+    <item msgid="3211287705232736964">"Set usage cycle..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Usage time"</item>
+    <item msgid="2784401352592276015">"Last time used"</item>
+    <item msgid="249854287216326349">"App name"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"None"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"None"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"None"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"None"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP or CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Internal device storage"</item>
+    <item msgid="3186681694079967527">"Removable SD card"</item>
+    <item msgid="6902033473986647035">"Let the system decide"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Location"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Messaging"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"coarse location"</item>
+    <item msgid="1830619568689922920">"fine location"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrate"</item>
+    <item msgid="8632513128515114092">"read contacts"</item>
+    <item msgid="3741042113569620272">"modify contacts"</item>
+    <item msgid="4204420969709009931">"read call log"</item>
+    <item msgid="2260380357119423209">"modify call log"</item>
+    <item msgid="6550710385014530934">"read calendar"</item>
+    <item msgid="3575906174264853951">"modify calendar"</item>
+    <item msgid="4319843242568057174">"Wi-Fi scan"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"cell scan"</item>
+    <item msgid="8865260890611559753">"call phone"</item>
+    <item msgid="3254999273961542982">"read SMS"</item>
+    <item msgid="7711446453028825171">"write SMS"</item>
+    <item msgid="6123238544099198034">"receive SMS"</item>
+    <item msgid="838342167431596036">"receive emergency SMS"</item>
+    <item msgid="8554432731560956686">"receive MMS"</item>
+    <item msgid="7464863464299515059">"receive WAP push"</item>
+    <item msgid="310463075729606765">"send SMS"</item>
+    <item msgid="7338021933527689514">"read ICC SMS"</item>
+    <item msgid="6130369335466613036">"write ICC SMS"</item>
+    <item msgid="6536865581421670942">"modify settings"</item>
+    <item msgid="4547203129183558973">"draw on top"</item>
+    <item msgid="9080347512916542840">"access notifications"</item>
+    <item msgid="5332718516635907742">"camera"</item>
+    <item msgid="6098422447246167852">"record audio"</item>
+    <item msgid="9182794235292595296">"play audio"</item>
+    <item msgid="8760743229597702019">"read clipboard"</item>
+    <item msgid="2266923698240538544">"modify clipboard"</item>
+    <item msgid="1801619438618539275">"media buttons"</item>
+    <item msgid="31588119965784465">"audio focus"</item>
+    <item msgid="7565226799008076833">"master volume"</item>
+    <item msgid="5420704980305018295">"voice volume"</item>
+    <item msgid="5797363115508970204">"ring volume"</item>
+    <item msgid="8233154098550715999">"media volume"</item>
+    <item msgid="5196715605078153950">"alarm volume"</item>
+    <item msgid="394030698764284577">"notification volume"</item>
+    <item msgid="8952898972491680178">"Bluetooth volume"</item>
+    <item msgid="8506227454543690851">"keep awake"</item>
+    <item msgid="1108160036049727420">"monitor location"</item>
+    <item msgid="1496205959751719491">"monitor high power location"</item>
+    <item msgid="3776296279910987380">"get usage stats"</item>
+    <item msgid="8827100324471975602">"mute/unmute microphone"</item>
+    <item msgid="6880736730520126864">"show toast"</item>
+    <item msgid="4933375960222609935">"project media"</item>
+    <item msgid="8357907018938895462">"activate VPN"</item>
+    <item msgid="8143812849911310973">"write wallpaper"</item>
+    <item msgid="6266277260961066535">"assist structure"</item>
+    <item msgid="7715498149883482300">"assist screenshot"</item>
+    <item msgid="4046679376726313293">"read phone state"</item>
+    <item msgid="6329507266039719587">"add voicemail"</item>
+    <item msgid="7692440726415391408">"use sip"</item>
+    <item msgid="8572453398128326267">"process outgoing call"</item>
+    <item msgid="7775674394089376306">"fingerprint"</item>
+    <item msgid="3182815133441738779">"body sensors"</item>
+    <item msgid="2793100005496829513">"read mobile broadcasts"</item>
+    <item msgid="2633626056029384366">"mock location"</item>
+    <item msgid="8356842191824684631">"read storage"</item>
+    <item msgid="5671906070163291500">"write storage"</item>
+    <item msgid="2791955098549340418">"turn on screen"</item>
+    <item msgid="5599435119609178367">"get accounts"</item>
+    <item msgid="1165623660533024666">"run in background"</item>
+    <item msgid="6423861043647911030">"accessibility volume"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Short"</item>
+    <item msgid="4816511817309094890">"Medium"</item>
+    <item msgid="8305084671259331134">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Default"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Default"</item>
+    <item msgid="6488643537808152001">"None"</item>
+    <item msgid="552332815156010137">"Outline"</item>
+    <item msgid="7187891159463789272">"Drop shadow"</item>
+    <item msgid="8019330250538856521">"Raised"</item>
+    <item msgid="8987385315647049787">"Depressed"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Use app defaults"</item>
+    <item msgid="8611890312638868524">"White on black"</item>
+    <item msgid="5891360837786277638">"Black on white"</item>
+    <item msgid="2798457065945456853">"Yellow on black"</item>
+    <item msgid="5799049811524553967">"Yellow on blue"</item>
+    <item msgid="3673930830658169860">"Custom"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN with certificates"</item>
+    <item msgid="312397853907741968">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="3319427315593649917">"IPSec VPN with certificates and Xauth authentication"</item>
+    <item msgid="8258927774145391041">"IPSec VPN with certificates and hybrid authentication"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"None"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Disconnected"</item>
+    <item msgid="8754480102834556765">"Initialising..."</item>
+    <item msgid="3351334355574270250">"Connecting…"</item>
+    <item msgid="8303882153995748352">"Connected"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Unsuccessful"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Ask"</item>
+    <item msgid="7718817231348607934">"Never allow"</item>
+    <item msgid="8184570120217958741">"Always allow"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistent"</item>
+    <item msgid="167418068739176448">"Top activity"</item>
+    <item msgid="4760813290195199773">"Important (foreground)"</item>
+    <item msgid="2328684826817647595">"Important (background)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Heavy weight"</item>
+    <item msgid="1290888779300174556">"Service (running)"</item>
+    <item msgid="7241098542073939046">"Service (restarting)"</item>
+    <item msgid="6610439017684111046">"Receiver"</item>
+    <item msgid="7367606086319921117">"Home"</item>
+    <item msgid="3344660712396741826">"Last activity"</item>
+    <item msgid="5006559348883303865">"Cached (activity)"</item>
+    <item msgid="8633480732468137525">"Cached (activity client)"</item>
+    <item msgid="6248998242443333892">"Cached (empty)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"Blue"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Purple"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Red"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Over 30 days old"</item>
+    <item msgid="8699273238891265610">"Over 60 days old"</item>
+    <item msgid="8346279419423837266">"Over 90 days old"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detect automatically"</item>
+    <item msgid="773943026484148895">"Treat as metered"</item>
+    <item msgid="1008268820118852416">"Treat as unmetered"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Use randomised MAC (default)"</item>
+    <item msgid="214234417308375326">"Use device MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Yes"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Dark"</item>
+    <item msgid="5079453644557603349">"Light"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Off"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Home only"</item>
+    <item msgid="1161026694891024702">"Automatic"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferred"</item>
+    <item msgid="7581481130337402578">"GSM only"</item>
+    <item msgid="8579197487913425819">"WCDMA only"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA auto"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo auto"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo only"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA only"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
index 1b1faa9..0cf4a48 100644
--- a/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
@@ -185,7 +185,7 @@
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Previously connected"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="4652326177920814476">"Bluetooth turned on"</string>
     <string name="previous_connected_see_all" msgid="7237095013087310923">"See all"</string>
-    <string name="date_and_time" msgid="2957463607025909857">"Date &amp; time"</string>
+    <string name="date_and_time" msgid="2957463607025909857">"Date and time"</string>
     <string name="choose_timezone" msgid="8215332993926818147">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (2009833999785758727) -->
     <skip />
@@ -320,7 +320,7 @@
     <string name="roaming_reenable_title" msgid="6985082191178297921">"Allow data roaming?"</string>
     <string name="networks" msgid="3073876464102136771">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="8964744180598499121">"Choose a network operator"</string>
-    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Set date, time, time zone, &amp; formats"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Use network-provided time"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1607,7 +1609,7 @@
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot and tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot on, tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Hotspot on"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Tethering"</string>
@@ -1937,9 +1939,9 @@
     <string name="language_input_gesture_summary_on_with_assist" msgid="315262339899294132"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="6054599939153669225"></string>
     <string name="language_input_gesture_summary_off" msgid="4108509077072348546"></string>
-    <string name="language_settings" msgid="3551012802762495835">"Languages &amp; input"</string>
+    <string name="language_settings" msgid="3551012802762495835">"Languages and input"</string>
     <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"You don’t have permission to change the device language."</string>
-    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages and input"</string>
     <string name="input_assistance" msgid="6442646949054057707">"Tools"</string>
     <string name="keyboard_settings_category" msgid="5857591390023852850">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="8471728119195198790">"Languages"</string>
@@ -2052,7 +2054,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Tap a button to zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Shortcut service"</string>
@@ -3024,7 +3026,7 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="8288134139584687806">"Network &amp; Internet"</string>
+    <string name="network_dashboard_title" msgid="8288134139584687806">"Network and Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"hotspot"</string>
@@ -3033,7 +3035,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, driving mode"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps &amp; notifications"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps and notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistant, recent apps, default apps"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"Notification access is not available for apps in the work profile."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Accounts"</string>
@@ -4101,9 +4103,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Free up space now"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Gestures"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick gestures to control your phone"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick gestures to control your tablet"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick gestures to control your device"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick Gestures to control your phone"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick Gestures to control your tablet"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick Gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Open camera quickly"</string>
@@ -4229,7 +4231,7 @@
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="1890829312367477559">"Photos &amp; videos"</string>
-    <string name="storage_music_audio" msgid="3661289086715297149">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="3661289086715297149">"Music and audio"</string>
     <string name="storage_games" msgid="7740038143749092373">"Games"</string>
     <string name="storage_other_apps" msgid="3202407095387420842">"Other apps"</string>
     <string name="storage_files" msgid="2087824267937487880">"Files"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"It will slow down this phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Track all GNSS constellations and frequencies with no duty cycling"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Debug user switch"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Show detailed information during user switch"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Allow background activity starts"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Allow all background activity starts"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Always show crash dialogue"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rIN-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-en-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..587a420
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Manage applications"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml b/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml
new file mode 100644
index 0000000..f718198
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-en-rIN/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"All"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 seconds"</item>
+    <item msgid="772029947136115322">"30 seconds"</item>
+    <item msgid="8743663928349474087">"1 minute"</item>
+    <item msgid="1506508631223164814">"2 minutes"</item>
+    <item msgid="8664703938127907662">"5 minutes"</item>
+    <item msgid="5827960506924849753">"10 minutes"</item>
+    <item msgid="6677424950124253938">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Never"</item>
+    <item msgid="2517785806387977252">"15 seconds"</item>
+    <item msgid="6347954399441173672">"30 seconds"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediately"</item>
+    <item msgid="2038544972632026612">"5 seconds"</item>
+    <item msgid="5558060663472279597">"15 seconds"</item>
+    <item msgid="45341168505452037">"30 seconds"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Small"</item>
+    <item msgid="591935967183159581">"Default"</item>
+    <item msgid="1714184661981538355">"Large"</item>
+    <item msgid="6195563047686707484">"Largest"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scanning…"</item>
+    <item msgid="5597394826455877834">"Connecting…"</item>
+    <item msgid="5848277343965362748">"Authenticating…"</item>
+    <item msgid="3391238031431440676">"Obtaining IP address…"</item>
+    <item msgid="5257597310494000224">"Connected"</item>
+    <item msgid="8472497592913050396">"Suspended"</item>
+    <item msgid="1228072488815999109">"Disconnecting…"</item>
+    <item msgid="7253087004422991731">"Disconnected"</item>
+    <item msgid="4169850917304751227">"Unsuccessful"</item>
+    <item msgid="6266658166690831131">"Blocked"</item>
+    <item msgid="4517230805854909775">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Scanning…"</item>
+    <item msgid="8058143476674427024">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspended"</item>
+    <item msgid="4133290864821295785">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Disconnected"</item>
+    <item msgid="2847316776634969068">"Unsuccessful"</item>
+    <item msgid="4390990424746035383">"Blocked"</item>
+    <item msgid="3618248791367063949">"Temporarily avoiding poor connection"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Push button"</item>
+    <item msgid="7401896200768713930">"PIN from peer device"</item>
+    <item msgid="4526848028011846710">"PIN from this device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connected"</item>
+    <item msgid="983792611851499732">"Invited"</item>
+    <item msgid="5438273405428201793">"Unsuccessful"</item>
+    <item msgid="4646663015449312554">"Available"</item>
+    <item msgid="3230556734162006146">"Out of range"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutes"</item>
+    <item msgid="2759776603549270587">"5 minutes"</item>
+    <item msgid="167772676068860015">"1 hour"</item>
+    <item msgid="5985477119043628504">"Never time out"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Use system default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Poor"</item>
+    <item msgid="7882129634982603782">"Poor"</item>
+    <item msgid="6457357501905996224">"Fair"</item>
+    <item msgid="405271628162918841">"Good"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Last 30 days"</item>
+    <item msgid="3211287705232736964">"Set usage cycle..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Usage time"</item>
+    <item msgid="2784401352592276015">"Last time used"</item>
+    <item msgid="249854287216326349">"App name"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"None"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"None"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"None"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"None"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"None"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP or CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Unspecified"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"None"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Internal device storage"</item>
+    <item msgid="3186681694079967527">"Removable SD card"</item>
+    <item msgid="6902033473986647035">"Let the system decide"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Location"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Messaging"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"coarse location"</item>
+    <item msgid="1830619568689922920">"fine location"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrate"</item>
+    <item msgid="8632513128515114092">"read contacts"</item>
+    <item msgid="3741042113569620272">"modify contacts"</item>
+    <item msgid="4204420969709009931">"read call log"</item>
+    <item msgid="2260380357119423209">"modify call log"</item>
+    <item msgid="6550710385014530934">"read calendar"</item>
+    <item msgid="3575906174264853951">"modify calendar"</item>
+    <item msgid="4319843242568057174">"Wi-Fi scan"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"cell scan"</item>
+    <item msgid="8865260890611559753">"call phone"</item>
+    <item msgid="3254999273961542982">"read SMS"</item>
+    <item msgid="7711446453028825171">"write SMS"</item>
+    <item msgid="6123238544099198034">"receive SMS"</item>
+    <item msgid="838342167431596036">"receive emergency SMS"</item>
+    <item msgid="8554432731560956686">"receive MMS"</item>
+    <item msgid="7464863464299515059">"receive WAP push"</item>
+    <item msgid="310463075729606765">"send SMS"</item>
+    <item msgid="7338021933527689514">"read ICC SMS"</item>
+    <item msgid="6130369335466613036">"write ICC SMS"</item>
+    <item msgid="6536865581421670942">"modify settings"</item>
+    <item msgid="4547203129183558973">"draw on top"</item>
+    <item msgid="9080347512916542840">"access notifications"</item>
+    <item msgid="5332718516635907742">"camera"</item>
+    <item msgid="6098422447246167852">"record audio"</item>
+    <item msgid="9182794235292595296">"play audio"</item>
+    <item msgid="8760743229597702019">"read clipboard"</item>
+    <item msgid="2266923698240538544">"modify clipboard"</item>
+    <item msgid="1801619438618539275">"media buttons"</item>
+    <item msgid="31588119965784465">"audio focus"</item>
+    <item msgid="7565226799008076833">"master volume"</item>
+    <item msgid="5420704980305018295">"voice volume"</item>
+    <item msgid="5797363115508970204">"ring volume"</item>
+    <item msgid="8233154098550715999">"media volume"</item>
+    <item msgid="5196715605078153950">"alarm volume"</item>
+    <item msgid="394030698764284577">"notification volume"</item>
+    <item msgid="8952898972491680178">"Bluetooth volume"</item>
+    <item msgid="8506227454543690851">"keep awake"</item>
+    <item msgid="1108160036049727420">"monitor location"</item>
+    <item msgid="1496205959751719491">"monitor high power location"</item>
+    <item msgid="3776296279910987380">"get usage stats"</item>
+    <item msgid="8827100324471975602">"mute/unmute microphone"</item>
+    <item msgid="6880736730520126864">"show toast"</item>
+    <item msgid="4933375960222609935">"project media"</item>
+    <item msgid="8357907018938895462">"activate VPN"</item>
+    <item msgid="8143812849911310973">"write wallpaper"</item>
+    <item msgid="6266277260961066535">"assist structure"</item>
+    <item msgid="7715498149883482300">"assist screenshot"</item>
+    <item msgid="4046679376726313293">"read phone state"</item>
+    <item msgid="6329507266039719587">"add voicemail"</item>
+    <item msgid="7692440726415391408">"use sip"</item>
+    <item msgid="8572453398128326267">"process outgoing call"</item>
+    <item msgid="7775674394089376306">"fingerprint"</item>
+    <item msgid="3182815133441738779">"body sensors"</item>
+    <item msgid="2793100005496829513">"read mobile broadcasts"</item>
+    <item msgid="2633626056029384366">"mock location"</item>
+    <item msgid="8356842191824684631">"read storage"</item>
+    <item msgid="5671906070163291500">"write storage"</item>
+    <item msgid="2791955098549340418">"turn on screen"</item>
+    <item msgid="5599435119609178367">"get accounts"</item>
+    <item msgid="1165623660533024666">"run in background"</item>
+    <item msgid="6423861043647911030">"accessibility volume"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Short"</item>
+    <item msgid="4816511817309094890">"Medium"</item>
+    <item msgid="8305084671259331134">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Default"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Very small"</item>
+    <item msgid="5091603983404027034">"Small"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Large"</item>
+    <item msgid="218913203203160606">"Very large"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Default"</item>
+    <item msgid="6488643537808152001">"None"</item>
+    <item msgid="552332815156010137">"Outline"</item>
+    <item msgid="7187891159463789272">"Drop shadow"</item>
+    <item msgid="8019330250538856521">"Raised"</item>
+    <item msgid="8987385315647049787">"Depressed"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Use app defaults"</item>
+    <item msgid="8611890312638868524">"White on black"</item>
+    <item msgid="5891360837786277638">"Black on white"</item>
+    <item msgid="2798457065945456853">"Yellow on black"</item>
+    <item msgid="5799049811524553967">"Yellow on blue"</item>
+    <item msgid="3673930830658169860">"Custom"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN with certificates"</item>
+    <item msgid="312397853907741968">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="3319427315593649917">"IPSec VPN with certificates and Xauth authentication"</item>
+    <item msgid="8258927774145391041">"IPSec VPN with certificates and hybrid authentication"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"None"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Disconnected"</item>
+    <item msgid="8754480102834556765">"Initialising..."</item>
+    <item msgid="3351334355574270250">"Connecting…"</item>
+    <item msgid="8303882153995748352">"Connected"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Unsuccessful"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Ask"</item>
+    <item msgid="7718817231348607934">"Never allow"</item>
+    <item msgid="8184570120217958741">"Always allow"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistent"</item>
+    <item msgid="167418068739176448">"Top activity"</item>
+    <item msgid="4760813290195199773">"Important (foreground)"</item>
+    <item msgid="2328684826817647595">"Important (background)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Heavy weight"</item>
+    <item msgid="1290888779300174556">"Service (running)"</item>
+    <item msgid="7241098542073939046">"Service (restarting)"</item>
+    <item msgid="6610439017684111046">"Receiver"</item>
+    <item msgid="7367606086319921117">"Home"</item>
+    <item msgid="3344660712396741826">"Last activity"</item>
+    <item msgid="5006559348883303865">"Cached (activity)"</item>
+    <item msgid="8633480732468137525">"Cached (activity client)"</item>
+    <item msgid="6248998242443333892">"Cached (empty)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"Blue"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Purple"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Red"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Over 30 days old"</item>
+    <item msgid="8699273238891265610">"Over 60 days old"</item>
+    <item msgid="8346279419423837266">"Over 90 days old"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detect automatically"</item>
+    <item msgid="773943026484148895">"Treat as metered"</item>
+    <item msgid="1008268820118852416">"Treat as unmetered"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Use randomised MAC (default)"</item>
+    <item msgid="214234417308375326">"Use device MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Yes"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Dark"</item>
+    <item msgid="5079453644557603349">"Light"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Off"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Home only"</item>
+    <item msgid="1161026694891024702">"Automatic"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferred"</item>
+    <item msgid="7581481130337402578">"GSM only"</item>
+    <item msgid="8579197487913425819">"WCDMA only"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA auto"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo auto"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo only"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA only"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
index 1b1faa9..0cf4a48 100644
--- a/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
@@ -185,7 +185,7 @@
     <string name="connected_device_previously_connected_screen_title" msgid="2018789662358162716">"Previously connected"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="4652326177920814476">"Bluetooth turned on"</string>
     <string name="previous_connected_see_all" msgid="7237095013087310923">"See all"</string>
-    <string name="date_and_time" msgid="2957463607025909857">"Date &amp; time"</string>
+    <string name="date_and_time" msgid="2957463607025909857">"Date and time"</string>
     <string name="choose_timezone" msgid="8215332993926818147">"Choose time zone"</string>
     <!-- no translation found for intent_sender_data_label (2009833999785758727) -->
     <skip />
@@ -320,7 +320,7 @@
     <string name="roaming_reenable_title" msgid="6985082191178297921">"Allow data roaming?"</string>
     <string name="networks" msgid="3073876464102136771">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="8964744180598499121">"Choose a network operator"</string>
-    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="7827088656940910631">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Set date, time, time zone, &amp; formats"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Use network-provided time"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protect your tablet with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protect your device with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protect your phone with a screen lock option so that no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face authentication. Tap Cancel, then set a PIN or choose another screen lock option."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Skip PIN Setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Skip Password Setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Skip Pattern Setup?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Set up screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi only"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1607,7 +1609,7 @@
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"Portable hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Bluetooth tethering"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Tethering"</string>
-    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot and tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot on, tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Hotspot on"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Tethering"</string>
@@ -1937,9 +1939,9 @@
     <string name="language_input_gesture_summary_on_with_assist" msgid="315262339899294132"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="6054599939153669225"></string>
     <string name="language_input_gesture_summary_off" msgid="4108509077072348546"></string>
-    <string name="language_settings" msgid="3551012802762495835">"Languages &amp; input"</string>
+    <string name="language_settings" msgid="3551012802762495835">"Languages and input"</string>
     <string name="language_empty_list_user_restricted" msgid="3837176532474949716">"You don’t have permission to change the device language."</string>
-    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="2672573191605298938">"Languages and input"</string>
     <string name="input_assistance" msgid="6442646949054057707">"Tools"</string>
     <string name="keyboard_settings_category" msgid="5857591390023852850">"Keyboard &amp; input methods"</string>
     <string name="phone_language" msgid="8471728119195198790">"Languages"</string>
@@ -2052,7 +2054,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Tap a button to zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch &amp; hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\n"<b>"To zoom"</b>", tap the Accessibility button, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", tap the Accessibility button, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"The accessibility button is set to <xliff:g id="SERVICE">%1$s</xliff:g>. To use magnification, touch &amp; hold the accessibility button, then select magnification."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Volume key shortcut"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Shortcut service"</string>
@@ -3024,7 +3026,7 @@
       <item quantity="other">Show %d hidden items</item>
       <item quantity="one">Show %d hidden item</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="8288134139584687806">"Network &amp; Internet"</string>
+    <string name="network_dashboard_title" msgid="8288134139584687806">"Network and Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"mobile"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"data usage"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"hotspot"</string>
@@ -3033,7 +3035,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, driving mode"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps &amp; notifications"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps and notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistant, recent apps, default apps"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"Notification access is not available for apps in the work profile."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Accounts"</string>
@@ -4101,9 +4103,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Free up space now"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Gestures"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick gestures to control your phone"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick gestures to control your tablet"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick gestures to control your device"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Quick Gestures to control your phone"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Quick Gestures to control your tablet"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Quick Gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Open camera quickly"</string>
@@ -4229,7 +4231,7 @@
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="1890829312367477559">"Photos &amp; videos"</string>
-    <string name="storage_music_audio" msgid="3661289086715297149">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="3661289086715297149">"Music and audio"</string>
     <string name="storage_games" msgid="7740038143749092373">"Games"</string>
     <string name="storage_other_apps" msgid="3202407095387420842">"Other apps"</string>
     <string name="storage_files" msgid="2087824267937487880">"Files"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"It will slow down this phone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Force full GNSS measurements"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Track all GNSS constellations and frequencies with no duty cycling"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Debug user switch"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Show detailed information during user switch"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Allow background activity starts"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Allow all background activity starts"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Always show crash dialogue"</string>
diff --git a/tests/CarDeveloperOptions/res/values-en-rXC/strings.xml b/tests/CarDeveloperOptions/res/values-en-rXC/strings.xml
index b6a3ad3..562c28d 100644
--- a/tests/CarDeveloperOptions/res/values-en-rXC/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-en-rXC/strings.xml
@@ -4276,6 +4276,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎It will slow down this phone‎‏‎‎‏‎"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎Force full GNSS measurements‎‏‎‎‏‎"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎Track all GNSS constellations and frequencies with no duty cycling‎‏‎‎‏‎"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎Debug user switch‎‏‎‎‏‎"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎Show detailed information during user switch‎‏‎‎‏‎"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎Allow background activity starts‎‏‎‎‏‎"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎Allows all background activity starts‎‏‎‎‏‎"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎Always show crash dialog‎‏‎‎‏‎"</string>
diff --git a/tests/CarDeveloperOptions/res/values-es-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-es-nokeys/strings.xml
new file mode 100644
index 0000000..a16e68b
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-es-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Administrar aplicaciones"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-es-rUS-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-es-rUS-nokeys/strings.xml
new file mode 100644
index 0000000..a16e68b
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-es-rUS-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Administrar aplicaciones"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml b/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
new file mode 100644
index 0000000..195115c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"América"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"África"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacífico"</item>
+    <item msgid="7044520255415007865">"Todas"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundos"</item>
+    <item msgid="772029947136115322">"30 segundos"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minutos"</item>
+    <item msgid="8664703938127907662">"5 minutos"</item>
+    <item msgid="5827960506924849753">"10 minutos"</item>
+    <item msgid="6677424950124253938">"30 minutos"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"De inmediato"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Pequeño"</item>
+    <item msgid="591935967183159581">"Predeterminado"</item>
+    <item msgid="1714184661981538355">"Grande"</item>
+    <item msgid="6195563047686707484">"Máximo"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Explorando..."</item>
+    <item msgid="5597394826455877834">"Conectando..."</item>
+    <item msgid="5848277343965362748">"Autenticando…"</item>
+    <item msgid="3391238031431440676">"Obteniendo la dirección IP…"</item>
+    <item msgid="5257597310494000224">"Conectado"</item>
+    <item msgid="8472497592913050396">"Suspendido"</item>
+    <item msgid="1228072488815999109">"Desconectando…"</item>
+    <item msgid="7253087004422991731">"Desconectado"</item>
+    <item msgid="4169850917304751227">"Incorrecto"</item>
+    <item msgid="6266658166690831131">"Bloqueadas"</item>
+    <item msgid="4517230805854909775">"Desactivando mala conexión  temporalmente"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Buscando..."</item>
+    <item msgid="8058143476674427024">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Obteniendo dirección IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspendido"</item>
+    <item msgid="4133290864821295785">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Desconectado"</item>
+    <item msgid="2847316776634969068">"Incorrecto"</item>
+    <item msgid="4390990424746035383">"Bloqueadas"</item>
+    <item msgid="3618248791367063949">"Desactivando mala conexión  temporalmente"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Presionar el botón"</item>
+    <item msgid="7401896200768713930">"PIN del dispositivo par"</item>
+    <item msgid="4526848028011846710">"PIN de este dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Conectado"</item>
+    <item msgid="983792611851499732">"Invitado"</item>
+    <item msgid="5438273405428201793">"Incorrecto"</item>
+    <item msgid="4646663015449312554">"Disponible"</item>
+    <item msgid="3230556734162006146">"Fuera de rango"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutos"</item>
+    <item msgid="2759776603549270587">"5 minutos"</item>
+    <item msgid="167772676068860015">"1 hora"</item>
+    <item msgid="5985477119043628504">"Siempre visible"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usar valores predeterminados del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Baja"</item>
+    <item msgid="7882129634982603782">"Baja"</item>
+    <item msgid="6457357501905996224">"Aceptable"</item>
+    <item msgid="405271628162918841">"Buena"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Últimos 30 días"</item>
+    <item msgid="3211287705232736964">"Configurar ciclo de uso…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Hora de uso"</item>
+    <item msgid="2784401352592276015">"Última utilización"</item>
+    <item msgid="249854287216326349">"Nombre de aplicación"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ninguna"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ninguno"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ninguna"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ninguna"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Config. automática proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ninguna"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP o CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Sin especificar"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ninguno"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Dispositivo de almacenamiento interno"</item>
+    <item msgid="3186681694079967527">"Tarjeta SD desmontable"</item>
+    <item msgid="6902033473986647035">"Dejar que el sistema decida"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Ubicación"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Mensajería"</item>
+    <item msgid="8563996233342430477">"Medios"</item>
+    <item msgid="5323851085993963783">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ubicación aproximada"</item>
+    <item msgid="1830619568689922920">"ubicación precisa"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrar"</item>
+    <item msgid="8632513128515114092">"leer contactos"</item>
+    <item msgid="3741042113569620272">"modificar contactos"</item>
+    <item msgid="4204420969709009931">"leer registro de llamadas"</item>
+    <item msgid="2260380357119423209">"modificar registro de llamadas"</item>
+    <item msgid="6550710385014530934">"leer calendario"</item>
+    <item msgid="3575906174264853951">"modificar calendario"</item>
+    <item msgid="4319843242568057174">"búsqueda de Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notificación"</item>
+    <item msgid="6617825156152476692">"búsqueda de dispositivo"</item>
+    <item msgid="8865260890611559753">"llamar a un teléfono"</item>
+    <item msgid="3254999273961542982">"leer SMS"</item>
+    <item msgid="7711446453028825171">"redactar SMS"</item>
+    <item msgid="6123238544099198034">"recibir SMS"</item>
+    <item msgid="838342167431596036">"recibir SMS de emergencia"</item>
+    <item msgid="8554432731560956686">"recibir MMS"</item>
+    <item msgid="7464863464299515059">"recibir push de WAP"</item>
+    <item msgid="310463075729606765">"enviar SMS"</item>
+    <item msgid="7338021933527689514">"leer ICC SMS"</item>
+    <item msgid="6130369335466613036">"redactar ICC SMS"</item>
+    <item msgid="6536865581421670942">"modificar configuración"</item>
+    <item msgid="4547203129183558973">"dibujar en la parte superior"</item>
+    <item msgid="9080347512916542840">"acceder a las notificaciones"</item>
+    <item msgid="5332718516635907742">"cámara"</item>
+    <item msgid="6098422447246167852">"grabar audio"</item>
+    <item msgid="9182794235292595296">"reproducir audio"</item>
+    <item msgid="8760743229597702019">"leer portapapeles"</item>
+    <item msgid="2266923698240538544">"modificar portapapeles"</item>
+    <item msgid="1801619438618539275">"botones de medios"</item>
+    <item msgid="31588119965784465">"enfoque de audio"</item>
+    <item msgid="7565226799008076833">"volumen principal"</item>
+    <item msgid="5420704980305018295">"volumen de voz"</item>
+    <item msgid="5797363115508970204">"volumen de tono"</item>
+    <item msgid="8233154098550715999">"volumen de medios"</item>
+    <item msgid="5196715605078153950">"volumen de alarma"</item>
+    <item msgid="394030698764284577">"volumen de notificación"</item>
+    <item msgid="8952898972491680178">"volumen de bluetooth"</item>
+    <item msgid="8506227454543690851">"mantener en funcionamiento"</item>
+    <item msgid="1108160036049727420">"controlar ubicación"</item>
+    <item msgid="1496205959751719491">"supervisar ubicación de alta potencia"</item>
+    <item msgid="3776296279910987380">"obtener estadísticas de uso"</item>
+    <item msgid="8827100324471975602">"silenciar/dejar de silenciar micrófono"</item>
+    <item msgid="6880736730520126864">"mostrar notificación"</item>
+    <item msgid="4933375960222609935">"proyectar contenido multimedia"</item>
+    <item msgid="8357907018938895462">"activar VPN"</item>
+    <item msgid="8143812849911310973">"escribir fondo de pantalla"</item>
+    <item msgid="6266277260961066535">"asistir a la estructura"</item>
+    <item msgid="7715498149883482300">"asistir a la captura de pantalla"</item>
+    <item msgid="4046679376726313293">"leer estado del dispositivo"</item>
+    <item msgid="6329507266039719587">"agregar buzón de voz"</item>
+    <item msgid="7692440726415391408">"usar SIP"</item>
+    <item msgid="8572453398128326267">"procesar llamada saliente"</item>
+    <item msgid="7775674394089376306">"huella digital"</item>
+    <item msgid="3182815133441738779">"sensores corporales"</item>
+    <item msgid="2793100005496829513">"leer emisiones móviles"</item>
+    <item msgid="2633626056029384366">"ubicación ficticia"</item>
+    <item msgid="8356842191824684631">"leer almacenamiento"</item>
+    <item msgid="5671906070163291500">"escribir almacenamiento"</item>
+    <item msgid="2791955098549340418">"encender pantalla"</item>
+    <item msgid="5599435119609178367">"obtener cuentas"</item>
+    <item msgid="1165623660533024666">"ejecutar en segundo plano"</item>
+    <item msgid="6423861043647911030">"volumen de accesibilidad"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Ubicación"</item>
+    <item msgid="6656077694190491067">"Ubicación"</item>
+    <item msgid="8790228218278477369">"Ubicación"</item>
+    <item msgid="7836406246005211990">"Vibrar"</item>
+    <item msgid="3951439024549922598">"Leer contactos"</item>
+    <item msgid="8802152411647068">"Modificar contactos"</item>
+    <item msgid="229544934599698735">"Leer registro de llamadas"</item>
+    <item msgid="7396102294405899613">"Modificar registro de llamadas"</item>
+    <item msgid="3597797992398484655">"Leer calendario"</item>
+    <item msgid="2705975774250907343">"Modificar calendario"</item>
+    <item msgid="4668747371441932697">"Ubicación"</item>
+    <item msgid="1487578921720243646">"Publicar notificación"</item>
+    <item msgid="4636080349724146638">"Ubicación"</item>
+    <item msgid="673510900286463926">"Llamar a un teléfono"</item>
+    <item msgid="542083422784609790">"Leer SMS o MMS"</item>
+    <item msgid="1033780373029588436">"Escribir SMS o MMS"</item>
+    <item msgid="5647111115517787488">"Recibir SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Recibir SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Recibir SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Recibir SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Enviar SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Leer SMS o MMS"</item>
+    <item msgid="6555678522277865572">"Escribir SMS o MMS"</item>
+    <item msgid="6981734935578130884">"Modificar configuración"</item>
+    <item msgid="8705854389991425629">"Dibujar en la parte superior"</item>
+    <item msgid="5861356020344153651">"Acceder a las notificaciones"</item>
+    <item msgid="78432174621628659">"Cámara"</item>
+    <item msgid="3986116419882154794">"Grabar audio"</item>
+    <item msgid="4516840825756409490">"Reproducir audio"</item>
+    <item msgid="6811712502798183957">"Leer portapapeles"</item>
+    <item msgid="2780369012602289114">"Modificar portapapeles"</item>
+    <item msgid="2331359440170850868">"Botones de medios"</item>
+    <item msgid="6133599737122751231">"Enfoque de audio"</item>
+    <item msgid="6844485713404805301">"Volumen principal"</item>
+    <item msgid="1600379420669104929">"Volumen de voz"</item>
+    <item msgid="6296768210470214866">"Volumen de tono"</item>
+    <item msgid="510690696071629241">"Volumen multimedia"</item>
+    <item msgid="406861638631430109">"Volumen de alarma"</item>
+    <item msgid="4715864795872233884">"Volumen de notificación"</item>
+    <item msgid="2311478519251301183">"Volumen de Bluetooth"</item>
+    <item msgid="5133991377896747027">"Mantener en funcionamiento"</item>
+    <item msgid="2464189519136248621">"Ubicación"</item>
+    <item msgid="2062677934050803037">"Ubicación"</item>
+    <item msgid="1735171933192715957">"Obtener estadísticas de uso"</item>
+    <item msgid="1014093788778383554">"Silenciar/dejar de silenciar micrófono"</item>
+    <item msgid="4199297950608622850">"Mostrar notificación"</item>
+    <item msgid="2527962435313398821">"Proyectar contenido multimedia"</item>
+    <item msgid="5117506254221861929">"Activar VPN"</item>
+    <item msgid="8291198322681891160">"Escribir fondo de pantalla"</item>
+    <item msgid="7106921284621230961">"Asistir a la estructura"</item>
+    <item msgid="4496533640894624799">"Asistir a la captura de pantalla"</item>
+    <item msgid="2598847264853993611">"Leer estado del teléfono"</item>
+    <item msgid="9215610846802973353">"Agregar buzón de voz"</item>
+    <item msgid="9186411956086478261">"Usar SIP"</item>
+    <item msgid="6884763100104539558">"Procesar llamada saliente"</item>
+    <item msgid="125513972170580692">"Huella digital"</item>
+    <item msgid="2556071024281275619">"Sensores corporales"</item>
+    <item msgid="617168514928339387">"Leer emisiones móviles"</item>
+    <item msgid="7134693570516523585">"Ubicación ficticia"</item>
+    <item msgid="7224489175375229399">"Leer almacenamiento"</item>
+    <item msgid="8472735063903258202">"Escribir almacenamiento"</item>
+    <item msgid="4069276819909595110">"Encender pantalla"</item>
+    <item msgid="1228338896751121025">"Obtener cuentas"</item>
+    <item msgid="3181581793459233672">"Ejecutar en segundo plano"</item>
+    <item msgid="2340936043025374076">"Volumen de accesibilidad"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Corto"</item>
+    <item msgid="4816511817309094890">"Media"</item>
+    <item msgid="8305084671259331134">"Largo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predeterminado"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif condensada"</item>
+    <item msgid="6529379119163117545">"Sans-serif monoespaciada"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monoespaciada"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursiva"</item>
+    <item msgid="6896773537705206194">"Versalitas"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muy pequeño"</item>
+    <item msgid="5091603983404027034">"Pequeño"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muy grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predeterminado"</item>
+    <item msgid="6488643537808152001">"Ninguna"</item>
+    <item msgid="552332815156010137">"Contorno"</item>
+    <item msgid="7187891159463789272">"Sombra paralela"</item>
+    <item msgid="8019330250538856521">"Levantado"</item>
+    <item msgid="8987385315647049787">"Disminuido"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Predeterminado"</item>
+    <item msgid="8611890312638868524">"Blanco sobre negro"</item>
+    <item msgid="5891360837786277638">"Negro sobre blanco"</item>
+    <item msgid="2798457065945456853">"Amarillo sobre negro"</item>
+    <item msgid="5799049811524553967">"Amarillo sobre azul"</item>
+    <item msgid="3673930830658169860">"Personalizado"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"Claves precompartidas de VPN L2TP/IPSec"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec con certificados"</item>
+    <item msgid="312397853907741968">"VPN IPSec con claves precompartidas y autenticación Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec con certificados y autenticación Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec con certificados y autenticación híbrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ninguno"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Desconectado"</item>
+    <item msgid="8754480102834556765">"Iniciando..."</item>
+    <item msgid="3351334355574270250">"Conectando..."</item>
+    <item msgid="8303882153995748352">"Conectado"</item>
+    <item msgid="9135049670787351881">"Tiempo de espera"</item>
+    <item msgid="2124868417182583926">"Incorrecto"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Preguntar"</item>
+    <item msgid="7718817231348607934">"No permitir nunca"</item>
+    <item msgid="8184570120217958741">"Permitir siempre"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistente"</item>
+    <item msgid="167418068739176448">"Actividad principal"</item>
+    <item msgid="4760813290195199773">"Importante (en primer plano)"</item>
+    <item msgid="2328684826817647595">"Importante (en segundo plano)"</item>
+    <item msgid="7746406490652867365">"Copia de seguridad"</item>
+    <item msgid="5597404364389196754">"Peso pesado"</item>
+    <item msgid="1290888779300174556">"Servicio (en ejecución)"</item>
+    <item msgid="7241098542073939046">"Servicio (reiniciando)"</item>
+    <item msgid="6610439017684111046">"Receptor"</item>
+    <item msgid="7367606086319921117">"Pantalla principal"</item>
+    <item msgid="3344660712396741826">"Última actividad"</item>
+    <item msgid="5006559348883303865">"En caché (actividad)"</item>
+    <item msgid="8633480732468137525">"En caché (cliente de actividad)"</item>
+    <item msgid="6248998242443333892">"En caché (vacío)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Verde azulado"</item>
+    <item msgid="3228505970082457852">"Azul"</item>
+    <item msgid="6590260735734795647">"Índigo"</item>
+    <item msgid="3521763377357218577">"Púrpura"</item>
+    <item msgid="5932337981182999919">"Rosado"</item>
+    <item msgid="5642914536624000094">"Rojo"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Más de 30 días"</item>
+    <item msgid="8699273238891265610">"Más de 60 días"</item>
+    <item msgid="8346279419423837266">"Más de 90 días"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detectar automáticamente"</item>
+    <item msgid="773943026484148895">"Tratar como red de uso medido"</item>
+    <item msgid="1008268820118852416">"Tratar como red sin tarifa plana"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Usar MAC aleatoria (predeterminada)"</item>
+    <item msgid="214234417308375326">"Usar MAC del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Sí"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Oscuro"</item>
+    <item msgid="5079453644557603349">"Claro"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desactivado"</item>
+    <item msgid="4072198137051566919">"Depurado"</item>
+    <item msgid="2473005316958868509">"Detallado"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Página principal solamente"</item>
+    <item msgid="1161026694891024702">"Automático"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferido"</item>
+    <item msgid="7581481130337402578">"Solo GSM"</item>
+    <item msgid="8579197487913425819">"Solo WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automático"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automático"</item>
+    <item msgid="4219607161971472471">"CDMA sin EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo solamente"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Solo TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
index 5d1d4a9..215453a 100644
--- a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. Además, tienes que establecer una opción de bloqueo de pantalla para configurar la autenticación facial. Presiona Cancelar y, luego, establece un PIN o elige otra opción de bloqueo de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"¿Omitir configuración de PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"¿Omitir esta configuración?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"¿Omitir esta configuración?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueo de pantalla"</string>
@@ -717,7 +716,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app activa</item>
     </plurals>
     <string name="manage_trust_agents" msgid="8129970926213142261">"Agentes de confianza"</string>
-    <string name="disabled_because_no_backup_security" msgid="8127039979909203528">"Para usarlo, debes establecer un bloqueo de pantalla."</string>
+    <string name="disabled_because_no_backup_security" msgid="8127039979909203528">"Para usarlo, debes establecer un bloqueo de pantalla"</string>
     <string name="manage_trust_agents_summary" msgid="2023116850759962248">"Ninguno"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5550538038916606097">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes de confianza activos</item>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Móvil"</item>
+    <item msgid="6007360612667098926">"Solo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1607,10 +1609,10 @@
     <string name="tether_settings_title_wifi" msgid="2060965130234484613">"Hotspot portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="1999590158102569959">"Conexión Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="1159128764162788159">"Compartir conexión"</string>
-    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspots y dispositivos portátiles"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot activado, conexión mediante dispositivo portátil"</string>
+    <string name="tether_settings_title_all" msgid="6935843543433954181">"Hotspot y conexión mediante dispositivos móviles"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Hotspot activado, conexión mediante dispositivo móvil"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Hotspot activado"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Conexión mediante dispositivo portátil"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Conexión mediante dispositivo móvil"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"No podrán establecerse conexiones a través del dispositivo portátil ni hotspots portátiles cuando se active el modo Ahorro de datos."</string>
     <string name="usb_title" msgid="7480927657535578688">"USB"</string>
     <string name="usb_tethering_button_text" msgid="6242228383142012332">"Conexión USB"</string>
@@ -1622,7 +1624,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Compartiendo la conexión a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> mediante Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"No se puede anclar a red a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
-    <string name="tethering_footer_info" msgid="8019555174339154124">"Usa la función de hotspot y conexión mediante dispositivo portátil para brindar acceso a Internet a otros dispositivos mediante tu conexión de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
+    <string name="tethering_footer_info" msgid="8019555174339154124">"Usa la función de hotspot y conexión mediante dispositivo móvil para brindar acceso a Internet a otros dispositivos mediante tu conexión de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="7653022000284543996">"Ayuda"</string>
     <string name="network_settings_title" msgid="8516526011407061679">"Red móvil"</string>
     <string name="manage_mobile_plan_title" msgid="3312016665522553062">"Plan móvil"</string>
@@ -2170,7 +2172,7 @@
     <string name="color_cyan" msgid="7669317410901991453">"Cian"</string>
     <string name="color_yellow" msgid="8847327436896180799">"Amarillo"</string>
     <string name="color_magenta" msgid="721976999611563071">"Magenta"</string>
-    <string name="enable_service_title" msgid="2746143093464928251">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="enable_service_title" msgid="2746143093464928251">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
@@ -3795,7 +3797,7 @@
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Aplicaciones"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Mostrar sobre otras apps"</string>
     <string name="permit_draw_overlay" msgid="9039092257052422344">"Permitir mostrar sobre otras apps"</string>
-    <string name="allow_overlay_description" msgid="6669524816705082807">"Permite que esta app se muestre sobre otras en uso. Es posible que interfiera con el uso de esas apps o cambie afecte su apariencia o el comportamiento."</string>
+    <string name="allow_overlay_description" msgid="6669524816705082807">"Permite que esta app se muestre sobre otras en uso. Es posible que interfiera con el uso de esas apps, afecte su apariencia o modifique el comportamiento."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"rv, procesador de realidad virtual, estéreo, servicio de ayuda"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"sistema, alerta, ventana, cuadro de diálogo, mostrar sobre otras apps"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Mostrar sobre otras apps"</string>
@@ -4043,7 +4045,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"recorte de la pantalla, corte"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"Opción predeterminada del dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"Error al aplicar superposición"</string>
-    <string name="special_access" msgid="1453926335914696206">"Acceso especial a apps"</string>
+    <string name="special_access" msgid="1453926335914696206">"Acceso especial de apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps pueden usar datos sin restricción</item>
       <item quantity="one">1 app puede usar datos sin restricción</item>
@@ -4122,7 +4124,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Para consultar la hora, las notificaciones y otra información, levanta el teléfono."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Para consultar la hora, las notificaciones y otra información, levanta la tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Para consultar la hora, las notificaciones y otra información, levanta el dispositivo."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Presiona para revisar el teléfono"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Presionar para revisar el teléfono"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Presiona para revisar la tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Presiona para revisar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Para consultar la hora, las notificaciones y otra información, presiona la pantalla."</string>
@@ -4134,7 +4136,7 @@
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"Consulta tus notificaciones rápidamente"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"Activado"</string>
     <string name="gesture_setting_off" msgid="2540159841716890511">"Desactivado"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"El cargador de inicio está desbloqueado"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"El bootloader está desbloqueado"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="262986780389836168">"Primero debes conectarte a Internet"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="3331374502670483142">"Conéctate a Internet o comunícate con tu proveedor"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="5223278198179877704">"No disponible en dispositivos bloqueados por el proveedor"</string>
@@ -4270,6 +4272,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Esta función ralentizará el teléfono"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forzar dimensiones GNSS completas"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Seguir todas las frecuencias y constelaciones de GNSS sin ciclo de funciones"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Depurar cambio de usuario"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Mostrar información detallada durante el cambio de usuario"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permitir inicio de actividades en segundo plano"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permite que se inicien todas las actividades en segundo plano"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Mostrar siempre el cuadro de diálogo de bloqueos"</string>
diff --git a/tests/CarDeveloperOptions/res/values-es/arrays.xml b/tests/CarDeveloperOptions/res/values-es/arrays.xml
new file mode 100644
index 0000000..5b52eee
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-es/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"América"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"África"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacífico"</item>
+    <item msgid="7044520255415007865">"Todo"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundos"</item>
+    <item msgid="772029947136115322">"30 segundos"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minutos"</item>
+    <item msgid="8664703938127907662">"5 minutos"</item>
+    <item msgid="5827960506924849753">"10 minutos"</item>
+    <item msgid="6677424950124253938">"30 minutos"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Inmediatamente"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Pequeña"</item>
+    <item msgid="591935967183159581">"Predeterminado"</item>
+    <item msgid="1714184661981538355">"Grande"</item>
+    <item msgid="6195563047686707484">"Lo más grande posible"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Buscando..."</item>
+    <item msgid="5597394826455877834">"Conectando…"</item>
+    <item msgid="5848277343965362748">"Autenticando..."</item>
+    <item msgid="3391238031431440676">"Obteniendo dirección IP…"</item>
+    <item msgid="5257597310494000224">"Conectada"</item>
+    <item msgid="8472497592913050396">"Suspendido"</item>
+    <item msgid="1228072488815999109">"Desconectando…"</item>
+    <item msgid="7253087004422991731">"Desconectado"</item>
+    <item msgid="4169850917304751227">"Con error"</item>
+    <item msgid="6266658166690831131">"Bloqueada"</item>
+    <item msgid="4517230805854909775">"Inhabilitando conexión inestable temporalmente..."</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Buscando..."</item>
+    <item msgid="8058143476674427024">"Estableciendo conexión con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Obteniendo dirección IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspendido"</item>
+    <item msgid="4133290864821295785">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Desconectado"</item>
+    <item msgid="2847316776634969068">"Con error"</item>
+    <item msgid="4390990424746035383">"Bloqueada"</item>
+    <item msgid="3618248791367063949">"Inhabilitando conexión inestable temporalmente..."</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Botón WPS"</item>
+    <item msgid="7401896200768713930">"PIN del otro dispositivo"</item>
+    <item msgid="4526848028011846710">"PIN del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Conectada"</item>
+    <item msgid="983792611851499732">"Invitado"</item>
+    <item msgid="5438273405428201793">"Con error"</item>
+    <item msgid="4646663015449312554">"Disponible"</item>
+    <item msgid="3230556734162006146">"Fuera del alcance"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutos"</item>
+    <item msgid="2759776603549270587">"5 minutos"</item>
+    <item msgid="167772676068860015">"1 hora"</item>
+    <item msgid="5985477119043628504">"Siempre visible"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usar opción predeterminada del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Mala"</item>
+    <item msgid="7882129634982603782">"Mala"</item>
+    <item msgid="6457357501905996224">"Aceptable"</item>
+    <item msgid="405271628162918841">"Buena"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Últimos 30 días"</item>
+    <item msgid="3211287705232736964">"Establecer ciclo uso..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Tiempo de uso"</item>
+    <item msgid="2784401352592276015">"Último uso"</item>
+    <item msgid="249854287216326349">"Nombre de la aplicación"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ninguna"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ninguna"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ninguna"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"Protocolo DHCP"</item>
+    <item msgid="4377002609760712163">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ninguna"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Proxy autoconfigurado"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ninguna"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP o CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"No especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ninguno"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Almacenamiento de dispositivo interno"</item>
+    <item msgid="3186681694079967527">"Tarjeta SD extraíble"</item>
+    <item msgid="6902033473986647035">"Selección del sistema"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Ubicación"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Mensajes"</item>
+    <item msgid="8563996233342430477">"Multimedia"</item>
+    <item msgid="5323851085993963783">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ubicación común"</item>
+    <item msgid="1830619568689922920">"ubicación precisa"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrar"</item>
+    <item msgid="8632513128515114092">"consultar contactos"</item>
+    <item msgid="3741042113569620272">"modificar los contactos"</item>
+    <item msgid="4204420969709009931">"leer el registro de llamadas"</item>
+    <item msgid="2260380357119423209">"modificar el registro de llamadas"</item>
+    <item msgid="6550710385014530934">"leer calendario"</item>
+    <item msgid="3575906174264853951">"modificar el calendario"</item>
+    <item msgid="4319843242568057174">"búsqueda de Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notificación"</item>
+    <item msgid="6617825156152476692">"búsqueda de red móvil"</item>
+    <item msgid="8865260890611559753">"llamar a un teléfono"</item>
+    <item msgid="3254999273961542982">"leer SMS"</item>
+    <item msgid="7711446453028825171">"escribir SMS"</item>
+    <item msgid="6123238544099198034">"recibir SMS"</item>
+    <item msgid="838342167431596036">"recibir SMS de emergencia"</item>
+    <item msgid="8554432731560956686">"recibir MMS"</item>
+    <item msgid="7464863464299515059">"recibir WAP Push"</item>
+    <item msgid="310463075729606765">"enviar SMS"</item>
+    <item msgid="7338021933527689514">"leer SMS ICC"</item>
+    <item msgid="6130369335466613036">"escribir SMS ICC"</item>
+    <item msgid="6536865581421670942">"modificar la configuración"</item>
+    <item msgid="4547203129183558973">"dibujar en parte superior"</item>
+    <item msgid="9080347512916542840">"acceder a las notificaciones"</item>
+    <item msgid="5332718516635907742">"cámara"</item>
+    <item msgid="6098422447246167852">"grabar audio"</item>
+    <item msgid="9182794235292595296">"reproducir audio"</item>
+    <item msgid="8760743229597702019">"leer portapapeles"</item>
+    <item msgid="2266923698240538544">"modificar portapapeles"</item>
+    <item msgid="1801619438618539275">"botones multimedia"</item>
+    <item msgid="31588119965784465">"foco de audio"</item>
+    <item msgid="7565226799008076833">"volumen principal"</item>
+    <item msgid="5420704980305018295">"volumen de la voz"</item>
+    <item msgid="5797363115508970204">"volumen del tono"</item>
+    <item msgid="8233154098550715999">"volumen de multimedia"</item>
+    <item msgid="5196715605078153950">"volumen de alarma"</item>
+    <item msgid="394030698764284577">"volumen de las notificaciones"</item>
+    <item msgid="8952898972491680178">"volumen de Bluetooth"</item>
+    <item msgid="8506227454543690851">"mantener activo"</item>
+    <item msgid="1108160036049727420">"controlar ubicación"</item>
+    <item msgid="1496205959751719491">"supervisar ubicación de alta potencia"</item>
+    <item msgid="3776296279910987380">"obtener estadísticas de uso"</item>
+    <item msgid="8827100324471975602">"silenciar/activar micrófono"</item>
+    <item msgid="6880736730520126864">"mostrar notificación emergente"</item>
+    <item msgid="4933375960222609935">"proyectar contenido multimedia"</item>
+    <item msgid="8357907018938895462">"activar VPN"</item>
+    <item msgid="8143812849911310973">"editar fondo de pantalla"</item>
+    <item msgid="6266277260961066535">"proporcionar asistencia a estructura"</item>
+    <item msgid="7715498149883482300">"proporcionar asistencia a captura de pantalla"</item>
+    <item msgid="4046679376726313293">"leer el estado del teléfono"</item>
+    <item msgid="6329507266039719587">"añadir buzón de voz"</item>
+    <item msgid="7692440726415391408">"utilizar SIP"</item>
+    <item msgid="8572453398128326267">"procesar llamada saliente"</item>
+    <item msgid="7775674394089376306">"huella digital"</item>
+    <item msgid="3182815133441738779">"sensores corporales"</item>
+    <item msgid="2793100005496829513">"leer difusiones móviles"</item>
+    <item msgid="2633626056029384366">"ubicación simulada"</item>
+    <item msgid="8356842191824684631">"almacenamiento de lectura"</item>
+    <item msgid="5671906070163291500">"almacenamiento de escritura"</item>
+    <item msgid="2791955098549340418">"activar pantalla"</item>
+    <item msgid="5599435119609178367">"obtener cuentas"</item>
+    <item msgid="1165623660533024666">"ejecutar en segundo plano"</item>
+    <item msgid="6423861043647911030">"volumen de accesibilidad"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Ubicación"</item>
+    <item msgid="6656077694190491067">"Ubicación"</item>
+    <item msgid="8790228218278477369">"Ubicación"</item>
+    <item msgid="7836406246005211990">"Vibrar"</item>
+    <item msgid="3951439024549922598">"Consultar contactos"</item>
+    <item msgid="8802152411647068">"Modificar los contactos"</item>
+    <item msgid="229544934599698735">"Leer el registro de llamadas"</item>
+    <item msgid="7396102294405899613">"Modificar el registro de llamadas"</item>
+    <item msgid="3597797992398484655">"Leer calendario"</item>
+    <item msgid="2705975774250907343">"Modificar el calendario"</item>
+    <item msgid="4668747371441932697">"Ubicación"</item>
+    <item msgid="1487578921720243646">"Publicar notificación"</item>
+    <item msgid="4636080349724146638">"Ubicación"</item>
+    <item msgid="673510900286463926">"Llamar a un teléfono"</item>
+    <item msgid="542083422784609790">"Leer SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Escribir SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Recibir SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Recibir SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Recibir SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Recibir SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Enviar SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Leer SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Escribir SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Modificar la configuración"</item>
+    <item msgid="8705854389991425629">"Dibujar en parte superior"</item>
+    <item msgid="5861356020344153651">"Acceder a las notificaciones"</item>
+    <item msgid="78432174621628659">"Cámara"</item>
+    <item msgid="3986116419882154794">"Grabar audio"</item>
+    <item msgid="4516840825756409490">"Reproducir audio"</item>
+    <item msgid="6811712502798183957">"Leer portapapeles"</item>
+    <item msgid="2780369012602289114">"Modificar portapapeles"</item>
+    <item msgid="2331359440170850868">"Botones multimedia"</item>
+    <item msgid="6133599737122751231">"Foco de audio"</item>
+    <item msgid="6844485713404805301">"Volumen principal"</item>
+    <item msgid="1600379420669104929">"Volumen de la voz"</item>
+    <item msgid="6296768210470214866">"Volumen del tono"</item>
+    <item msgid="510690696071629241">"Volumen de multimedia"</item>
+    <item msgid="406861638631430109">"Volumen de alarma"</item>
+    <item msgid="4715864795872233884">"Volumen de notificaciones"</item>
+    <item msgid="2311478519251301183">"Volumen de Bluetooth"</item>
+    <item msgid="5133991377896747027">"Activo"</item>
+    <item msgid="2464189519136248621">"Ubicación"</item>
+    <item msgid="2062677934050803037">"Ubicación"</item>
+    <item msgid="1735171933192715957">"Obtener estadísticas de uso"</item>
+    <item msgid="1014093788778383554">"Silenciar/activar micrófono"</item>
+    <item msgid="4199297950608622850">"Mostrar notificación emergente"</item>
+    <item msgid="2527962435313398821">"Proyectar contenido multimedia"</item>
+    <item msgid="5117506254221861929">"Activar VPN"</item>
+    <item msgid="8291198322681891160">"Editar fondo de pantalla"</item>
+    <item msgid="7106921284621230961">"Proporcionar asistencia a estructura"</item>
+    <item msgid="4496533640894624799">"Proporcionar asistencia a captura de pantalla"</item>
+    <item msgid="2598847264853993611">"Leer el estado del teléfono"</item>
+    <item msgid="9215610846802973353">"Añadir buzón de voz"</item>
+    <item msgid="9186411956086478261">"Utilizar SIP"</item>
+    <item msgid="6884763100104539558">"Procesar llamada saliente"</item>
+    <item msgid="125513972170580692">"Huella digital"</item>
+    <item msgid="2556071024281275619">"Sensores corporales"</item>
+    <item msgid="617168514928339387">"Leer difusiones móviles"</item>
+    <item msgid="7134693570516523585">"Ubicación simulada"</item>
+    <item msgid="7224489175375229399">"Almacenamiento de lectura"</item>
+    <item msgid="8472735063903258202">"Almacenamiento de escritura"</item>
+    <item msgid="4069276819909595110">"Activar pantalla"</item>
+    <item msgid="1228338896751121025">"Obtener cuentas"</item>
+    <item msgid="3181581793459233672">"Ejecutar en segundo plano"</item>
+    <item msgid="2340936043025374076">"Volumen de accesibilidad"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Breve"</item>
+    <item msgid="4816511817309094890">"Media"</item>
+    <item msgid="8305084671259331134">"Largo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predeterminado"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursiva"</item>
+    <item msgid="6896773537705206194">"Versalitas"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muy pequeña"</item>
+    <item msgid="5091603983404027034">"Pequeña"</item>
+    <item msgid="176844712416932112">"Mediana"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muy grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predeterminado"</item>
+    <item msgid="6488643537808152001">"Ninguno"</item>
+    <item msgid="552332815156010137">"Contorno"</item>
+    <item msgid="7187891159463789272">"Sombra paralela"</item>
+    <item msgid="8019330250538856521">"Elevado"</item>
+    <item msgid="8987385315647049787">"Hundido"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Predeterminado"</item>
+    <item msgid="8611890312638868524">"Blanco sobre negro"</item>
+    <item msgid="5891360837786277638">"Negro sobre blanco"</item>
+    <item msgid="2798457065945456853">"Amarillo sobre negro"</item>
+    <item msgid="5799049811524553967">"Amarillo sobre azul"</item>
+    <item msgid="3673930830658169860">"Personalizado"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"Red privada virtual PPTP"</item>
+    <item msgid="1349760781118368659">"Red privada virtual L2TP/IPSec con claves precompartidas"</item>
+    <item msgid="6128519070545038358">"Red privada virtual L2TP/IPSec con certificados"</item>
+    <item msgid="312397853907741968">"Red privada virtual IPSec con claves precompartidas y autenticación XAuth"</item>
+    <item msgid="3319427315593649917">"Red privada virtual IPSec con certificados y autenticación XAuth"</item>
+    <item msgid="8258927774145391041">"Red privada virtual IPSec con certificados y autenticación híbrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ninguno"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Desconectado"</item>
+    <item msgid="8754480102834556765">"Iniciando..."</item>
+    <item msgid="3351334355574270250">"Conectando…"</item>
+    <item msgid="8303882153995748352">"Conectada"</item>
+    <item msgid="9135049670787351881">"Tiempo de espera"</item>
+    <item msgid="2124868417182583926">"Con error"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Preguntar"</item>
+    <item msgid="7718817231348607934">"No permitir nunca"</item>
+    <item msgid="8184570120217958741">"Permitir siempre"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistente"</item>
+    <item msgid="167418068739176448">"Actividad principal"</item>
+    <item msgid="4760813290195199773">"Importante (en primer plano)"</item>
+    <item msgid="2328684826817647595">"Importante (en segundo plano)"</item>
+    <item msgid="7746406490652867365">"Copia de seguridad"</item>
+    <item msgid="5597404364389196754">"Peso pesado"</item>
+    <item msgid="1290888779300174556">"Servicio (en ejecución)"</item>
+    <item msgid="7241098542073939046">"Servicio (reiniciando)"</item>
+    <item msgid="6610439017684111046">"Receptor"</item>
+    <item msgid="7367606086319921117">"Inicio"</item>
+    <item msgid="3344660712396741826">"Última actividad"</item>
+    <item msgid="5006559348883303865">"En caché (actividad)"</item>
+    <item msgid="8633480732468137525">"En caché (cliente de actividad)"</item>
+    <item msgid="6248998242443333892">"En caché (vacío)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Verde azulado"</item>
+    <item msgid="3228505970082457852">"Azul"</item>
+    <item msgid="6590260735734795647">"Índigo"</item>
+    <item msgid="3521763377357218577">"Violeta"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Rojo"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Más de 30 días de antigüedad"</item>
+    <item msgid="8699273238891265610">"Más de 60 días de antigüedad"</item>
+    <item msgid="8346279419423837266">"Más de 90 días de antigüedad"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detectar automáticamente"</item>
+    <item msgid="773943026484148895">"Tratar como red de uso medido"</item>
+    <item msgid="1008268820118852416">"Tratar como red de uso no medido"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Usar dirección MAC aleatoria (predeterminado)"</item>
+    <item msgid="214234417308375326">"Usar dirección MAC del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Sí"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Oscuro"</item>
+    <item msgid="5079453644557603349">"Claro"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desactivado"</item>
+    <item msgid="4072198137051566919">"Depurar"</item>
+    <item msgid="2473005316958868509">"Detallado"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Solo sistema doméstico"</item>
+    <item msgid="1161026694891024702">"Automática"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Preferencia: GSM o WCDMA"</item>
+    <item msgid="7581481130337402578">"Solo GSM"</item>
+    <item msgid="8579197487913425819">"Solo WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM o WCDMA (automático)"</item>
+    <item msgid="9107479914166352132">"CDMA o EvDo (automático)"</item>
+    <item msgid="4219607161971472471">"CDMA sin EvDo"</item>
+    <item msgid="7278975240951052041">"Solo EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA, EvDo, GSM o WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA y LTE o EvDo"</item>
+    <item msgid="463168068025354541">"GSM, WCDMA o LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE o WCDMA"</item>
+    <item msgid="5638632460322750180">"Solo TD-SCDMA"</item>
+    <item msgid="4346392996298714633">"TD-SCDMA o WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE o TD-SCDMA"</item>
+    <item msgid="9191730167201068525">"TD-SCDMA o GSM"</item>
+    <item msgid="5874623229495009031">"LTE, TD-SCDMA o GSM"</item>
+    <item msgid="5096480046347789213">"TD-SCDMA, GSM o WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE, TD-SCDMA o WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE, TD-SCDMA, GSM o WCDMA"</item>
+    <item msgid="2067289929099567494">"TD-SCDMA, CDMA, EvDo, GSM o WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE, TD-SCDMA, CDMA, EvDo, GSM o WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE o CDMA"</item>
+    <item msgid="1779116915491192719">"LTE, GSM o UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-es/strings.xml b/tests/CarDeveloperOptions/res/values-es/strings.xml
index 13f8221..fe6c748 100644
--- a/tests/CarDeveloperOptions/res/values-es/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es/strings.xml
@@ -324,7 +324,7 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Usar hora de la red"</string>
-    <string name="zone_auto_title" msgid="5500880975376882488">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_title" msgid="5500880975376882488">"Usar la zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour_auto" msgid="7499659679134962547">"Usar la configuración regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="6209923858891621283">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1265706705061608742">"Usar formato de 24 horas"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protege tu tablet con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También necesitas tener una opción de bloqueo de pantalla para configurar la autenticación facial. Toca Cancelar y establece un PIN, o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protege tu dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También necesitas tener una opción de bloqueo de pantalla para configurar la autenticación facial. Toca Cancelar y establece un PIN, o elige otra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protege tu teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También necesitas tener una opción de bloqueo de pantalla para configurar la autenticación facial. Toca Cancelar y establece un PIN, o elige otra opción de bloqueo de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"¿No configurar PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"¿No configurar contraseña?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"¿No configurar patrón?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueo de pantalla"</string>
@@ -536,7 +535,7 @@
     <string name="crypt_keeper_data_corrupt_title" msgid="6561535293845985713">"Descifrado incorrecto"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el tablet, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"La contraseña que has introducido es correcta pero, lamentablemente, tus datos están dañados. \n\nPara seguir utilizando el teléfono, debes restablecer el estado de fábrica. Al configurar el dispositivo después de este proceso, podrás restaurar los datos incluidos en la copia de seguridad de tu cuenta de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"Cambiar método de entrada"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"Cambiar método de introducción"</string>
     <string name="suggested_lock_settings_title" msgid="1518155558803371661">"Protege tu teléfono"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"Añade bloqueo de pantalla para proteger el tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="7127114417250029182">"Añade bloqueo de pantalla para proteger el dispositivo"</string>
@@ -762,7 +761,7 @@
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Desincronizar"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Desconectar y desincronizar"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Opciones…"</string>
-    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Ajustes avanzados"</string>
+    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Avanzado"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Ajustes avanzados de Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Si se activa el Bluetooth, tu dispositivo se puede comunicar con otros dispositivos con Bluetooth cercanos"</string>
     <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Si el Bluetooth está activado, el dispositivo se puede comunicar con otros dispositivos Bluetooth cercanos.\n\nPara mejorar la experiencia de uso del dispositivo, las aplicaciones y los servicios pueden seguir buscando dispositivos cercanos en cualquier momento, aunque el Bluetooth esté desactivado. Esta opción se puede utilizar, por ejemplo, para mejorar los servicios y funciones basados en la ubicación, y puedes cambiarla en los "<annotation id="link">"ajustes de búsqueda"</annotation>"."</string>
@@ -881,7 +880,7 @@
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"Más opciones"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"Buscar"</string>
-    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Ajustes avanzados"</string>
+    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Avanzado"</string>
     <string name="wifi_menu_configure" msgid="52192491120701266">"Configurar"</string>
     <string name="wifi_menu_connect" msgid="3984327567173931219">"Conectarse a la red"</string>
     <string name="wifi_menu_remember" msgid="717257200269700641">"Recordar red"</string>
@@ -1068,7 +1067,7 @@
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Banda del punto de acceso"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Utiliza un punto de acceso para crear una red Wi‑Fi que puedan usar otros dispositivos. Los puntos de acceso permiten acceder a Internet con una conexión de datos móviles. Es posible que se apliquen cargos adicionales por el uso de datos."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Las aplicaciones pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Desactivar el punto de acceso automáticamente"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Desactivar punto de acceso automáticamente"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"El punto de acceso Wi‑Fi se desactivará si no hay dispositivos conectados"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Activando zona Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"Desactivando zona Wi-Fi…"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Móvil"</item>
+    <item msgid="6007360612667098926">"Solo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1123,7 +1125,7 @@
     <string name="notification_volume_title" msgid="6022562909288085275">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="7312942422655861175">"Utilizar volumen de llamada entrante para notificaciones"</string>
     <string name="home_work_profile_not_supported" msgid="6137073723297076818">"No admite perfiles de trabajo"</string>
-    <string name="notification_sound_dialog_title" msgid="6653341809710423276">"Sonido notif. predet."</string>
+    <string name="notification_sound_dialog_title" msgid="6653341809710423276">"Sonido de notificación predeterminado"</string>
     <string name="media_volume_title" msgid="1030438549497800914">"Multimedia"</string>
     <string name="media_volume_summary" msgid="3142433516297061652">"Establecer volumen para música y vídeos"</string>
     <string name="alarm_volume_title" msgid="8902277801531496243">"Alarma"</string>
@@ -1178,7 +1180,7 @@
     <string name="brightness" msgid="7309120144111305275">"Nivel de brillo"</string>
     <string name="brightness_title" msgid="5660190946911149690">"Brillo"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"Ajustar el brillo de la pantalla"</string>
-    <string name="auto_brightness_title" msgid="908511534369820426">"Brillo automático"</string>
+    <string name="auto_brightness_title" msgid="908511534369820426">"Brillo adaptativo"</string>
     <string name="auto_brightness_summary_on" msgid="121488862610275737">"Activado"</string>
     <string name="auto_brightness_summary_off" msgid="8569141123211510256">"Desactivado"</string>
     <string name="auto_brightness_summary_very_low" msgid="7625647285740629347">"El brillo preferido es muy bajo"</string>
@@ -1196,7 +1198,7 @@
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"No ajustar en función de la luz ambiental"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"Aumenta el uso de la batería"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"Optimiza el brillo en función de la luz ambiental. Puedes ajustarlo temporalmente aunque actives esta función."</string>
-    <string name="auto_brightness_description" msgid="8209140379089535411">"El brillo de la pantalla se ajustará automáticamente según el entorno y las actividades que hagas. Puedes mover el control deslizante para que la función de brillo adaptable reconozca tus preferencias."</string>
+    <string name="auto_brightness_description" msgid="8209140379089535411">"El brillo de la pantalla se ajustará automáticamente según el entorno y las actividades que hagas. Puedes mover el control deslizante para que la función de brillo adaptativo reconozca tus preferencias."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"Balance de blancos de pantalla"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Modo privado"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Activado: la pantalla no se apagará si estás mirándola"</string>
@@ -1338,7 +1340,7 @@
     <string name="scanning_status_text_wifi_on_ble_on" msgid="6370507836346838473">"Las redes Wi‑Fi y las conexiones Bluetooth tienen la búsqueda activada"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="8205014713732412608">"La búsqueda de redes Wi‑Fi está activa y la de conexiones Bluetooth, desactivada"</string>
     <string name="scanning_status_text_wifi_off_ble_on" msgid="7400522456303307057">"La búsqueda de conexiones Bluetooth está activada y la de redes Wi‑Fi, desactivada"</string>
-    <string name="scanning_status_text_wifi_off_ble_off" msgid="8575026386237481457">"Las redes Wi‑Fi y las conexiones Bluetooth tienen la búsqueda desactivada"</string>
+    <string name="scanning_status_text_wifi_off_ble_off" msgid="8575026386237481457">"Está desactivada la búsqueda de redes Wi‑Fi y conexiones Bluetooth"</string>
     <string name="status_meid_number" msgid="8756271256760479835">"MEID"</string>
     <string name="status_icc_id" msgid="9191847562997702709">"ICCID"</string>
     <string name="status_data_network_type" msgid="2344720457353394909">"Tipo de red de datos móviles"</string>
@@ -2484,8 +2486,8 @@
     <string name="menu_duration_6h" msgid="6169009210638008417">"6 horas"</string>
     <string name="menu_duration_12h" msgid="1435242738163843797">"12 horas"</string>
     <string name="menu_duration_1d" msgid="6476370834372352174">"1 día"</string>
-    <string name="menu_show_system" msgid="6315865548558708248">"Mostrar aplicaciones del sistema"</string>
-    <string name="menu_hide_system" msgid="8457027118873733782">"Ocultar aplicaciones del sistema"</string>
+    <string name="menu_show_system" msgid="6315865548558708248">"Mostrar sistema"</string>
+    <string name="menu_hide_system" msgid="8457027118873733782">"Ocultar sistema"</string>
     <string name="menu_show_percentage" msgid="6983272380729890884">"Mostrar porcentajes"</string>
     <string name="menu_use_uss" msgid="3765054705208926803">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="2680179749566186247">"Tipo de estadísticas"</string>
@@ -2526,7 +2528,7 @@
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"Mostrar certificados de CA de confianza"</string>
     <string name="user_credentials" msgid="8365731467650306757">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="7350223899317423252">"Ver y modificar credenciales almacenadas"</string>
-    <string name="advanced_security_title" msgid="286883005673855845">"Ajustes avanzados"</string>
+    <string name="advanced_security_title" msgid="286883005673855845">"Avanzado"</string>
     <string name="credential_storage_type" msgid="2585337320206095255">"Tipo de almacenamiento"</string>
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="1335905150062717150">"Solo software"</string>
@@ -2588,7 +2590,7 @@
     <string name="sync_failed" msgid="3142663443336915051">"Error de sincronización"</string>
     <string name="sync_active" msgid="1112604707180806364">"Sincronización activa"</string>
     <string name="account_sync_settings_title" msgid="3344538161552327748">"Sincronización"</string>
-    <string name="sync_is_failing" msgid="8284618104132302644">"En este momento hay incidencias con la sincronización. Se restablecerá en breve."</string>
+    <string name="sync_is_failing" msgid="8284618104132302644">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
     <string name="add_account_label" msgid="4461298847239641874">"Añadir cuenta"</string>
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"El perfil de trabajo aún no está disponible"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"Perfil de trabajo"</string>
@@ -3130,7 +3132,7 @@
     <string name="media_volume_option_title" msgid="3553411883305505682">"Volumen de multimedia"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"Volumen de envío"</string>
     <string name="call_volume_option_title" msgid="5028003296631037334">"Volumen de llamada"</string>
-    <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volumen de la alarma"</string>
+    <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volumen de alarma"</string>
     <string name="ring_volume_option_title" msgid="2038924918468372264">"Volumen del tono"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"Volumen de notificaciones"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"Tono del teléfono"</string>
@@ -3290,7 +3292,7 @@
     <string name="configure_notification_settings" msgid="291914315140851270">"Notificaciones"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Enviadas recientemente"</string>
     <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Ver las de los últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="984680389373090015">"Ajustes avanzados"</string>
+    <string name="advanced_section_header" msgid="984680389373090015">"Avanzado"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Notificaciones de trabajo"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Prioridad de los avisos automáticos"</string>
     <string name="asst_capability_prioritizer_summary" msgid="3525640645743790796">"Silenciar y disminuir el nivel de las notificaciones menos importantes"</string>
@@ -3413,8 +3415,8 @@
     <string name="app_notification_block_summary" msgid="4502146897785692336">"No mostrar nunca estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="2805138591864484587">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="2743896875255591743">"No mostrar nunca notificaciones en el panel de notificaciones ni en dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="8989086619255666442">"Permitir punto de notificación"</string>
-    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Mostrar punto de notificación"</string>
+    <string name="notification_badge_title" msgid="8989086619255666442">"Permitir burbuja de notificación"</string>
+    <string name="notification_channel_badge_title" msgid="8228215248332054612">"Mostrar burbuja de notificación"</string>
     <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Omitir No molestar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Permitir notificaciones cuando el modo No molestar esté activado"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"En la pantalla de bloqueo"</string>
@@ -3635,7 +3637,7 @@
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"Categorías: poca importancia"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"Categorías: desactivadas"</string>
     <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Categorías: prioritarias"</string>
-    <string name="advanced_apps" msgid="6643869089344883537">"Ajustes avanzados"</string>
+    <string name="advanced_apps" msgid="6643869089344883537">"Avanzado"</string>
     <string name="configure_apps" msgid="4066683118857400943">"Configurar aplicaciones"</string>
     <string name="unknown_app" msgid="2312052973570376877">"Aplicación desconocida"</string>
     <string name="app_permissions" msgid="3215958256821756086">"Gestor de permisos"</string>
@@ -4045,7 +4047,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"recorte de la pantalla, corte"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"Opción predeterminada del dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"No se ha podido crear la superposición"</string>
-    <string name="special_access" msgid="1453926335914696206">"Acceso especial de apps"</string>
+    <string name="special_access" msgid="1453926335914696206">"Acceso especial de aplicaciones"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden utilizar datos sin restricción</item>
       <item quantity="one">1 aplicación puede utilizar datos sin restricción</item>
@@ -4071,7 +4073,7 @@
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Seleccionar tema"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Esta configuración también se utiliza para las aplicaciones"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Las aplicaciones que lo admitan también se cambiarán al tema oscuro"</string>
-    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Iconos para desarrolladores en Ajustes rápidos"</string>
+    <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Iconos para desarrolladores en ajustes rápidos"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Rastro de Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Sensores desactivados"</string>
     <string name="managed_profile_settings_title" msgid="4340409321523532402">"Ajustes de perfil de trabajo"</string>
@@ -4155,7 +4157,7 @@
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Sincronizar datos del trabajo automáticamente"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Permitir que las aplicaciones actualicen los datos automáticamente"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"Sincronización"</string>
-    <string name="account_sync_summary_some_on" msgid="1934556869158274053">"Elementos con la sincronización activada: <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_some_on" msgid="1934556869158274053">"Sincronización activada para <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> elementos"</string>
     <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Sincronización activada para todos los elementos"</string>
     <string name="account_sync_summary_all_off" msgid="1971584632343645602">"Sincronización desactivada para todos los elementos"</string>
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"Información sobre el dispositivo administrado"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Esta función ralentizará el teléfono"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forzar mediciones de GNSS completas"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Registrar todas las frecuencias y constelaciones de GNSS sin ciclo de servicio"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Depurar durante el cambio de usuario"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Muestra información detallada durante el cambio de usuario"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permitir el inicio de actividades en segundo plano"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permitir que se inicien todas las actividades en segundo plano"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Mostrar siempre el cuadro de diálogo de fallos"</string>
diff --git a/tests/CarDeveloperOptions/res/values-et-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-et-nokeys/strings.xml
new file mode 100644
index 0000000..5c254da
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-et-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Rakenduste haldamine"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-et/arrays.xml b/tests/CarDeveloperOptions/res/values-et/arrays.xml
new file mode 100644
index 0000000..62ffe5d
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-et/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Ameerika"</item>
+    <item msgid="4791956477275129121">"Euroopa"</item>
+    <item msgid="3812126832016254559">"Aafrika"</item>
+    <item msgid="2765816300353408280">"Aasia"</item>
+    <item msgid="6683489385344409742">"Austraalia"</item>
+    <item msgid="5194868215515664953">"Vaikne ookean"</item>
+    <item msgid="7044520255415007865">"Kõik"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekundit"</item>
+    <item msgid="772029947136115322">"30 sekundit"</item>
+    <item msgid="8743663928349474087">"1 minut"</item>
+    <item msgid="1506508631223164814">"2 minutit"</item>
+    <item msgid="8664703938127907662">"5 minutit"</item>
+    <item msgid="5827960506924849753">"10 minutit"</item>
+    <item msgid="6677424950124253938">"30 minutit"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Mitte kunagi"</item>
+    <item msgid="2517785806387977252">"15 sekundit"</item>
+    <item msgid="6347954399441173672">"30 sekundit"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minutit"</item>
+    <item msgid="2788593551142462622">"5 minutit"</item>
+    <item msgid="8012672183888404961">"10 minutit"</item>
+    <item msgid="8271452751594598661">"30 minutit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Kohe"</item>
+    <item msgid="2038544972632026612">"5 sekundit"</item>
+    <item msgid="5558060663472279597">"15 sekundit"</item>
+    <item msgid="45341168505452037">"30 sekundit"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minutit"</item>
+    <item msgid="4376575879222393045">"5 minutit"</item>
+    <item msgid="811192536981678974">"10 minutit"</item>
+    <item msgid="7258394417241706272">"30 minutit"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Väike"</item>
+    <item msgid="591935967183159581">"Vaikeseade"</item>
+    <item msgid="1714184661981538355">"Suur"</item>
+    <item msgid="6195563047686707484">"Suurim"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skannimine…"</item>
+    <item msgid="5597394826455877834">"Ühendamine ..."</item>
+    <item msgid="5848277343965362748">"Autentimine …"</item>
+    <item msgid="3391238031431440676">"IP-aadressi hankimine…"</item>
+    <item msgid="5257597310494000224">"Ühendatud"</item>
+    <item msgid="8472497592913050396">"Peatatud"</item>
+    <item msgid="1228072488815999109">"Ühenduse katkestamine ..."</item>
+    <item msgid="7253087004422991731">"Ühendus katkestatud"</item>
+    <item msgid="4169850917304751227">"Ebaõnnestus"</item>
+    <item msgid="6266658166690831131">"Blokeeritud"</item>
+    <item msgid="4517230805854909775">"Kehva ühenduse ajutine vältimine"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Otsing ..."</item>
+    <item msgid="8058143476674427024">"Ühendamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Autentimine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="5145158315060185414">"IP-aadressi hankimine võrgust <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="3283243151651124831">"Ühendatud võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Peatatud"</item>
+    <item msgid="4133290864821295785">"Ühenduse katkestamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Ühendus katkestatud"</item>
+    <item msgid="2847316776634969068">"Ebaõnnestus"</item>
+    <item msgid="4390990424746035383">"Blokeeritud"</item>
+    <item msgid="3618248791367063949">"Kehva ühenduse ajutine vältimine"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Nupuvajutus"</item>
+    <item msgid="7401896200768713930">"PIN-kood partnerseadmest"</item>
+    <item msgid="4526848028011846710">"PIN sellest seadmest"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Ühendatud"</item>
+    <item msgid="983792611851499732">"Kutsutud"</item>
+    <item msgid="5438273405428201793">"Ebaõnnestus"</item>
+    <item msgid="4646663015449312554">"Saadaval"</item>
+    <item msgid="3230556734162006146">"Vahemikust väljas"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutit"</item>
+    <item msgid="2759776603549270587">"5 minutit"</item>
+    <item msgid="167772676068860015">"1 tund"</item>
+    <item msgid="5985477119043628504">"Kunagi ei võta aega maha"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Kasuta süsteemi vaikeseadet: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"Viis"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Kehv"</item>
+    <item msgid="7882129634982603782">"Halb"</item>
+    <item msgid="6457357501905996224">"Rahuldav"</item>
+    <item msgid="405271628162918841">"Hea"</item>
+    <item msgid="999948812884919584">"Suurepärane"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Viimased 30 päeva"</item>
+    <item msgid="3211287705232736964">"Kas. tsükli määramine ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Kasutusaeg"</item>
+    <item msgid="2784401352592276015">"Viimane kasutamine"</item>
+    <item msgid="249854287216326349">"Rakenduse nimi"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Mitte ükski"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Mitte ükski"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM-kaart"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Mitte ükski"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Staatiline"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Mitte ükski"</item>
+    <item msgid="1464741437353223198">"Käsitsi"</item>
+    <item msgid="5793600062487886090">"Puhvers. autom. seadistus"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Mitte ükski"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP või CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Määramata"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Puudub"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Seadme sisemine salvestusruum"</item>
+    <item msgid="3186681694079967527">"Eemaldatav SD-kaart"</item>
+    <item msgid="6902033473986647035">"Lase süsteemil otsustada"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Asukoht"</item>
+    <item msgid="6842381562497597649">"Isiklik"</item>
+    <item msgid="3966700236695683444">"Sõnumside"</item>
+    <item msgid="8563996233342430477">"Meedium"</item>
+    <item msgid="5323851085993963783">"Seade"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"üldine asukoht"</item>
+    <item msgid="1830619568689922920">"täpne asukoht"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibreerimine"</item>
+    <item msgid="8632513128515114092">"kontaktide lugemine"</item>
+    <item msgid="3741042113569620272">"kontaktide muutmine"</item>
+    <item msgid="4204420969709009931">"kõnelogi lugemine"</item>
+    <item msgid="2260380357119423209">"kõnelogi muutmine"</item>
+    <item msgid="6550710385014530934">"kalendri lugemine"</item>
+    <item msgid="3575906174264853951">"kalendri muutmine"</item>
+    <item msgid="4319843242568057174">"WiFi skannimine"</item>
+    <item msgid="2981791890467303819">"märguanne"</item>
+    <item msgid="6617825156152476692">"mobiili skannimine"</item>
+    <item msgid="8865260890611559753">"helistamine telefonile"</item>
+    <item msgid="3254999273961542982">"SMS-i lugemine"</item>
+    <item msgid="7711446453028825171">"SMS-i kirjutamine"</item>
+    <item msgid="6123238544099198034">"SMS-i vastuvõtmine"</item>
+    <item msgid="838342167431596036">"hädaolukorra SMS-i vastuvõtmine"</item>
+    <item msgid="8554432731560956686">"MMS-i vastuvõtmine"</item>
+    <item msgid="7464863464299515059">"WAP-edastuse vastuvõtmine"</item>
+    <item msgid="310463075729606765">"Saada SMS"</item>
+    <item msgid="7338021933527689514">"ICC SMS-i lugemine"</item>
+    <item msgid="6130369335466613036">"ICC SMS-i kirjutamine"</item>
+    <item msgid="6536865581421670942">"seadete muutmine"</item>
+    <item msgid="4547203129183558973">"peale joonistamine"</item>
+    <item msgid="9080347512916542840">"juurdepääsumärguanded"</item>
+    <item msgid="5332718516635907742">"kaamera"</item>
+    <item msgid="6098422447246167852">"heli salvestamine"</item>
+    <item msgid="9182794235292595296">"heli esitamine"</item>
+    <item msgid="8760743229597702019">"lõikelaua lugemine"</item>
+    <item msgid="2266923698240538544">"lõikelaua muutmine"</item>
+    <item msgid="1801619438618539275">"meedianupud"</item>
+    <item msgid="31588119965784465">"helifookus"</item>
+    <item msgid="7565226799008076833">"põhihelitugevus"</item>
+    <item msgid="5420704980305018295">"hääle helitugevus"</item>
+    <item msgid="5797363115508970204">"helina helitugevus"</item>
+    <item msgid="8233154098550715999">"meedia helitugevus"</item>
+    <item msgid="5196715605078153950">"äratuse helitugevus"</item>
+    <item msgid="394030698764284577">"märguande helitugevus"</item>
+    <item msgid="8952898972491680178">"Bluetoothi helitugevus"</item>
+    <item msgid="8506227454543690851">"hoia ärkvel"</item>
+    <item msgid="1108160036049727420">"monitori asukoht"</item>
+    <item msgid="1496205959751719491">"suure võimsusega asukoha jälgimine"</item>
+    <item msgid="3776296279910987380">"kasutusstatistika hankimine"</item>
+    <item msgid="8827100324471975602">"mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+    <item msgid="6880736730520126864">"teatiste kuvamine"</item>
+    <item msgid="4933375960222609935">"meediumi projitseerimine"</item>
+    <item msgid="8357907018938895462">"VPN-i aktiveerimine"</item>
+    <item msgid="8143812849911310973">"taustapilt kirjutamiseks"</item>
+    <item msgid="6266277260961066535">"abistruktuur"</item>
+    <item msgid="7715498149883482300">"abistav ekraanipilt"</item>
+    <item msgid="4046679376726313293">"telefoni oleku lugemine"</item>
+    <item msgid="6329507266039719587">"kõneposti lisamine"</item>
+    <item msgid="7692440726415391408">"SIP kasutamine"</item>
+    <item msgid="8572453398128326267">"väljamineva kõne töötlemine"</item>
+    <item msgid="7775674394089376306">"sõrmejälg"</item>
+    <item msgid="3182815133441738779">"kehaandurid"</item>
+    <item msgid="2793100005496829513">"kärjeteadete lugemine"</item>
+    <item msgid="2633626056029384366">"tehislik asukoht"</item>
+    <item msgid="8356842191824684631">"salvestusruumi lugemine"</item>
+    <item msgid="5671906070163291500">"salvestusruumi kirjutamine"</item>
+    <item msgid="2791955098549340418">"ekraani sisselülitamine"</item>
+    <item msgid="5599435119609178367">"kontode hankimine"</item>
+    <item msgid="1165623660533024666">"taustal käitamine"</item>
+    <item msgid="6423861043647911030">"juurdepääsetavuse helitugevus"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Lühike"</item>
+    <item msgid="4816511817309094890">"Keskmine"</item>
+    <item msgid="8305084671259331134">"Pikk"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Vaikeseade"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif, tihendatud"</item>
+    <item msgid="6529379119163117545">"Sans Serif, püsisammkiri"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serifi püsisammkiri"</item>
+    <item msgid="4448481989108928248">"Lihtne"</item>
+    <item msgid="4627069151979553527">"Kursiiv"</item>
+    <item msgid="6896773537705206194">"Kapiteelkiri"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Väga väike"</item>
+    <item msgid="5091603983404027034">"Väike"</item>
+    <item msgid="176844712416932112">"Tavaline"</item>
+    <item msgid="2784236342175159295">"Suur"</item>
+    <item msgid="218913203203160606">"Väga suur"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Vaikeseade"</item>
+    <item msgid="6488643537808152001">"Mitte ükski"</item>
+    <item msgid="552332815156010137">"Piirjoon"</item>
+    <item msgid="7187891159463789272">"Langev vari"</item>
+    <item msgid="8019330250538856521">"Reljeefne"</item>
+    <item msgid="8987385315647049787">"Lohkus"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Kasuta vaikeseadeid"</item>
+    <item msgid="8611890312638868524">"Valge mustal"</item>
+    <item msgid="5891360837786277638">"Must valgel"</item>
+    <item msgid="2798457065945456853">"Kollane mustal"</item>
+    <item msgid="5799049811524553967">"Kollane sinisel"</item>
+    <item msgid="3673930830658169860">"Kohandatud"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN eeljagatud võtmetega"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN sertifikaatidega"</item>
+    <item msgid="312397853907741968">"IPSec VPN eeljagatud võtmete ja Xauth-i autentimisega"</item>
+    <item msgid="3319427315593649917">"IPSec VPN sertifikaatide ja Xauth-i autentimisega"</item>
+    <item msgid="8258927774145391041">"IPSec VPN sertifikaatide ja hübriidautentimisega"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Puudub"</item>
+    <item msgid="1157046369795346308">"Käsitsi"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Ühendus katkestatud"</item>
+    <item msgid="8754480102834556765">"Lähtestamine ..."</item>
+    <item msgid="3351334355574270250">"Ühendamine ..."</item>
+    <item msgid="8303882153995748352">"Ühendatud"</item>
+    <item msgid="9135049670787351881">"Ajalõpp"</item>
+    <item msgid="2124868417182583926">"Ebaõnnestus"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Küsi"</item>
+    <item msgid="7718817231348607934">"Ära luba kunagi"</item>
+    <item msgid="8184570120217958741">"Luba alati"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Püsiv"</item>
+    <item msgid="167418068739176448">"Sagedasim tegevus"</item>
+    <item msgid="4760813290195199773">"Oluline (esiplaanil)"</item>
+    <item msgid="2328684826817647595">"Oluline (taustal)"</item>
+    <item msgid="7746406490652867365">"Varundamine"</item>
+    <item msgid="5597404364389196754">"Mahukas"</item>
+    <item msgid="1290888779300174556">"Teenus (töötamine)"</item>
+    <item msgid="7241098542073939046">"Teenus (taaskäivitamine)"</item>
+    <item msgid="6610439017684111046">"Vastuvõtja"</item>
+    <item msgid="7367606086319921117">"Avakuva"</item>
+    <item msgid="3344660712396741826">"Viimane tegevus"</item>
+    <item msgid="5006559348883303865">"Vahemälus (tegevus)"</item>
+    <item msgid="8633480732468137525">"Vahemälus (tegevuse klient)"</item>
+    <item msgid="6248998242443333892">"Vahemälus (tühi)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Sinakasroheline"</item>
+    <item msgid="3228505970082457852">"Sinine"</item>
+    <item msgid="6590260735734795647">"Indigosinine"</item>
+    <item msgid="3521763377357218577">"Lilla"</item>
+    <item msgid="5932337981182999919">"Roosa"</item>
+    <item msgid="5642914536624000094">"Punane"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Üle 30 päeva vanad"</item>
+    <item msgid="8699273238891265610">"Üle 60 päeva vanad"</item>
+    <item msgid="8346279419423837266">"Üle 90 päeva vanad"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Tuvasta automaatselt"</item>
+    <item msgid="773943026484148895">"Käsitle mahupõhisena"</item>
+    <item msgid="1008268820118852416">"Käsitle mittemahupõhisena"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Kasuta juhuslikku MAC-aadressi (vaikeseade)"</item>
+    <item msgid="214234417308375326">"Kasuta seadme MAC-aadressi"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ei"</item>
+    <item msgid="1930581185557754880">"Jah"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tume"</item>
+    <item msgid="5079453644557603349">"Hele"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Väljas"</item>
+    <item msgid="4072198137051566919">"Silumine"</item>
+    <item msgid="2473005316958868509">"Üksikasjalik"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Ainult kodus"</item>
+    <item msgid="1161026694891024702">"Automaatne"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Eelistatud: GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Ainult GSM"</item>
+    <item msgid="8579197487913425819">"Ainult WCDMA"</item>
+    <item msgid="8465243227505412498">"Automaatne GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automaatne CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA ilma EvDo-ta"</item>
+    <item msgid="7278975240951052041">"Ainult EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Üldine"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Ainult TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Üldine"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-et/strings.xml b/tests/CarDeveloperOptions/res/values-et/strings.xml
index 35dc189..627f509 100644
--- a/tests/CarDeveloperOptions/res/values-et/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-et/strings.xml
@@ -208,7 +208,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"Peate täitma pordi välja."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Sisestatud port on kehtetu."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei pruugi seda kasutada."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL ribalaius (kbit/s):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL ribalaius (kbit/s):"</string>
@@ -301,7 +301,7 @@
     <string name="settings_label" msgid="7263237773415875813">"Seaded"</string>
     <string name="settings_label_launcher" msgid="500627679902923496">"Seaded"</string>
     <string name="settings_shortcut" msgid="4503714880251502167">"Seadete otsetee"</string>
-    <string name="airplane_mode" msgid="4508870277398231073">"Lennurežiim"</string>
+    <string name="airplane_mode" msgid="4508870277398231073">"Lennukirežiim"</string>
     <string name="wireless_networks_settings_title" msgid="4298430520189173949">"Traadita ühendus ja võrgud"</string>
     <string name="radio_controls_summary" msgid="4596981962167684814">"WiFi, Bluetoothi, lennurežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
     <string name="cellular_data_title" msgid="7909624119432695022">"Mobiilne andmeside"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Kaitske oma tahvelarvutit ekraanilukuga, et keegi ei saaks seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka näo autentimise seadistamiseks. Puudutage käsku Tühista, seejärel määrake PIN-kood või tehke mõni muu ekraaniluku valik."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Kaitske oma seadet ekraanilukuga, et keegi ei saaks seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka näo autentimise seadistamiseks. Puudutage käsku Tühista, seejärel määrake PIN-kood või tehke mõni muu ekraaniluku valik."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Kaitske oma telefoni ekraanilukuga, et keegi ei saaks seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka näo autentimise seadistamiseks. Puudutage käsku Tühista, seejärel määrake PIN-kood või tehke mõni muu ekraaniluku valik."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Kas jätta PIN-i määr. vahele?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Kas jätta parooli määr. vah.?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Kas jätta mustri määr. vahele?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Seadista ekraanilukk"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WiFi"</item>
+    <item msgid="4421333712484542489">"Mobiilne andmeside"</item>
+    <item msgid="6007360612667098926">"Ainult WiFi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1779,7 +1781,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"Sama mis seadme ekraanilukk"</string>
     <string name="manageapplications_settings_title" msgid="6876782217962262376">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="5092964799412478962">"Installitud rakenduste haldamine ja eemaldamine"</string>
-    <string name="applications_settings" msgid="368331725658793179">"Rakenduste teave"</string>
+    <string name="applications_settings" msgid="368331725658793179">"Rakenduse teave"</string>
     <string name="applications_settings_summary" msgid="8888258399577123906">"Rakenduste haldamine, kiirkäivituse otseteede seadistamine"</string>
     <string name="applications_settings_header" msgid="3766501606045211098">"Rakenduse seaded"</string>
     <string name="install_applications" msgid="7745902974984889179">"Tundmatud allikad"</string>
@@ -1791,7 +1793,7 @@
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"Teie seade ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate seadme kõigi kahjude ja andmekao eest, mis võivad selliste rakenduste kasutamisest tuleneda."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Täpsemad seaded"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Luba rohkem seadete valikuid"</string>
-    <string name="application_info_label" msgid="3886253474964599105">"Rakenduste teave"</string>
+    <string name="application_info_label" msgid="3886253474964599105">"Rakenduse teave"</string>
     <string name="storage_label" msgid="1109537840103290384">"Mäluruum"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"Avamine vaikimisi"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"Vaikeseaded"</string>
@@ -2090,7 +2092,7 @@
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"Puudutusel vibreerimine"</string>
     <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"Kasuta teenust"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"Kasuta värvikorrigeerimist"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Kasuta tiitreid"</string>
+    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Kasuta subtiitreid"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"Jätka"</string>
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Kuuldeaparaadid"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Ühtegi kuuldeaparaati pole ühendatud"</string>
@@ -2386,7 +2388,7 @@
     <string name="usage_type_computed_power" msgid="2594890316149868151">"Arvutatud energiatarbimine"</string>
     <string name="usage_type_actual_power" msgid="8067253427718526111">"Tuvastatud energiatarbimine"</string>
     <string name="battery_action_stop" msgid="1866624019460630143">"Sunni peatuma"</string>
-    <string name="battery_action_app_details" msgid="1077011181969550402">"Rakenduste teave"</string>
+    <string name="battery_action_app_details" msgid="1077011181969550402">"Rakenduse teave"</string>
     <string name="battery_action_app_settings" msgid="587998773852488539">"Rakenduse seaded"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"Ekraani seaded"</string>
     <string name="battery_action_wifi" msgid="7123520587925323824">"WiFi-seaded"</string>
@@ -2603,7 +2605,7 @@
     <string name="sync_enabled" msgid="535172627223336983">"Sünkroonim. on SEES"</string>
     <string name="sync_disabled" msgid="713721807204805062">"Sünkroonimine VÄLJAS"</string>
     <string name="sync_error" msgid="988155155932442765">"Sünkroonimise viga"</string>
-    <string name="last_synced" msgid="4511434057768999129">"Viimati sünkroonitud <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4511434057768999129">"Viimati sünkroonitud: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="1311828882739675714">"Sünkroonimine ..."</string>
     <string name="settings_backup" msgid="3261579634252074247">"Varunda seaded"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"Minu seadete varundamine"</string>
@@ -3622,7 +3624,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> täiendavat luba</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> täiendav luba</item>
     </plurals>
-    <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Lube ei antud"</string>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Lube pole antud"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Lube ei taotletud"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"Kõik rakendused"</string>
     <string name="filter_enabled_apps" msgid="5888459261768538489">"Installitud rakendused"</string>
@@ -3659,7 +3661,7 @@
     <string name="assist_and_voice_input_title" msgid="324148194703846130">"Abirakendus ja häälsisend"</string>
     <string name="default_assist_title" msgid="2060846994203235317">"Abirakendus"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"Kas soovite rakenduse <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> muuta abirakenduseks?"</string>
-    <string name="assistant_security_warning" msgid="1304057692847069938">"Abimees saab teie süsteemis kasutatavate rakenduste kohta teavet vaadata (sh teie ekraanil kuvatud või rakendustes juurdepääsetav teave)."</string>
+    <string name="assistant_security_warning" msgid="1304057692847069938">"Assistent saab teie süsteemis kasutatavate rakenduste kohta teavet vaadata (sh teie ekraanil kuvatud või rakendustes juurdepääsetav teave)."</string>
     <string name="assistant_security_warning_agree" msgid="5105692801460137289">"Nõustu"</string>
     <string name="assistant_security_warning_disagree" msgid="4217490999193100459">"Ei nõustu"</string>
     <string name="choose_voice_input_title" msgid="5369311838580756359">"Häälsisendi valimine"</string>
@@ -3881,7 +3883,7 @@
     <string name="condition_expand_show" msgid="4118818022763913777">"Kuva"</string>
     <string name="condition_expand_hide" msgid="1112721783024332643">"Peida"</string>
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Kuumkoht on aktiivne"</string>
-    <string name="condition_airplane_title" msgid="8484582712516148433">"Lennurežiim on sees"</string>
+    <string name="condition_airplane_title" msgid="8484582712516148433">"Lennukirežiim on sees"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Võrgud pole saadaval"</string>
     <string name="condition_zen_title" msgid="2128184708916052585">"Režiim Mitte segada on sees"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Telefon on vaigistatud"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"See muudab selle telefoni aeglasemaks"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Jõusta GNSS-i täielikud mõõtmistulemused"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Jälgi kõiki GNSS-i radu ja sagedusi ilma töötsüklita"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Kasutaja vahetamise silumine"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Kuva kasutaja vahetamisel üksikasjalik teave"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Luba taustategevuste käivitamine"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Lubab kõik taustategevuste käivitamised"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Kuva alati kokkujooksmise dialoog"</string>
diff --git a/tests/CarDeveloperOptions/res/values-eu-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-eu-nokeys/strings.xml
new file mode 100644
index 0000000..21c65fd
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-eu-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Kudeatu aplikazioak"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-eu/arrays.xml b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
new file mode 100644
index 0000000..03259f7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pazifikoa"</item>
+    <item msgid="7044520255415007865">"Guztiak"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundo"</item>
+    <item msgid="772029947136115322">"30 segundo"</item>
+    <item msgid="8743663928349474087">"1 minutu"</item>
+    <item msgid="1506508631223164814">"2 minutu"</item>
+    <item msgid="8664703938127907662">"5 minutu"</item>
+    <item msgid="5827960506924849753">"10 minutu"</item>
+    <item msgid="6677424950124253938">"30 minutu"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Berehala"</item>
+    <item msgid="2038544972632026612">"5 segundo"</item>
+    <item msgid="5558060663472279597">"15 segundo"</item>
+    <item msgid="45341168505452037">"30 segundo"</item>
+    <item msgid="227647485917789272">"1 minutu"</item>
+    <item msgid="3367011891231217504">"2 minutu"</item>
+    <item msgid="4376575879222393045">"5 minutu"</item>
+    <item msgid="811192536981678974">"10 minutu"</item>
+    <item msgid="7258394417241706272">"30 minutu"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Konektatuta"</item>
+    <item msgid="983792611851499732">"Gonbidatuta"</item>
+    <item msgid="5438273405428201793">"Ezin izan da egin"</item>
+    <item msgid="4646663015449312554">"Erabilgarri"</item>
+    <item msgid="3230556734162006146">"Urrutiegi"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutu"</item>
+    <item msgid="2759776603549270587">"5 minutu"</item>
+    <item msgid="167772676068860015">"1 ordu"</item>
+    <item msgid="5985477119043628504">"Ez gainditu inoiz denbora-muga"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Erabili sistemaren balio lehenetsia: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Azken 30 egunak"</item>
+    <item msgid="3211287705232736964">"Erabilera-zikloa…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Erabilera-denbora"</item>
+    <item msgid="2784401352592276015">"Erabilitako azken aldia"</item>
+    <item msgid="249854287216326349">"Aplikazioaren izena"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Bat ere ez"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Bat ere ez"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Bat ere ez"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Bat ere ez"</item>
+    <item msgid="1464741437353223198">"Eskuliburua"</item>
+    <item msgid="5793600062487886090">"Proxy-konfigurazio auto."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Bat ere ez"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP edo CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Zehaztugabea"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Bat ere ez"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Gailuaren barneko memoria"</item>
+    <item msgid="3186681694079967527">"SD txartel aldagarria"</item>
+    <item msgid="6902033473986647035">"Utzi sistemari erabakitzen"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Kokapena"</item>
+    <item msgid="6842381562497597649">"Pertsonalak"</item>
+    <item msgid="3966700236695683444">"Mezuak"</item>
+    <item msgid="8563996233342430477">"Multimedia-edukia"</item>
+    <item msgid="5323851085993963783">"Gailua"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"gutxi gorabeherako kokapena"</item>
+    <item msgid="1830619568689922920">"kokapen zehatza"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"dardara"</item>
+    <item msgid="8632513128515114092">"irakurri kontaktuak"</item>
+    <item msgid="3741042113569620272">"aldatu kontaktuak"</item>
+    <item msgid="4204420969709009931">"irakurri deien erregistroa"</item>
+    <item msgid="2260380357119423209">"aldatu deien erregistroa"</item>
+    <item msgid="6550710385014530934">"irakurri egutegia"</item>
+    <item msgid="3575906174264853951">"aldatu egutegia"</item>
+    <item msgid="4319843242568057174">"Wi-Fi sareak bilatzea"</item>
+    <item msgid="2981791890467303819">"jakinarazpena"</item>
+    <item msgid="6617825156152476692">"sare mugikorrak bilatzea"</item>
+    <item msgid="8865260890611559753">"deitu telefonora"</item>
+    <item msgid="3254999273961542982">"irakurri SMS mezuak"</item>
+    <item msgid="7711446453028825171">"idatzi SMS mezuak"</item>
+    <item msgid="6123238544099198034">"jaso SMS mezuak"</item>
+    <item msgid="838342167431596036">"jaso larrialdiko SMS mezuak"</item>
+    <item msgid="8554432731560956686">"jaso MMS mezuak"</item>
+    <item msgid="7464863464299515059">"jaso WAP push jakinarazpenak"</item>
+    <item msgid="310463075729606765">"bidali SMS mezuak"</item>
+    <item msgid="7338021933527689514">"irakurri ICC SMS mezuak"</item>
+    <item msgid="6130369335466613036">"idatzi ICC SMS mezuak"</item>
+    <item msgid="6536865581421670942">"aldatu ezarpenak"</item>
+    <item msgid="4547203129183558973">"marraztu gainean"</item>
+    <item msgid="9080347512916542840">"atzitu jakinarazpenak"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"grabatu audioa"</item>
+    <item msgid="9182794235292595296">"erreproduzitu audioa"</item>
+    <item msgid="8760743229597702019">"irakurri arbela"</item>
+    <item msgid="2266923698240538544">"aldatu arbela"</item>
+    <item msgid="1801619438618539275">"multimedia-botoiak"</item>
+    <item msgid="31588119965784465">"audio-fokuratzea"</item>
+    <item msgid="7565226799008076833">"bolumen nagusia"</item>
+    <item msgid="5420704980305018295">"ahotsaren bolumena"</item>
+    <item msgid="5797363115508970204">"tonuaren bolumena"</item>
+    <item msgid="8233154098550715999">"multimedia-elementuen bolumena"</item>
+    <item msgid="5196715605078153950">"alarmaren bolumena"</item>
+    <item msgid="394030698764284577">"jakinarazpenen bolumena"</item>
+    <item msgid="8952898972491680178">"Bluetooth bidezko audioaren bolumena"</item>
+    <item msgid="8506227454543690851">"eduki aktibo"</item>
+    <item msgid="1108160036049727420">"kontrolatu kokapena"</item>
+    <item msgid="1496205959751719491">"egin potentzia handiko kokapen-kontrola"</item>
+    <item msgid="3776296279910987380">"lortu erabilera-estatistikak"</item>
+    <item msgid="8827100324471975602">"aktibatu edo desaktibatu mikrofonoa"</item>
+    <item msgid="6880736730520126864">"erakutsi leiho gainerakorra"</item>
+    <item msgid="4933375960222609935">"proiektatu multimedia-edukia"</item>
+    <item msgid="8357907018938895462">"aktibatu VPN konexioa"</item>
+    <item msgid="8143812849911310973">"idatzi horma-paperean"</item>
+    <item msgid="6266277260961066535">"lagundu egiturarekin"</item>
+    <item msgid="7715498149883482300">"lagundu pantaila-argazkiarekin"</item>
+    <item msgid="4046679376726313293">"irakurri telefonoaren egoera"</item>
+    <item msgid="6329507266039719587">"gehitu erantzungailua"</item>
+    <item msgid="7692440726415391408">"erabili SIP deiak"</item>
+    <item msgid="8572453398128326267">"prozesatu egindako deia"</item>
+    <item msgid="7775674394089376306">"hatz-marka"</item>
+    <item msgid="3182815133441738779">"gorputz-sentsoreak"</item>
+    <item msgid="2793100005496829513">"irakurri sare mugikor bidezko igorpenak"</item>
+    <item msgid="2633626056029384366">"imitate kokapena"</item>
+    <item msgid="8356842191824684631">"irakurri memoria"</item>
+    <item msgid="5671906070163291500">"idatzi memorian"</item>
+    <item msgid="2791955098549340418">"aktibatu pantaila"</item>
+    <item msgid="5599435119609178367">"lortu kontuak"</item>
+    <item msgid="1165623660533024666">"exekutatu atzeko planoan"</item>
+    <item msgid="6423861043647911030">"erabilerraztasun-eginbideen bolumena"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Laburra"</item>
+    <item msgid="4816511817309094890">"Ertaina"</item>
+    <item msgid="8305084671259331134">"Luzea"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Lehenetsia"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif kondentsatua"</item>
+    <item msgid="6529379119163117545">"Tarte bakarreko Sans-serif"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Tarte bakarreko serif"</item>
+    <item msgid="4448481989108928248">"Arrunta"</item>
+    <item msgid="4627069151979553527">"Etzana"</item>
+    <item msgid="6896773537705206194">"Maiuskula txikiak"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Lehenetsia"</item>
+    <item msgid="6488643537808152001">"Bat ere ez"</item>
+    <item msgid="552332815156010137">"Ingerada"</item>
+    <item msgid="7187891159463789272">"Itzal paraleloa"</item>
+    <item msgid="8019330250538856521">"Goratua"</item>
+    <item msgid="8987385315647049787">"Beheratua"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"% 25"</item>
+    <item msgid="4665048002584838262">"% 50"</item>
+    <item msgid="1874668269931014581">"% 75"</item>
+    <item msgid="6462911487571123954">"% 100"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPNa aurrez partekatutako gakoekin"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPNa ziurtagiriekin"</item>
+    <item msgid="312397853907741968">"L2TP/IPSec VPNa aurrez partekatutako gakoekin eta Xauth autentifikazioarekin"</item>
+    <item msgid="3319427315593649917">"L2TP/IPSec VPNa ziurtagiriekin eta Xauth autentifikazioarekin"</item>
+    <item msgid="8258927774145391041">"L2TP/IPSec VPNa ziurtagiriekin eta autentifikazio hibridoarekin"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Bat ere ez"</item>
+    <item msgid="1157046369795346308">"Eskuliburua"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Galdetu"</item>
+    <item msgid="7718817231348607934">"Ukatu beti"</item>
+    <item msgid="8184570120217958741">"Eman baimena beti"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Etengabea"</item>
+    <item msgid="167418068739176448">"Jarduera nagusia"</item>
+    <item msgid="4760813290195199773">"Garrantzitsua (aurreko planokoa)"</item>
+    <item msgid="2328684826817647595">"Garrantzitsua (atzeko planokoa)"</item>
+    <item msgid="7746406490652867365">"Babeskopiak"</item>
+    <item msgid="5597404364389196754">"Handia"</item>
+    <item msgid="1290888779300174556">"Zerbitzua (abian)"</item>
+    <item msgid="7241098542073939046">"Zerbitzua (berrabiarazten)"</item>
+    <item msgid="6610439017684111046">"Hargailua"</item>
+    <item msgid="7367606086319921117">"Hasiera"</item>
+    <item msgid="3344660712396741826">"Azken jarduera"</item>
+    <item msgid="5006559348883303865">"Cachean gordetakoa (jarduera)"</item>
+    <item msgid="8633480732468137525">"Cachean gordetakoa (jardueren bezeroa)"</item>
+    <item msgid="6248998242443333892">"Cachean gordetakoa (hutsik)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Anila"</item>
+    <item msgid="3228505970082457852">"Urdina"</item>
+    <item msgid="6590260735734795647">"Indigoa"</item>
+    <item msgid="3521763377357218577">"Morea"</item>
+    <item msgid="5932337981182999919">"Arrosa"</item>
+    <item msgid="5642914536624000094">"Gorria"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 egunetik gorakoak"</item>
+    <item msgid="8699273238891265610">"60 egunetik gorakoak"</item>
+    <item msgid="8346279419423837266">"90 egunetik gorakoak"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Hauteman automatikoki"</item>
+    <item msgid="773943026484148895">"Tratatu sare neurtu gisa"</item>
+    <item msgid="1008268820118852416">"Tratatu neurtu gabeko sare gisa"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Erabili ausaz aukeratutako MAC helbidea (lehenetsia)"</item>
+    <item msgid="214234417308375326">"Erabili gailuaren MAC helbidea"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ez"</item>
+    <item msgid="1930581185557754880">"Bai"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Iluna"</item>
+    <item msgid="5079453644557603349">"Argia"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desaktibatuta"</item>
+    <item msgid="4072198137051566919">"Arazketa"</item>
+    <item msgid="2473005316958868509">"Xehatua"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Etxekoak soilik"</item>
+    <item msgid="1161026694891024702">"Automatikoa"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA hobetsita"</item>
+    <item msgid="7581481130337402578">"GSM soilik"</item>
+    <item msgid="8579197487913425819">"WCDMA soilik"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatikoa"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatikoa"</item>
+    <item msgid="4219607161971472471">"EvDo gabeko CDMA"</item>
+    <item msgid="7278975240951052041">"EvDo soilik"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Orokorrak"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA soilik"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Orokorrak"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-eu/strings.xml b/tests/CarDeveloperOptions/res/values-eu/strings.xml
index ac9931b..f385ddf 100644
--- a/tests/CarDeveloperOptions/res/values-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/strings.xml
@@ -88,19 +88,19 @@
     <string name="font_size_preview_text_headline" msgid="8038650525913995091">"Testu-lagina"</string>
     <string name="font_size_preview_text_title" msgid="2593520249400910305">"Ozeko azti miragarria"</string>
     <string name="font_size_preview_text_subtitle" msgid="6106782964143379331">"11. kapitulua: Esmeraldazko Oz hiri harrigarria"</string>
-    <string name="font_size_preview_text_body" msgid="6803085337474390845">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela antzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
+    <string name="font_size_preview_text_body" msgid="6803085337474390845">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela atzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
     <string name="font_size_save" msgid="8652044574655753921">"Ados"</string>
-    <string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"USB memoria"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"USB bidezko memoria"</string>
     <string name="sdcard_setting" product="default" msgid="8398782065765523178">"SD txartela"</string>
     <string name="bluetooth" msgid="1564520421786841227">"Bluetooth-a"</string>
-    <string name="bluetooth_is_discoverable" msgid="6748888489356326898">"Inguruko Bluetooth gailu guztietarako ikusgai (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="6835934878803488274">"Inguruko Bluetooth gailu guztietarako ikusgai"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9134284066024557293">"Ez da beste Bluetooth gailuetarako ikusgai"</string>
+    <string name="bluetooth_is_discoverable" msgid="6748888489356326898">"Inguruko Bluetooth bidezko gailuetarako ikusgai (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="6835934878803488274">"Inguruko Bluetooth bidezko gailuetarako ikusgai"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9134284066024557293">"Bluetooth bidezko beste gailuetarako ikusgaitz"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="3830247336229883519">"Bikotetutako gailuetarako soilik ikusgai"</string>
     <string name="bluetooth_visibility_timeout" msgid="4804679276398564496">"Ikusgaitasunaren denbora-muga gainditu da"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="1600385868298081015">"Blokeatu ahots bidezko markatzea"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="5005776616112427980">"Galarazi Bluetooth telefonoa erabiltzea pantaila blokeatuta dagoenean"</string>
-    <string name="bluetooth_devices" msgid="4143880830505625666">"Bluetooth gailuak"</string>
+    <string name="bluetooth_devices" msgid="4143880830505625666">"Bluetooth bidezko gailuak"</string>
     <string name="bluetooth_device_name" msgid="3682016026866302981">"Gailuaren izena"</string>
     <string name="bluetooth_device_details" msgid="2500840679106321361">"Gailuaren ezarpenak"</string>
     <string name="bluetooth_profile_details" msgid="1785505059738682493">"Profilaren ezarpenak"</string>
@@ -113,9 +113,9 @@
     <string name="bluetooth_disconnect_all_profiles" product="tablet" msgid="7322773998151831579">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailutik deskonektatuko da tableta."</string>
     <string name="bluetooth_disconnect_all_profiles" product="device" msgid="4707569949253450208">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailutik deskonektatuko da gailua."</string>
     <string name="bluetooth_disconnect_dialog_ok" msgid="4183522987246110145">"Deskonektatu"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"Ez daukazu Bluetooth ezarpenak aldatzeko baimenik."</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="3616298363281495777">"Ez daukazu Bluetooth-aren ezarpenak aldatzeko baimenik."</string>
     <string name="bluetooth_pairing_pref_title" msgid="2904954138013884029">"Parekatu gailu batekin"</string>
-    <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"Bluetooth ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
+    <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"Bluetooth-aren ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"Telefonoaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6033609611245782463">"Tabletaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="device" msgid="7639919867088358038">"Gailuaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
@@ -123,7 +123,7 @@
     <string name="bluetooth_broadcasting" msgid="8926408584599563760">"Igorpena"</string>
     <string name="bluetooth_device" msgid="3170974107364990008">"Izenik gabeko Bluetooth bidezko gailua"</string>
     <string name="progress_scanning" msgid="633923400401041181">"Bilatzen"</string>
-    <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"Ez da Bluetooth gailurik aurkitu inguruan."</string>
+    <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"Bluetooth bidezko gailurik ez inguruan."</string>
     <string name="bluetooth_notif_ticker" msgid="8398481099943141819">"Bluetooth bidez parekatzeko eskaera"</string>
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"Bikotetzeko eskaera"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatzeko, sakatu hau."</string>
@@ -134,22 +134,22 @@
     <string name="bluetooth_ask_disablement" msgid="7125319551097350783">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa desaktibatu nahi du"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="6105893027185475233">"Aplikazio batek Bluetooth konexioa aktibatu nahi du"</string>
     <string name="bluetooth_ask_disablement_no_name" msgid="8648888502291681310">"Aplikazio batek Bluetooth konexioa desaktibatu nahi du"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="6871595755186170115">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="3388041479101348095">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="1472358802231150345">"Aplikazio batek tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="6195796094297507404">"Aplikazio batek telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="2702942027812132427">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7796723473397303412">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="5961921359655434504">"Aplikazio batek tableta beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="3585910858758443872">"Aplikazio batek telefonoa beste Bluetooth gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="6871595755186170115">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="3388041479101348095">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="1472358802231150345">"Aplikazio batek tableta Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="6195796094297507404">"Aplikazio batek telefonoa Bluetooth bidezko beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="2702942027812132427">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak tableta beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7796723473397303412">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak telefonoa beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="5961921359655434504">"Aplikazio batek tableta beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="3585910858758443872">"Aplikazio batek telefonoa beste Bluetooth bidezko gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5676466923424941153">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="507088376226791063">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="1164681893121736219">"Aplikazio batek Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="2542247690119921188">"Aplikazio batek Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7118362102769177771">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="2577488464813970727">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="7083038132794842691">"Aplikazio batek Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="3541668604020109525">"Aplikazio batek Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7118362102769177771">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="2577488464813970727">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="7083038132794842691">"Aplikazio batek Bluetooth konexioa aktibatu eta tableta beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="3541668604020109525">"Aplikazio batek Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth-aren ezarpenetan alda dezakezu hori geroago."</string>
     <string name="bluetooth_turning_on" msgid="6935183036449748493">"Bluetooth-a aktibatzen…"</string>
     <string name="bluetooth_turning_off" msgid="9214026723789756620">"Bluetooth-a desaktibatzen…"</string>
     <string name="bluetooth_connection_permission_request" msgid="2382506002340643398">"Bluetooth bidez konektatzeko eskaera"</string>
@@ -167,9 +167,9 @@
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"Aktibatu Bluetooth konexioa beste gailu batzuetara konektatzeko."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"Zure gailuak"</string>
     <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"Parekatu gailu batekin"</string>
-    <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Baimendu tabletari inguruko Bluetooth gailuekin komunikatzea"</string>
-    <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Baimendu gailuari inguruko Bluetooth gailuekin komunikatzea"</string>
-    <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Baimendu telefonoari inguruko Bluetooth gailuekin komunikatzea"</string>
+    <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"Baimendu tabletari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
+    <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"Eman gailuari inguruko Bluetooth bidezko gailuekin komunikatzeko baimena"</string>
+    <string name="bluetooth_pref_summary" product="default" msgid="863659221858781186">"Baimendu telefonoari inguruko Bluetooth bidezko gailuekin komunikatzea"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="293429878480958234">"Desgaitu Bluetooth A2DP hardwarea deskargatzeko aukera"</string>
     <string name="bluetooth_disable_a2dp_hw_offload_dialog_title" msgid="7362106962085861626">"Gailua berrabiarazi?"</string>
     <string name="bluetooth_disable_a2dp_hw_offload_dialog_message" msgid="4837282201316413412">"Ezarpen hau aldatzeko, gailua berrabiarazi egin behar duzu."</string>
@@ -250,17 +250,17 @@
     <string name="sdcard_changes_instructions" msgid="4138217393448114001">"Aldaketek USB kablea berriro konektatzean izango dute eragina."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="7486030250999007641">"Gaitu USB bidezko biltegiratze masiboa"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="6461741874400909157">"Byteak, guztira:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="5419085128792417589">"Ez da USB memoria muntatu."</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="5419085128792417589">"Ez da muntatu USB memoria."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="5831286239151349794">"Ez dago SD txartelik."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="2392868635606041278">"Byte erabilgarriak:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="5888349723543445382">"USB memoria bilt. masibo gisa."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="5888349723543445382">"USB bidezko memoria bilt. masibo gisa."</string>
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="637014061735266364">"SD txartela biltegiratze masiboko gailu gisa erabiltzen ari da."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1489916516292644696">"Segurua da USB bidezko memoria kentzea."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="6250598657624241686">"Segurtasunez ken daiteke SD txartela."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="4694941967864756404">"USB mem. erabili bitartean kendu da"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="4694941967864756404">"Abian zela kendu da USB bidezko memoria"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="2079348895479890677">"SD txart. erabili bitartean kendu da"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="1254929038284900156">"Erabilitako byteak:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="4807897851513791634">"USB memorian bilatzen…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="4807897851513791634">"USB bidezko memorian bilatzen…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="67933353112027726">"SD txartelean bilatzen…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="7959964366461613091">"USBa irakurtzeko muntatu da."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="8854112253788893415">"SD txartela irakurtzeko soilik muntatu da."</string>
@@ -287,7 +287,7 @@
     <string name="display_label" msgid="7638908513729850802">"Pantaila"</string>
     <string name="phone_info_label" product="tablet" msgid="7700004946924618112">"Tabletaren informazioa"</string>
     <string name="phone_info_label" product="default" msgid="2006702119092932148">"Telefonoaren informazioa"</string>
-    <string name="sd_card_settings_label" product="nosdcard" msgid="3433188145440984933">"USB memoria"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="3433188145440984933">"USB bidezko memoria"</string>
     <string name="sd_card_settings_label" product="default" msgid="1074813865245983607">"SD txartela"</string>
     <string name="proxy_settings_label" msgid="7219106162267925123">"Proxy-ezarpenak"</string>
     <string name="cancel" msgid="2582602392048772404">"Utzi"</string>
@@ -312,7 +312,7 @@
     <string name="roaming" msgid="8860308342135146004">"Ibiltaritza"</string>
     <string name="roaming_enable" msgid="2108142024297441116">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
     <string name="roaming_disable" msgid="1915440242079953809">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
-    <string name="roaming_reenable_message" msgid="8388505868655113258">"Datuen konexioa galdu duzu tokiko saretik irten zarelako ibiltaritza desaktibatuta duzula."</string>
+    <string name="roaming_reenable_message" msgid="8388505868655113258">"Datuen konexioa galdu duzu tokiko saretik irten zarelako ibiltaritza desaktibatuta daukazula."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"Aktibatu"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"Baliteke kostu handiak ordaindu behar izatea."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"Ibiltaritzako datuak baimentzen badituzu, baliteke ibiltaritza-kostu handiak ordaindu behar izatea!\n\nEzarpenak tableta honen erabiltzaile guztiei eragiten die."</string>
@@ -325,7 +325,7 @@
     <string name="date_and_time_settings_summary" msgid="4617979434474713417">"Ezarri data, ordua, ordu-zona eta formatuak"</string>
     <string name="date_time_auto" msgid="2679132152303750218">"Erabili sareak emandako ordua"</string>
     <string name="zone_auto_title" msgid="5500880975376882488">"Erabili sareak emandako ordu-zona"</string>
-    <string name="date_time_24hour_auto" msgid="7499659679134962547">"Erabili eskualdeko ezarpen lehenetsiak"</string>
+    <string name="date_time_24hour_auto" msgid="7499659679134962547">"Erabili lurraldeko ezarpen lehenetsiak"</string>
     <string name="date_time_24hour_title" msgid="6209923858891621283">"24 orduko formatua"</string>
     <string name="date_time_24hour" msgid="1265706705061608742">"Erabili 24 orduko formatua"</string>
     <string name="date_time_set_time_title" msgid="7116850506333406367">"Ordua"</string>
@@ -363,7 +363,7 @@
     <string name="trust_lost_locks_screen_summary" msgid="2058567484625606803">"Gaitzen bada, gailua blokeatu egingo da azken fidagarritasun-agenteak fidagarritasuna galtzen duenean"</string>
     <string name="owner_info_settings_summary" msgid="4208702251226725583">"Bat ere ez"</string>
     <string name="owner_info_settings_status" msgid="8049975536717685126">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="2250029417257939706">"Adibidez, Jonen Android gailua."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2250029417257939706">"Adibidez, Jonen Android-eko gailua."</string>
     <string name="user_info_settings_title" msgid="1125111518759995748">"Erabiltzaile-info."</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="5204282771893683026">"Erakutsi profileko informazioa pantaila blokeatuan."</string>
     <string name="profile_info_settings_title" msgid="4855892878512562551">"Profileko informazioa"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Babestu tableta pantailaren blokeoarekin, inork ez dezan izan hura erabiltzeko aukerarik galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegi bidezko autentifikazioa konfiguratzeko. Sakatu Utzi eta, ondoren, ezarri PIN kode bat edo hautatu pantailaren beste blokeo-aukera bat."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Babestu gailua pantailaren blokeoarekin, inork ez dezan izan hura erabiltzeko aukerarik galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegi bidezko autentifikazioa konfiguratzeko. Sakatu Utzi eta, ondoren, ezarri PIN kode bat edo hautatu pantailaren beste blokeo-aukera bat."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Babestu telefonoa pantailaren blokeoarekin, inork ez dezan izan hura erabiltzeko aukerarik galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegi bidezko autentifikazioa konfiguratzeko. Sakatu Utzi eta, ondoren, ezarri PIN kode bat edo hautatu pantailaren beste blokeo-aukera bat."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PINaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Pasahitzaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ereduaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfiguratu pantailaren blokeoa"</string>
@@ -531,11 +530,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"Abisua: desblokeatzeko beste <xliff:g id="COUNT">^1</xliff:g> saiakera oker egiten badituzu, gailuko datu guztiak ezabatuko dira!"</string>
     <string name="crypt_keeper_enter_password" msgid="726933635335219421">"Idatzi pasahitza"</string>
     <string name="crypt_keeper_failed_title" msgid="1906382607060855782">"Ezin izan da enkriptatu"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Enkriptatzea eten da eta ezin da osatu. Ondorioz, ezin izango dituzu tabletako datuak atzitu.\n\nTableta erabiltzen jarraitzeko, jatorrizko datuak berrezarri behar dituzu. Datuak berrezarri ondoren tableta konfiguratzen duzunean, Google kontuan gordetako babeskopiaren datuak leheneratu ahal izango dituzu."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Enkriptatzea eten da eta ezin da osatu. Ondorioz, ezin izango dituzu telefonoko datuak atzitu.\n\nTelefonoa erabiltzen jarraitzeko, jatorrizko datuak berrezarri behar dituzu. Datuak berrezarri ondoren telefonoa konfiguratzen duzunean, Google kontuan gordetako babeskopien datuak leheneratu ahal izango dituzu."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Enkriptatzea eten da eta ezin da osatu. Ondorioz, ezin izango dituzu tabletako datuak atzitu.\n\nTableta erabiltzen jarraitzeko, jatorrizko datuak berrezarri behar dituzu. Datuak berrezarri ondoren tableta konfiguratzen duzunean, Google-ko kontuan gordetako babeskopiaren datuak leheneratu ahal izango dituzu."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Enkriptatzea eten da eta ezin da osatu. Ondorioz, ezin izango dituzu telefonoko datuak atzitu.\n\nTelefonoa erabiltzen jarraitzeko, jatorrizko datuak berrezarri behar dituzu. Datuak berrezarri ondoren telefonoa konfiguratzen duzunean, Google-ko kontuan gordetako babeskopien datuak leheneratu ahal izango dituzu."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="6561535293845985713">"Ezin izan da desenkriptatu"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTableta erabiltzen jarraitzeko, jatorrizko datuak berrezarri beharko dituzu. Berrezarri ondoren, tableta konfiguratzen duzunean, Google kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTelefonoa erabiltzen jarraitzeko, jatorrizko datuak berrezarri beharko dituzu. Berrezarri ondoren, telefonoa konfiguratzen duzunean, Google kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTableta erabiltzen jarraitzeko, jatorrizko datuak berrezarri beharko dituzu. Berrezarri ondoren, tableta konfiguratzen duzunean, Google-ko kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Idatzi duzun pasahitza zuzena da, baina datuak hondatuta daude. \n\nTelefonoa erabiltzen jarraitzeko, jatorrizko datuak berrezarri beharko dituzu. Berrezarri ondoren, telefonoa konfiguratzen duzunean, Google-ko kontuan egindako babeskopiak leheneratu ahal izango dituzu."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"Aldatu idazketa-metodoa"</string>
     <string name="suggested_lock_settings_title" msgid="1518155558803371661">"Babestu telefonoa"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"Ezarri pantailaren blokeoa tableta babesteko"</string>
@@ -762,11 +761,11 @@
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Desparekatu"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Deskonektatu eta desparekatu"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Aukerak…"</string>
-    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Ezarpen aurreratuak"</string>
+    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Aurreratuak"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Bluetooth ezarpen aurreratuak"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Bluetooth aktibatuta badago, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Bluetooth konexioa aktibatuta dagoenean, inguruko Bluetooth gailuekin komunika daiteke gailua.\n\nGailuaren erabilera hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Besteak beste, kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke. Aukera hori aldatzeko, joan "<annotation id="link">"gailuak bilatzeko ezarpenetara"</annotation>"."</string>
-    <string name="ble_scan_notify_text" msgid="6290170236546386932">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Bluetooth-a aktibatuta badago, inguruko Bluetooth bidezko gailuekin komunika daiteke gailua."</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Bluetooth-a aktibatuta badago, inguruko Bluetooth bidezko gailuekin komunika daiteke gailua.\n\nGailuaren erabilera hobetzeko, aplikazioek eta zerbitzuek wifi-sareak bilatzen jarraituko dute, baita wifi-konexioa desaktibatuta dagoenean ere. Besteak beste, kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke. Aukera hori aldatzeko, joan "<annotation id="link">"gailuak bilatzeko ezarpenetara"</annotation>"."</string>
+    <string name="ble_scan_notify_text" msgid="6290170236546386932">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth bidezko gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"Ezin izan da konektatu. Saiatu berriro."</string>
     <string name="device_details_title" msgid="726517818032923222">"Gailuaren xehetasunak"</string>
     <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Gailuaren Bluetooth helbidea: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -839,7 +838,7 @@
     <string name="wifi_settings_category" msgid="9094716747565527901">"Wi-Fi ezarpenak"</string>
     <string name="wifi_settings_title" msgid="5265554991622344805">"Wifia"</string>
     <string name="wifi_settings_summary" msgid="7117267255799892820">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
-    <string name="wifi_select_network" msgid="2541598480767312831">"Hautatu Wi-Fi sarea"</string>
+    <string name="wifi_select_network" msgid="2541598480767312831">"Hautatu wifi-sarea"</string>
     <string name="wifi_starting" msgid="1299466156783469023">"Wi-Fi konexioa aktibatzen…"</string>
     <string name="wifi_stopping" msgid="413711069039939520">"Wi-Fia desaktibatzen…"</string>
     <string name="wifi_error" msgid="5605801874484465557">"Errorea"</string>
@@ -881,7 +880,7 @@
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"Aukera gehiago"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"Bilatu"</string>
-    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Ezarpen aurreratuak"</string>
+    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Aurreratuak"</string>
     <string name="wifi_menu_configure" msgid="52192491120701266">"Konfiguratu"</string>
     <string name="wifi_menu_connect" msgid="3984327567173931219">"Konektatu sarera"</string>
     <string name="wifi_menu_remember" msgid="717257200269700641">"Gogoratu sarea"</string>
@@ -889,7 +888,7 @@
     <string name="wifi_menu_modify" msgid="4080178040721021101">"Aldatu sarea"</string>
     <string name="wifi_empty_list_wifi_off" msgid="272877164691346240">"Sare erabilgarriak ikusteko, aktibatu wifi-konexioa."</string>
     <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"Wi-Fi sareak bilatzen…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"Ez duzu Wi-Fi sarea aldatzeko baimenik."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"Ez duzu wifi-sarea aldatzeko baimenik."</string>
     <string name="wifi_more" msgid="3538241640407382185">"Gehiago"</string>
     <string name="wifi_setup_wps" msgid="6730131677695521321">"Konf. automatikoa (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Wifi-sareen bilaketa aktibatu nahi al duzu?"</string>
@@ -929,7 +928,7 @@
     <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5,0 GHz-ko banda hobetsia"</string>
     <string name="wifi_ap_2G" msgid="5793110086517338494">"2,4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4584892544393675403">"5,0 GHz"</string>
-    <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"Aukeratu gutxienez banda bat Wi-Fi sare publikorako:"</string>
+    <string name="wifi_ap_band_select_one" msgid="4409754936554360355">"Aukeratu gutxienez banda bat wifi-sare publikorako:"</string>
     <string name="wifi_ip_settings" msgid="4636102290236116946">"IP ezarpenak"</string>
     <string name="wifi_privacy_settings" msgid="4462092795794247809">"Pribatutasuna"</string>
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="2411375348287064283">"Ausaz aukeratutako MACa"</string>
@@ -959,7 +958,7 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="2540529164687476827">"Gailu honekin wifi-konexioa partekatzen…"</string>
     <string name="wifi_dpp_connecting" msgid="4229290407210299897">"Konektatzen…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="847987212473038179">"Partekatu sare publikoa"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="3910665850075275963">"Egiaztatu zu zarela"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="3910665850075275963">"Egiaztatu zeu zarela"</string>
     <string name="wifi_dpp_wifi_password" msgid="8007558344032612455">"Wifi-sarearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="6172326289042241924">"Sare publikoaren pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_add_device" msgid="1347056725253936358">"Gehitu gailu bat"</string>
@@ -989,7 +988,7 @@
     <string name="no_internet_access_text" msgid="7093326244145734504">"Sare hau ezin da konektatu Internetera. Konektatuta jarraitu nahi duzu?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"Baliteke aplikazio eta zerbitzu batzuk ez funtzionatzea konexio mugatua dela eta. Hala ere erabili?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"Ez galdetu berriro sarea hau bada"</string>
-    <string name="lost_internet_access_title" msgid="1061916948695946130">"Wi-Fi sarea ez dago Internetera konektatuta"</string>
+    <string name="lost_internet_access_title" msgid="1061916948695946130">"Wifi-sarea ez dago Internetera konektatuta"</string>
     <string name="lost_internet_access_text" msgid="8962010031520731813">"Sare mugikorra erabil dezakezu Wi-Fi sareak konexio txarra badu. Agian datuen erabilera ordaindu beharko duzu."</string>
     <string name="lost_internet_access_switch" msgid="9218006455779873700">"Aldatu datu-konexiora"</string>
     <string name="lost_internet_access_cancel" msgid="6577871064062518744">"Jarraitu Wi‑Fi konexioa erabiltzen"</string>
@@ -1066,15 +1065,15 @@
     <string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sarera konekta daitezke beste gailuak"</string>
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"Sare publikoaren pasahitza"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Sarbide-puntuaren banda"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Erabili sare publikoa beste gailuentzako Wi-Fi sare bat sortzeko. Sare publikoen bidez, Interneteko konexioa ematen da datu-konexioa erabilita. Baliteke datu-konexioa erabiltzeagatiko kostu gehigarriak ordaindu behar izatea."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Erabili sare publikoa beste gailuentzako wifi-sare bat sortzeko. Sare publikoen bidez, Interneteko konexioa ematen da datu-konexioa erabilita. Baliteke datu-konexioa erabiltzeagatiko kostu gehigarriak ordaindu behar izatea."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Aplikazioek sare publikoak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Desaktibatu automatikoki sare publikoa"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Wifi-sare publikoa desaktibatu egingo da ez badago gailurik konektatuta"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"Sare publikoa aktibatzen…"</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"Sare publikoa desaktibatzen…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7534760116478734006">"Aktibatu da <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
-    <string name="wifi_tether_failed_subtext" msgid="3501001612207106">"Wi-Fi sare publiko eramangarriaren errorea gertatu da"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Konfiguratu Wi-Fi sare publikoa"</string>
+    <string name="wifi_tether_failed_subtext" msgid="3501001612207106">"wifi-sare publiko eramangarriaren errorea gertatu da"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Konfiguratu wifi-sare publikoa"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="1000003286253019522">"Wi‑Fi publikoaren konfigurazioa"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="2303120188509955656">"AndroidAP WPA2 PSK sare publikoa"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="1722238925876152663">"AndroidSarePublikoa"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wifia"</item>
+    <item msgid="4421333712484542489">"Datu-konexioa"</item>
+    <item msgid="6007360612667098926">"Wifi-sarea soilik"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1168,7 +1170,7 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"Naturalak"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"Nabarmenduak"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"Saturatuak"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Doigarria"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Doigarriak"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"Erabili kolore errealistak soilik"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"Doitu kolore bizi eta errealisten artean"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"Aldatu orientazioa automatikoki tableta biratzean"</string>
@@ -1202,7 +1204,7 @@
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Aktibatuta / Pantaila ez da itzaliko hari begira zauden bitartean"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Desaktibatuta"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"Pantaila itzaltzea eragozten du hari begira zauden bitartean."</string>
-    <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Pantaila kontzienteak aurreko kamera erabiltzen du inor pantailari begira dagoen jakiteko. Gailuko eginbidea da, eta irudiak ez dira inoiz gordetzen, ez eta Google-ra bidaltzen ere."</string>
+    <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Pantaila kontzientea eginbideak aurreko kamera erabiltzen du inor pantailari begira dagoen jakiteko. Gailuko eginbidea da, eta irudiak ez dira inoiz gordetzen, ez eta Google-ra bidaltzen ere."</string>
     <string name="night_display_title" msgid="1305002424893349814">"Gaueko argia"</string>
     <string name="night_display_text" msgid="5330502493684652527">"Gaueko argiak tindu horikaraz janzten du pantaila. Horrela, ez zaizu horren nekagarria egingo argi gutxirekin pantailari begira egotea eta errazago hartuko duzu lo, gainera."</string>
     <string name="night_display_auto_mode_title" msgid="8493573087102481588">"Ordutegia"</string>
@@ -1258,7 +1260,7 @@
     <string name="doze_summary" msgid="6762274282827831706">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
     <string name="doze_always_on_title" msgid="8555184965031789941">"Beti aktibatuta"</string>
     <string name="doze_always_on_summary" msgid="7654436900436328950">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa. Bateria gehiago kontsumitzen du."</string>
-    <string name="title_font_size" msgid="5021464556860010851">"Letra-tipoaren tamaina"</string>
+    <string name="title_font_size" msgid="5021464556860010851">"Letra-tamaina"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"SIM txartelaren blokeo-ezarpenak"</string>
     <string name="sim_lock_settings_category" msgid="1126759898277681516">"SIM txartelaren blokeoa"</string>
@@ -1303,7 +1305,7 @@
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"Sistemaren eguneratzeak"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
     <string name="firmware_version" msgid="547095584029938749">"Android bertsioa"</string>
-    <string name="security_patch" msgid="483709031051932208">"Android segurtasunaren adabaki-maila"</string>
+    <string name="security_patch" msgid="483709031051932208">"Android-en segurtasunaren adabaki-maila"</string>
     <string name="model_info" msgid="1729765474260797594">"Modeloa"</string>
     <string name="model_summary" msgid="8781425868254352168">"Modeloa: %1$s"</string>
     <string name="hardware_info" msgid="174270144950621815">"Modeloa eta hardwarea"</string>
@@ -1322,7 +1324,7 @@
     <string name="storage_settings_for_app" msgid="3028887232073069965">"Memoria eta cachea"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"Memoria"</string>
     <string name="storage_settings_title" msgid="7348362600789024415">"Memoriaren ezarpenak"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"Desmuntatu USB memoria, ikusi erabilgarri dagoen memoria"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"Desmuntatu USB bidezko memoria; ikusi erabilgarri dagoen memoria"</string>
     <string name="storage_settings_summary" product="default" msgid="6233147555590816245">"Desmuntatu SD txartela, ikusi memoria erabilgarria"</string>
     <string name="imei_multi_sim" msgid="6462221220123699987">"IMEI zk. (%1$d. SIM zirrikitua)"</string>
     <string name="status_number" product="tablet" msgid="1594311542611046121">"MDN"</string>
@@ -1356,7 +1358,7 @@
     <string name="status_up_time" msgid="77128395333934087">"Berrabiarazi ondoren abian izandako denbora"</string>
     <string name="status_awake_time" msgid="1251959094010776954">"Aktibo egondako denbora"</string>
     <string name="internal_memory" msgid="8632841998435408869">"Barneko memoria"</string>
-    <string name="sd_memory" product="nosdcard" msgid="1377713983817298275">"USB memoria"</string>
+    <string name="sd_memory" product="nosdcard" msgid="1377713983817298275">"USB bidezko memoria"</string>
     <string name="sd_memory" product="default" msgid="8242711740477072757">"SD txartela"</string>
     <string name="memory_available" msgid="7135654170847536323">"Erabilgarri"</string>
     <string name="memory_available_read_only" msgid="9125440204248584531">"Erabilgarri (irakurtzeko soilik)"</string>
@@ -1371,9 +1373,9 @@
     <string name="memory_media_cache_usage" msgid="1307620682751377717">"Cachean gordetako datuak"</string>
     <string name="sd_eject" product="nosdcard" msgid="3016608823130472449">"Desmuntatu partekatutako memoria"</string>
     <string name="sd_eject" product="default" msgid="4943338855474925396">"Desmuntatu SD txartela"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="8571017212318899178">"Desmuntatu barneko USB memoria"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="8571017212318899178">"Desmuntatu USB bidezko barneko memoria"</string>
     <string name="sd_eject_summary" product="default" msgid="6862319750744376533">"Desmuntatu SD txartela, kentzeko prest egon dadin"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="6192416378231939330">"Sartu muntatu beharreko USB memoria"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="6192416378231939330">"Sartu muntatu beharreko USB bidezko memoria"</string>
     <string name="sd_insert_summary" product="default" msgid="2977039502204165858">"Sartu muntatu beharreko SD txartela"</string>
     <string name="sd_mount" product="nosdcard" msgid="5935852779173473289">"Muntatu USB memoria"</string>
     <string name="sd_mount" product="default" msgid="2909681528683834308">"Muntatu SD txartela"</string>
@@ -1399,7 +1401,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"Desmuntatzen"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"Desmuntatzea abian da"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"Memoria agortzen ari da"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"Baliteke sistemaren funtzio batzuk behar bezala ez funtzionatzea, esaterako, sinkronizazioa. Saiatu memorian tokia egiten elementu batzuk ezabatuta edo desainguratuta, adibidez, aplikazioak edo multimedia-edukia."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"Baliteke sistemaren funtzio batzuek behar bezala ez funtzionatzea; esaterako, sinkronizazioak. Memorian tokia egiteko, ezabatu elementu batzuk (adibidez, aplikazioak edo multimedia-edukia) edo ken iezaiezu aingura."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"Aldatu izena"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"Muntatu"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"Atera"</string>
@@ -1587,7 +1589,7 @@
     <string name="master_clear_desc_no_cancel_mobile_plan" msgid="6072668588881679461">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="2723272952715259307">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB bidezko memoria"</b>" ezabatu behar da."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="9003555775524798797">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"Ezabatu USB memoria"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="8989746770347525207">"Ezabatu USB bidezko memoria"</string>
     <string name="erase_external_storage" product="default" msgid="194249742376770215">"Ezabatu SD txartela"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="8020275102431496261">"Ezabatu USB bidezko barneko memoriako datu guztiak; adibidez, musika edo argazkiak"</string>
     <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
@@ -1786,12 +1788,12 @@
     <string name="install_applications_title" msgid="8164828577588659496">"Onartu iturburu guztiak"</string>
     <string name="recent_app_category_title" msgid="7688788038277126727">"Azkenaldian irekitako aplikazioak"</string>
     <string name="see_all_apps_title" msgid="6435061912110347474">"Ikusi <xliff:g id="COUNT">%1$d</xliff:g> aplikazioak"</string>
-    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zu zarela."</string>
-    <string name="install_all_warning" product="default" msgid="7445839116997296358">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zu zarela."</string>
-    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
+    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
+    <string name="install_all_warning" product="default" msgid="7445839116997296358">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
+    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Gaitu ezarpenen aukera gehiago"</string>
-    <string name="application_info_label" msgid="3886253474964599105">"Aplikazioen informazioa"</string>
+    <string name="application_info_label" msgid="3886253474964599105">"Aplikazioaren informazioa"</string>
     <string name="storage_label" msgid="1109537840103290384">"Memoria"</string>
     <string name="auto_launch_label" msgid="47089737922907379">"Ireki modu lehenetsian"</string>
     <string name="auto_launch_label_generic" msgid="7865828543459493308">"Balio lehenetsiak"</string>
@@ -1809,9 +1811,9 @@
     <string name="force_stop" msgid="9213858124674772386">"Behartu gelditzera"</string>
     <string name="total_size_label" msgid="3929917501176594692">"Guztira"</string>
     <string name="application_size_label" msgid="175357855490253032">"Aplikazioaren tamaina"</string>
-    <string name="external_code_size_label" msgid="3434421216268309411">"USB memoriaren aplikazioa"</string>
+    <string name="external_code_size_label" msgid="3434421216268309411">"USB bidezko memoriaren aplikazioa"</string>
     <string name="data_size_label" msgid="7790201846922671662">"Erabiltzaile-datuak"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="8004991551882573479">"USB memoriaren datuak"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="8004991551882573479">"USB bidezko memoriaren datuak"</string>
     <string name="external_data_size_label" product="default" msgid="1097584278225902734">"SD txartela"</string>
     <string name="uninstall_text" msgid="4859715815689705801">"Desinstalatu"</string>
     <string name="uninstall_all_users_text" msgid="2620518509352561416">"Desinstalatu erabiltzaile guztientzat"</string>
@@ -1925,7 +1927,7 @@
     <string name="service_manage" msgid="7045214643721276662">"Ezarpenak"</string>
     <string name="service_stop_description" msgid="4184180745938573707">"Zerbitzua bere aplikazioak hasi du. Gelditzen baduzu, agian aplikazioak huts egingo du."</string>
     <string name="heavy_weight_stop_description" msgid="7444148811046611463">"Ezin da aplikazioa modu seguruan gelditu. Geldituz gero, uneko lan batzuk gal ditzakezu."</string>
-    <string name="background_process_stop_description" msgid="8971810208873038109">"Aplikazio-prozesu zaharra da hau, baina geroago behar bada erabiltzeko ari da exekutatzen. Normalean ez dago hori gelditzeko arrazoirik."</string>
+    <string name="background_process_stop_description" msgid="8971810208873038109">"Aplikazio-prozesu hau zaharra da, baina abian da oraindik ere, badaezpada berriro behar bada. Normalean ez dago hura gelditzeko arrazoirik."</string>
     <string name="service_manage_description" msgid="8058123524402833082">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: beste norbait ari da erabiltzen. Zuk kontrolatzeko, saka ezazu Ezarpenak."</string>
     <string name="main_running_process_description" msgid="7733268956566861797">"Abian den prozesu nagusia."</string>
     <string name="process_service_in_use_description" msgid="2253782391122637651">"<xliff:g id="COMP_NAME">%1$s</xliff:g> zerbitzua abian da."</string>
@@ -2032,7 +2034,7 @@
     <string name="accessibility_settings_summary" msgid="5742379519336396561">"Pantaila-irakurgailuak, pantaila, interakzioak kontrolatzeko aukerak"</string>
     <string name="vision_settings_title" msgid="7315352351051423944">"Ikusmen-ezarpenak"</string>
     <string name="vision_settings_description" msgid="3476589459009287332">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
-    <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Aldatu letra-tipoaren tamaina"</string>
+    <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Aldatu letra-tamaina"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"Pantaila-irakurgailuak"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"Audioa eta pantailako testua"</string>
     <string name="display_category_title" msgid="545168481672250195">"Pantaila"</string>
@@ -2045,14 +2047,14 @@
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Sakatu pantailako elementuak eta zer diren entzungo duzu"</string>
     <string name="accessibility_captioning_title" msgid="5878371993023439642">"Azpitituluak"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Lupa"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Lupa aplikatzeko, sakatu hiru aldiz"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Lupa aplikatzeko, erabili botoia"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="1863831350878995600">"Lupa aplikatzeko, erabili botoia eta sakatu hiru aldiz"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Handitzeko, sakatu hiru aldiz"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Pantaila handitzeko, erabili botoia"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="1863831350878995600">"Handitzeko, erabili botoia eta sakatu hiru aldiz"</string>
     <string name="accessibility_preference_magnification_summary" msgid="753307741814376312">"Handitu pantaila"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Zooma aplikatzeko, sakatu hirutan"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Zooma aplikatzeko, sakatu botoi bat"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"Zooma aplikatzeko"</b>", sakatu pantaila bizkor hiru aldiz.\n"<ul><li>"Gora edo behera egiteko, arrastatu gutxienez bi hatz."</li>\n<li>"Zooma doitzeko, atximurkatu pantaila gutxienez bi hatzekin."</li></ul>\n\n<b>"Zooma une batez bakarrik aplikatzeko"</b>", sakatu pantaila bizkor hiru aldiz eta, hirugarren aldian, utzi hatza pantailan jarrita.\n"<ul><li>"Pantailan mugitzeko, arrastatu hatza."</li>\n<li>"Zooma aplikatzeari uzteko, altxatu hatza."</li></ul>\n\n"Zooma ezin da aplikatu ez teklatuan ez nabigazio-barran."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Lupa aktibatuta dagoenean, sakatu pantailaren behealdeko Erabilerraztasuna botoia lupa zuzenean aplikatzeko.\n\n"<b>"Zooma aplikatzeko"</b>", sakatu Erabilerraztasuna botoia eta sakatu pantailako edozein toki.\n"<ul><li>"Gora edo behera egiteko, arrastatu gutxienez bi hatz."</li>\n<li>"Zooma doitzeko, atximurkatu pantaila gutxienez bi hatzekin."</li></ul>\n\n<b>"Zooma une batez bakarrik aplikatzeko"</b>", sakatu Erabilerraztasuna botoia eta eduki sakatuta pantailako puntu bat.\n"<ul><li>"Pantailan mugitzeko, arrastatu hatza."</li>\n<li>"Zooma aplikatzeari uzteko, altxatu hatza."</li></ul>\n\n"Zooma ezin da aplikatu ez teklatuan ez nabigazio-barran."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Lupa aktibatuta dagoenean, sakatu pantailaren behealdeko Erabilerraztasuna botoia pantaila azkar handitzeko.\n\n"<b>"Zooma aplikatzeko"</b>", sakatu Erabilerraztasuna botoia eta sakatu pantailako edozein toki.\n"<ul><li>"Gora edo behera egiteko, arrastatu gutxienez bi hatz."</li>\n<li>"Zooma doitzeko, atximurkatu pantaila gutxienez bi hatzekin."</li></ul>\n\n<b>"Zooma une batez bakarrik aplikatzeko"</b>", sakatu Erabilerraztasuna botoia eta eduki sakatuta pantailako puntu bat.\n"<ul><li>"Pantailan mugitzeko, arrastatu hatza."</li>\n<li>"Zooma aplikatzeari uzteko, altxatu hatza."</li></ul>\n\n"Zooma ezin da aplikatu ez teklatuan ez nabigazio-barran."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Erabilerraztasuna botoia labur sakatuta \"<xliff:g id="SERVICE">%1$s</xliff:g>\" aukera aktibatzen da. Lupa aplikatzeko, eduki sakatuta Erabilerraztasuna botoia eta, ondoren, hautatu lupa."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Bolumen-teklen lasterbidea"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Lasterbideari esleitutako zerbitzua"</string>
@@ -2154,7 +2156,7 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Testuaren opakutasuna"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Ertzen kolorea"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Ertz mota"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Letra-tipoaren familia"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Letra-familia"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Azpitituluek itxura hau izango dute"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"Lehenetsia"</string>
@@ -2296,7 +2298,7 @@
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="469696766640020557">
       <item quantity="other">Aplikazio hauek ezin dira exekutatu atzeko planoan</item>
-      <item quantity="one">Aplikazio hau ezin da exekutatu atzeko planoan</item>
+      <item quantity="one">Aplikazio hau ezin da abiarazi atzeko planoan</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="3042021435866172168">
       <item quantity="other">%1$d aplikazio mugatu nahi dituzu?</item>
@@ -2368,7 +2370,7 @@
     <string name="usage_type_cpu_foreground" msgid="5496661858574622156">"PUZaren aurreko planoa"</string>
     <string name="usage_type_wake_lock" msgid="6729977238748413476">"Mantendu aktibo"</string>
     <string name="usage_type_gps" msgid="5914062195732419196">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="4192567991891907030">"Wi-Fia exekutatzen"</string>
+    <string name="usage_type_wifi_running" msgid="4192567991891907030">"Wifiaren erabilera"</string>
     <string name="usage_type_phone" product="tablet" msgid="4279605085824633501">"Tableta"</string>
     <string name="usage_type_phone" product="default" msgid="3901842461077646153">"Telefonoa"</string>
     <string name="usage_type_data_send" msgid="6339880867171142725">"Bidalitako pakete mugikorrak"</string>
@@ -2390,7 +2392,7 @@
     <string name="battery_action_app_settings" msgid="587998773852488539">"Aplikazioaren ezarpenak"</string>
     <string name="battery_action_display" msgid="4887913003634317465">"Pantailaren ezarpenak"</string>
     <string name="battery_action_wifi" msgid="7123520587925323824">"Wi‑Fi ezarpenak"</string>
-    <string name="battery_action_bluetooth" msgid="718594420017519807">"Bluetooth ezarpenak"</string>
+    <string name="battery_action_bluetooth" msgid="718594420017519807">"Bluetooth-aren ezarpenak"</string>
     <string name="battery_desc_voice" msgid="4731966028374974986">"Ahots-deiek erabilitako bateria"</string>
     <string name="battery_desc_standby" product="tablet" msgid="2941777996429933419">"Tableta inaktibo dagoenean erabilitako bateria"</string>
     <string name="battery_desc_standby" product="default" msgid="8889482616564520287">"Telefonoa inaktibo dagoenean erabilitako bateria"</string>
@@ -2402,7 +2404,7 @@
     <string name="battery_sugg_display" msgid="6366790848514389990">"Murriztu pantailaren distira edota pantailaren denbora-muga"</string>
     <string name="battery_desc_wifi" msgid="3497535902126253386">"Wi-Fiak erabilitako energia"</string>
     <string name="battery_sugg_wifi" msgid="3796329601134263039">"Desaktibatu Wi‑Fi konexioa erabiltzen ari ez denean edo erabilgarri ez dagoenean."</string>
-    <string name="battery_desc_bluetooth" msgid="3468061900485447679">"Bluetoothak erabilitako bateria"</string>
+    <string name="battery_desc_bluetooth" msgid="3468061900485447679">"Bluetooth bidezko konexioak erabilitako bateria"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"Desaktibatu Bluetooth-a erabiltzen ez duzunean."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"Saiatu beste Bluetooth bidezko gailu batera konektatzen."</string>
     <string name="battery_desc_apps" msgid="6826726880149226823">"Aplikazioak erabilitako bateria"</string>
@@ -2526,7 +2528,7 @@
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"Bistaratu CA fidagarrien ziurtagiriak"</string>
     <string name="user_credentials" msgid="8365731467650306757">"Erabiltzaile-kredentzialak"</string>
     <string name="user_credentials_summary" msgid="7350223899317423252">"Ikusi eta aldatu gordetako kredentzialak"</string>
-    <string name="advanced_security_title" msgid="286883005673855845">"Ezarpen aurreratuak"</string>
+    <string name="advanced_security_title" msgid="286883005673855845">"Aurreratuak"</string>
     <string name="credential_storage_type" msgid="2585337320206095255">"Biltegiratze mota"</string>
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"Hardwarean gordetakoa"</string>
     <string name="credential_storage_type_software" msgid="1335905150062717150">"Softwarean soilik"</string>
@@ -2545,8 +2547,8 @@
     <string name="backup_section_title" msgid="8177209731777904656">"Babeskopiak eta leheneratzea"</string>
     <string name="personal_data_section_title" msgid="9161854418510071558">"Datu pertsonalak"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Egin nire datuen babeskopia"</string>
-    <string name="backup_data_summary" msgid="555459891017933746">"Egin datuen, Wi-Fi pasahitzen eta beste ezarpenen babeskopia Google zerbitzarietan."</string>
-    <string name="backup_configure_account_title" msgid="1534734650559070294">"Babeskopien kontua"</string>
+    <string name="backup_data_summary" msgid="555459891017933746">"Egin datuen, wifi-sareen pasahitzen eta beste ezarpenen babeskopia Google-ren zerbitzarietan."</string>
+    <string name="backup_configure_account_title" msgid="1534734650559070294">"Babesk. gordetzeko kontua"</string>
     <string name="backup_data_management_title" msgid="6299288795610243508">"Kudeatu babeskopiak gordetzeko kontua"</string>
     <string name="include_app_data_title" msgid="6117211611131913293">"Sartu aplikazioetako datuak"</string>
     <string name="auto_restore_title" msgid="8367486774010915221">"Leheneratze automatikoa"</string>
@@ -2554,7 +2556,7 @@
     <string name="backup_inactive_title" msgid="5513496915638307750">"Babeskopia-zerbitzua ez dago aktibo"</string>
     <string name="backup_configure_account_default_summary" msgid="5718298066335006412">"Ez dago babeskopiak gordetzen dituen aplikaziorik"</string>
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
-    <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Wi-Fi pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
+    <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Wifi-sareen pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google-ren zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Gailuko datuen (adibidez, Wi-Fi pasahitzak eta deien historia) eta aplikazioetako datuen (besteak beste, ezarpenak eta aplikazioek gordetako fitxategiak) babeskopiak egiteari utzi nahi diozu eta urruneko zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_data_summary" msgid="406274198094268556">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzailearen ezarpenen arabera), eta kontuzkoak izan litezkeen datuak ere sar daitezke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"Gailua administratzeko aplikazioaren ezarpenak"</string>
@@ -2589,7 +2591,7 @@
     <string name="sync_active" msgid="1112604707180806364">"Sinkronizazioa aktibo"</string>
     <string name="account_sync_settings_title" msgid="3344538161552327748">"Sinkronizatu"</string>
     <string name="sync_is_failing" msgid="8284618104132302644">"Sinkronizazioak arazoak ditu. Laster egongo da berriro erabilgarri."</string>
-    <string name="add_account_label" msgid="4461298847239641874">"Gehitu kontua"</string>
+    <string name="add_account_label" msgid="4461298847239641874">"Gehitu kontu bat"</string>
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"Laneko profila ez dago oraindik erabilgarri"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"Laneko profila"</string>
     <string name="work_mode_on_summary" msgid="1682781113156323592">"Erakundeak kudeatzen du"</string>
@@ -2621,16 +2623,16 @@
     <string name="header_account_settings" msgid="8586173964125512219">"Kontuaren ezarpenak"</string>
     <string name="remove_account_label" msgid="5885425720323823387">"Kendu kontua"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Gehitu kontu bat"</string>
-    <string name="really_remove_account_title" msgid="4166512362915154319">"Kontua kendu?"</string>
+    <string name="really_remove_account_title" msgid="4166512362915154319">"Kontua kendu nahi duzu?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Kontua kentzen baduzu, bere mezu, kontaktu eta bestelako datu guztiak tabletatik ezabatuko dira!"</string>
     <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Kontua kentzen baduzu, bere mezu, kontaktu eta bestelako datu guztiak telefonotik ezabatuko dira!"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Kontua kentzen baduzu, bertako mezu, kontaktu eta bestelako datu guztiak ezabatuko dira gailutik!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Ezin da eskuz sinkronizatu"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Elementua ezin da unean desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
-    <string name="enter_password" msgid="2963496904625715235">"Android gailua abiarazteko, idatzi pasahitza"</string>
-    <string name="enter_pin" msgid="7140938268709546890">"Android gailua abiarazteko, idatzi PIN kodea"</string>
-    <string name="enter_pattern" msgid="1653841963422825336">"Android gailua abiarazteko, marraztu eredua"</string>
+    <string name="enter_password" msgid="2963496904625715235">"Android-eko gailua abiarazteko, idatzi pasahitza"</string>
+    <string name="enter_pin" msgid="7140938268709546890">"Android-eko gailua abiarazteko, idatzi PIN kodea"</string>
+    <string name="enter_pattern" msgid="1653841963422825336">"Android-eko gailua abiarazteko, marraztu eredua"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="4580105105385125467">"Eredu okerra"</string>
     <string name="cryptkeeper_wrong_password" msgid="1709534330303983166">"Pasahitz okerra"</string>
     <string name="cryptkeeper_wrong_pin" msgid="857757190077859245">"PIN okerra"</string>
@@ -2645,7 +2647,7 @@
     <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Datu-konexioa eta wifi-konexioa"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
     <string name="data_usage_app" msgid="4995297799363021198">"Aplikazioen erabilera"</string>
-    <string name="data_usage_app_info_label" msgid="5358288895158910477">"APLIKAZIOEN INFORMAZIOA"</string>
+    <string name="data_usage_app_info_label" msgid="5358288895158910477">"APLIKAZIOARI BURUZKO INFORMAZIOA"</string>
     <string name="data_usage_cellular_data" msgid="3509117353455285808">"Datu-konexioa"</string>
     <string name="data_usage_data_limit" msgid="4070740691087063670">"Ezarri datuen muga"</string>
     <string name="data_usage_cycle" msgid="1877235461828192940">"Datuen erabilera-zikloa"</string>
@@ -2697,8 +2699,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"Eginbide horren eraginez, baliteke atzeko planoko datuak beharrezko dituzten aplikazioek funtzionatzeari uztea, sare mugikorrak baino ez badaude erabilgarri.\n\n Datuak behar bezala erabiltzeko kontrol gehiago dituzu aplikazioaren barruko ezarpenetan."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"Atzeko planoko datuak murrizteko, datu-konexioarekin erabil daitezkeen datuak mugatu behar dituzu."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"Sinkronizazio automatikoa aktibatu?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"Kontuei sarean egiten dizkiezun aldaketa guztiak automatikoki kopiatuko dira tabletan.\n\nHorrez gain, baliteke kontu batzuek tabletan egiten dituzun aldaketak sarean kopiatzea. Google kontuek horrela funtzionatzen dute."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"Kontuei sarean egiten dizkiezun aldaketa guztiak automatikoki kopiatuko dira telefonoan.\n\nHorrez gain, baliteke kontu batzuek telefonoan egiten dituzun aldaketak sarean kopiatzea. Google kontuek horrela funtzionatzen dute."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"Kontuei sarean egiten dizkiezun aldaketa guztiak automatikoki kopiatuko dira tabletan.\n\nHorrez gain, baliteke kontu batzuek tabletan egiten dituzun aldaketak sarean kopiatzea. Google-ko kontuek horrela funtzionatzen dute."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="5004823486046340090">"Kontuei sarean egiten dizkiezun aldaketa guztiak automatikoki kopiatuko dira telefonoan.\n\nHorrez gain, baliteke kontu batzuek telefonoan egiten dituzun aldaketak sarean kopiatzea. Google-ko kontuek horrela funtzionatzen dute."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="7105334544291643305">"Sinkronizazio automatikoa desaktibatu?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4057984234450947964">"Datuak eta bateria aurrezten lagunduko dizu, baina kontu bakoitza eskuz sinkronizatu beharko duzu informazio berriena biltzeko. Gainera, ez duzu berritasunen jakinarazpenik jasoko."</string>
     <string name="data_usage_cycle_editor_title" msgid="4967309390043599889">"Erabilera-zikloa berrezartzeko data"</string>
@@ -2710,9 +2712,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="2000713577999830647">"Zehaztu duzun mugara iristean, tabletak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datuen erabilera tabletak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="943546278705619205">"Zehaztu duzun mugara iristean, telefonoak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datuen erabilera telefonoak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
     <string name="data_usage_restrict_background_title" msgid="3568746530413220844">"Atzeko planoko datuak mugatu?"</string>
-    <string name="data_usage_restrict_background" msgid="995811034744808575">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean.\n\nTabletako erabiltzaile guztiei eragingo die ezarpen honek."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko Wi-Fi sare batera konektatu ezean.\n\nTelefonoko erabiltzaile guztiei eragingo die ezarpen honek."</string>
+    <string name="data_usage_restrict_background" msgid="995811034744808575">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko wifi-sare batera konektatu ezean."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko wifi-sare batera konektatu ezean.\n\nTabletako erabiltzaile guztiei eragingo die ezarpen honek."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"Atzeko planoan datu-konexioa erabiltzeko aukera mugatzen baduzu, aplikazio eta zerbitzu batzuek ez dute funtzionatuko wifi-sare batera konektatu ezean.\n\nTelefonoko erabiltzaile guztiei eragingo die ezarpen honek."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"abisua"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"muga"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"Kendutako aplikazioak"</string>
@@ -3095,7 +3097,7 @@
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei, meid, min, prl bertsioa, imei sv"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"sarea, sare mugikorraren egoera, zerbitzuaren egoera, seinalearen indarra, sare mugikor mota, ibiltaritza, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"serie-zenbakia, hardwarearen bertsioa"</string>
-    <string name="keywords_android_version" msgid="4842749998088987740">"android segurtasunaren adabaki-maila, oinarri-bandaren bertsioa, kernelaren bertsioa"</string>
+    <string name="keywords_android_version" msgid="4842749998088987740">"android-en segurtasunaren adabaki-maila, oinarri-bandaren bertsioa, kernelaren bertsioa"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"gai, argi, modu, ilun"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"finantza-aplikazioa, SMSa, baimena"</string>
     <string name="keywords_systemui_theme" msgid="9150908170417305866">"gai iluna"</string>
@@ -3111,7 +3113,7 @@
     <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"ez molestatu, ordutegia, jakinarazpenak, blokeatu, isilik, dardara, inaktibo ezarri, lantokia, arreta, soinua, desaktibatu audioa, eguna, asteguna, asteburua, asteguneko gaua, gertaera"</string>
     <string name="keywords_screen_timeout" msgid="4328381362313993666">"pantaila, blokeatzeko denbora, denbora-muga, pantaila blokeatua"</string>
     <string name="keywords_storage_settings" msgid="6422454520424236476">"memoria, cachea, datuak, ezabatu, garbitu, tokia egin, tokia"</string>
-    <string name="keywords_bluetooth_settings" msgid="1152229891590622822">"konektatuta, gailua, aurikularrak, entzungailua, bozgorailua, hari gabekoak, parekatu, aurikular euskarridunak, musika, multimedia-edukia"</string>
+    <string name="keywords_bluetooth_settings" msgid="1152229891590622822">"konektatuta, gailua, aurikularrak, entzungailua, bozgorailua, hari gabekoak, parekatu, musika, multimedia-edukia"</string>
     <string name="keywords_wallpaper" msgid="7665778626293643625">"atzeko planoa, pantaila, pantaila blokeatua, gaia"</string>
     <string name="keywords_assist_input" msgid="8392362788794886564">"lehenetsia, laguntzailea"</string>
     <string name="keywords_default_payment_app" msgid="845369409578423996">"ordaindu, lehenetsia"</string>
@@ -3123,7 +3125,7 @@
     <string name="keywords_battery_saver_sticky" msgid="8733804259716284872">"bateria-aurrezlea, finkoa, iraunkorra, energia-aurrezlea, bateria"</string>
     <string name="default_sound" msgid="6675629744816442953">"Soinu lehenetsia"</string>
     <string name="sound_settings_summary" msgid="8467549670633195109">"Tonuaren bolumena: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="5187301919242823508">"Bolumena, dardara, \"Ez molestatu\" modua"</string>
+    <string name="sound_dashboard_summary" msgid="5187301919242823508">"Bolumena, dardara, ez molestatzeko modua"</string>
     <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"Dardara moduan ezarri da gailua"</string>
     <string name="sound_settings_summary_silent" msgid="899823817462768876">"Isilik moduan ezarri da gailua"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"Tonuaren bolumena: % 80"</string>
@@ -3161,8 +3163,8 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> gaituta</item>
       <item quantity="one">1 gaituta</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="3425263414594779244">"Ez molestatu"</string>
-    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"Aktibatu \"Ez molestatu\" modua"</string>
+    <string name="zen_mode_settings_title" msgid="3425263414594779244">"Ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_turn_on_dialog_title" msgid="3062548369931058282">"Aktibatu ez molestatzeko modua"</string>
     <string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"Salbuespenak"</string>
     <string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"Iraupen lehenetsia"</string>
     <string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"Baimendu soinu eta dardara hauek:"</string>
@@ -3178,7 +3180,7 @@
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5272888746413504692">"Antolatu"</string>
     <string name="zen_mode_schedule_category_title" msgid="1936785755444711221">"Ordutegia"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="4921779962633710347">"Isilarazi telefonoa ordu jakinetan"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"Ezarri \"Ez molestatu\" moduaren arauak"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"Ezarri ez molestatzeko moduaren arauak"</string>
     <string name="zen_mode_schedule_title" msgid="5275268813192802631">"Ordutegia"</string>
     <string name="zen_mode_use_automatic_rule" msgid="446326253915861824">"Erabili ordutegia"</string>
     <string name="zen_mode_option_important_interruptions" msgid="5173944276846940149">"Lehentasuna dutenak soilik"</string>
@@ -3187,14 +3189,14 @@
     <string name="zen_mode_summary_combination" msgid="6960111215170691605">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="8378266552787406849">"Blokeatu oztopo bisualak"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6608239691864638854">"Baimendu seinale bisualak"</string>
-    <string name="zen_mode_settings_category" msgid="5601680733422424922">"\"Ez molestatu\" aktibatuta dagoenean"</string>
+    <string name="zen_mode_settings_category" msgid="5601680733422424922">"Ez molestatzeko modua aktibatuta dagoenean"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="7486753018073540477">"Murriztu jakinarazpenak"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="2673665450311184875">"Ez egin soinurik jakinarazpenak jasotzean"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="1696217042353376674">"Jakinarazpenak ikusiko dituzu pantailan"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3049522809520549054">"Jakinarazpenak iristen direnean, telefonoak ez du egingo soinurik edo dardararik."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="3296933643539682552">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"Ez duzu ikusi edo entzungo jakinarazpenik"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Telefonoak ez ditu erakutsiko ez jakinarazpen berriak, ez lehendik daudenak, eta ez du dar-dar edo soinurik egingo haiek jasotzean. Kontuan izan, ordea, telefonoaren jarduerei edo egoerari buruzko ezinbesteko jakinarazpenak agertuko direla.\n\n\"Ez molestatu\" modua desaktibatzean, galdutako jakinarazpenak ikusi nahi badituzu, pasatu hatza pantailaren goialdetik behera."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Telefonoak ez ditu erakutsiko ez jakinarazpen berriak, ez lehendik daudenak, eta ez du dar-dar edo soinurik egingo haiek jasotzean. Kontuan izan, ordea, telefonoaren jarduerei edo egoerari buruzko ezinbesteko jakinarazpenak agertuko direla.\n\nEz molestatzeko modua desaktibatzean, galdutako jakinarazpenak ikusi nahi badituzu, pasatu hatza pantailaren goialdetik behera."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"Pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"Gaitu ezarpen pertsonalizatua"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"Kendu ezarpen pertsonalizatua"</string>
@@ -3225,11 +3227,11 @@
     <string name="zen_mode_enable_dialog_turn_on" msgid="6396050543542026184">"Aktibatu"</string>
     <string name="zen_mode_button_turn_on" msgid="1097964136225943415">"Aktibatu"</string>
     <string name="zen_mode_button_turn_off" msgid="3990967728457149454">"Desaktibatu"</string>
-    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
-    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"Desaktibatzen duzun arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"Antolaketa batek (<xliff:g id="RULE_NAME">%s</xliff:g>) automatikoki aktibatu du “Ez molestatu” modua"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> aplikazioak automatikoki aktibatu du \"Ez molestatu\" modua"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"\"Ez molestatu\" modua aktibatuta dago <xliff:g id="RULE_NAMES">%s</xliff:g> arauetan, ezarpen pertsonalizatuekin."</string>
+    <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arte egongo da aktibatuta ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"Desaktibatzen duzun arte egongo da aktibatuta ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"Antolaketa batek (<xliff:g id="RULE_NAME">%s</xliff:g>) automatikoki aktibatu du ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> aplikazioak automatikoki aktibatu du ez molestatzeko modua"</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"Ez molestatzeko modua aktibatuta dago <xliff:g id="RULE_NAMES">%s</xliff:g> arauetan, ezarpen pertsonalizatuekin."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Ikusi ezarpen pertsonalizatuak"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Lehentasuna dutenak soilik"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3252,7 +3254,7 @@
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Salbuespenak"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"Antolaketa"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"Ikusi salbuespen guztiak"</string>
-    <string name="zen_sound_footer" msgid="1778673975517424878">"\"Ez molestatu\" modua aktibatuta dagoenean, audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik."</string>
+    <string name="zen_sound_footer" msgid="1778673975517424878">"Ez molestatzeko modua aktibatuta dagoenean, audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik."</string>
     <string name="zen_sound_category_title" msgid="2109447208414722786">"Desaktibatu guztien audioa eta dardara, hauena izan ezik:"</string>
     <string name="zen_sound_all_muted" msgid="4844094866910870591">"Audioa eta dardara desaktibatuta"</string>
     <string name="zen_sound_none_muted" msgid="4869385974769188085">"Audioa eta dardara desaktibatu gabe"</string>
@@ -3265,14 +3267,14 @@
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"Jakinarazpenak"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"Iraupena"</string>
     <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Mezuak, gertaerak eta abisuak"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="164400918479831580">"Ez molestatzeko modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen."</string>
     <string name="zen_onboarding_ok" msgid="6403635918125323678">"Eginda"</string>
     <string name="zen_onboarding_settings" msgid="1416466597876383322">"Ezarpenak"</string>
     <string name="zen_onboarding_new_setting_title" msgid="3622673375041304362">"Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean"</string>
     <string name="zen_onboarding_current_setting_title" msgid="2560330551761407563">"Ez egin soinurik jakinarazpenak jasotzean"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="8264430315983860075">"Ez duzu ikusi edo entzungo jakinarazpenik. Kontaktu izardunek eta berriro deitu dutenen deiak onartu egingo dira."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="3569246708507270821">"(Uneko ezarpena)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"\"Ez molestatu\" moduaren jakinarazpen-ezarpenak aldatu nahi dituzu?"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="7584229011611927613">"Ez molestatzeko moduaren jakinarazpen-ezarpenak aldatu nahi dituzu?"</string>
     <string name="sound_work_settings" msgid="4140215240360927923">"Laneko profilaren soinuak"</string>
     <string name="work_use_personal_sounds_title" msgid="531727195073003599">"Erabili profil pertsonalaren soinuak"</string>
     <string name="work_use_personal_sounds_summary" msgid="2886871383995187441">"Soinu berberak erabiltzen dira laneko profilean nahiz profil pertsonalean"</string>
@@ -3290,7 +3292,7 @@
     <string name="configure_notification_settings" msgid="291914315140851270">"Jakinarazpenak"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Bidalitako azkenak"</string>
     <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Ikusi azken zazpi egunetako guztia"</string>
-    <string name="advanced_section_header" msgid="984680389373090015">"Ezarpen aurreratuak"</string>
+    <string name="advanced_section_header" msgid="984680389373090015">"Aurreratuak"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Laneko jakinarazpenak"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Jakinarazpen automatikoen hobespenen ezartzailea"</string>
     <string name="asst_capability_prioritizer_summary" msgid="3525640645743790796">"Isilarazi eta jaitsi mailaz garrantzi gutxiagoko jakinarazpenak"</string>
@@ -3300,7 +3302,7 @@
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"Ezkutatu jakinarazpen isilen ikonoak egoera-barran"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"Baimendu jakinarazpen-biribiltxoak"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"Burbuilak"</string>
-    <string name="notification_bubbles_summary" msgid="4624512775901949578">"Atzitu bizkor aplikazioetako edukia lasterbide flotagarriak erabilita"</string>
+    <string name="notification_bubbles_summary" msgid="4624512775901949578">"Atzitu bizkor aplikazioetako edukia lasterbide gainerakorrak erabilita"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"Jakinarazpen batzuk eta bestelako edukia burbuila gisa ager daitezke pantailan. Burbuilak irekitzeko, saka itzazu. Baztertzeko, ordea, arrasta itzazu pantailan behera."</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"Burbuilak"</string>
     <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"Baimendu <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari jakinarazpen batzuk burbuila gisa erakustea"</string>
@@ -3364,16 +3366,16 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"Ez dago laguntzailerik"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Ez dago jakinarazpenetarako sarbidea eskatu duen aplikaziorik."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari jakinarazpenetarako sarbidea eman nahi diozu?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahalko ditu eta, haien barnean, informazio pertsonala egon daiteke (adibidez, kontaktuen izenak eta jasotzen dituzun testu-mezuak). Gainera, jakinarazpen horiek aldatu edo baztertu egin ahal izango ditu, baita haietako ekintza-botoiak sakatu ere. \n\nHorrez gain, Ez molestatu modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita harekin erlazionatutako ezarpenak aldatzekoa ere."</string>
-    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari jakinarazpenak atzitzeko baimena eman nahi diozu?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahal izango ditu, informazio pertsonala (adibidez, kontaktuen izenak eta jasotako testu-mezuak) dutenak barne. Horrez gain, jakinarazpenak baztertu eta haietako ekintza-botoiak abiarazi ahal izango ditu. \n\nGainera, Ez molestatu modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita horrekin erlazionatutako ezarpenak aldatzekoa ere."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioari jakinarazpenak atzitzeko aukera desaktibatzen badiozu, baliteke Ez molestatu modurako sarbidea era desaktibatzea."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahalko ditu eta, haien barnean, informazio pertsonala egon daiteke (adibidez, kontaktuen izenak eta jasotzen dituzun testu-mezuak). Gainera, jakinarazpen horiek aldatu edo baztertu egin ahal izango ditu, baita haietako ekintza-botoiak sakatu ere. \n\nHorrez gain, ez molestatzeko modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita harekin erlazionatutako ezarpenak aldatzekoa ere."</string>
+    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"Jakinarazpenak atzitzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahal izango ditu, informazio pertsonala (adibidez, kontaktuen izenak eta jasotako testu-mezuak) dutenak barne. Horrez gain, jakinarazpenak baztertu eta haietako ekintza-botoiak abiarazi ahal izango ditu. \n\nGainera, ez molestatzeko modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita horrekin erlazionatutako ezarpenak aldatzekoa ere."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioari jakinarazpenak atzitzeko aukera desaktibatzen badiozu, baliteke ez molestatzeko modurako sarbidea era desaktibatzea."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Desaktibatu"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Utzi"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"Errealitate birtualeko laguntza-zerbitzuak"</string>
-    <string name="no_vr_listeners" msgid="7675484190394450979">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa exekutatzea eskatu duen aplikaziorik instalatuta."</string>
-    <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"Aplikazioak errealitate birtualean erabiltzen dituzunean exekutatu ahal izango da  <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>."</string>
+    <string name="no_vr_listeners" msgid="7675484190394450979">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa abiaraztea eskatu duen aplikaziorik instalatuta."</string>
+    <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"Errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
+    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"Aplikazioak errealitate birtualean erabiltzen dituzunean abiarazi ahal izango da  <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>."</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"Errealitate birtualeko moduan"</string>
     <string name="display_vr_pref_low_persistence" msgid="3132583929174794245">"Murriztu lausotzea (gomendatua)"</string>
     <string name="display_vr_pref_off" msgid="4681320968818852691">"Murriztu distira"</string>
@@ -3383,9 +3385,9 @@
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Pantaila txiki gainjarria"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Eman pantaila txiki gainjarria erabiltzeko baimena"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Baimendu aplikazio honek pantaila txiki gainjarri bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean erakutsiko da leiho hori."</string>
-    <string name="manage_zen_access_title" msgid="3058206309728524196">"\"Ez molestatu\" aukerarako sarbidea"</string>
-    <string name="zen_access_detail_switch" msgid="8706332327904974500">"Eman \"Ez molestatu\" modua atzitzeko baimena"</string>
-    <string name="zen_access_empty_text" msgid="7667538993781607731">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
+    <string name="manage_zen_access_title" msgid="3058206309728524196">"Ez molestatzeko modurako sarbidea"</string>
+    <string name="zen_access_detail_switch" msgid="8706332327904974500">"Eman ez molestatzeko modua atzitzeko baimena"</string>
+    <string name="zen_access_empty_text" msgid="7667538993781607731">"Ez dago ez molestatzeko modurako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"Aplikazioak kargatzen…"</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"Zure eskaerari jarraikiz, aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"Zure eskaerari jarraikiz, jakinarazpen-kategoria hau gailu honetan erakustea galarazten ari da Android"</string>
@@ -3415,8 +3417,8 @@
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Ez erakutsi inoiz jakinarazpenak edo ilundutako eremuetan edo gailu osagarrietan"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Eman jakinarazpen-biribiltxoa erakusteko baimena"</string>
     <string name="notification_channel_badge_title" msgid="8228215248332054612">"Erakutsi jakinarazpen-biribiltxoa"</string>
-    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"\"Ez molestatu\" moduaren salbuespenak"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Eman \"Ez molestatu\" aukera aktibatuta dagoenean agertzeko baimena jakinarazpen hauei"</string>
+    <string name="app_notification_override_dnd_title" msgid="1757042206738172601">"Ez molestatzeko moduaren salbuespenak"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3152957611171210980">"Eman ez molestatzeko modua aktibatuta dagoenean agertzeko baimena jakinarazpen hauei"</string>
     <string name="app_notification_visibility_override_title" msgid="2349335170165637672">"Pantaila blokeatuan"</string>
     <string name="app_notification_row_banned" msgid="2079325338122151677">"Blokeatuta"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Lehentasuna"</string>
@@ -3439,13 +3441,13 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="2646596466259025978">"\"<xliff:g id="RULE">%1$s</xliff:g>\" araua ezabatu nahi duzu?"</string>
     <string name="zen_mode_delete_rule_button" msgid="611058106279881991">"Ezabatu"</string>
     <string name="zen_mode_rule_type_unknown" msgid="2819480113355191421">"Ezezaguna"</string>
-    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"Une honetan ezin dira aldatu ezarpenak. <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak automatikoki aktibatu du \"Ez molestatu\" modua, eta portaera pertsonalizatua ezarri dio."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"Une honetan ezin dira aldatu ezarpenak. Aplikazio batek automatikoki aktibatu du \"Ez molestatu\" modua, eta portaera pertsonalizatua ezarri dio."</string>
-    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"Une honetan ezin dira aldatu ezarpenak. Eskuz aktibatu da \"Ez molestatu\" modua, eta portaera pertsonalizatua ezarri dio."</string>
+    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"Une honetan ezin dira aldatu ezarpenak. <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak automatikoki aktibatu du ez molestatzeko modua, eta portaera pertsonalizatua ezarri dio."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"Une honetan ezin dira aldatu ezarpenak. Aplikazio batek automatikoki aktibatu du ez molestatzeko modua, eta portaera pertsonalizatua ezarri dio."</string>
+    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"Une honetan ezin dira aldatu ezarpenak. Eskuz aktibatu da ez molestatzeko modua, eta portaera pertsonalizatua ezarri dio."</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"Ordua"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"Une jakin batzuetan \"Ez molestatu\" egoera aktibatzen duen arau automatikoa"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"Une jakin batzuetan ez molestatzeko modua aktibatzen duen arau automatikoa"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"Gertaera"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"Egoera jakin batzuetan \"Ez molestatu\" egoera aktibatzen duen arau automatikoa"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"Egoera jakin batzuetan ez molestatzeko modua aktibatzen duen arau automatikoa"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"Gertaerek dirauten bitartean"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"<xliff:g id="CALENDAR">%1$s</xliff:g> egutegiko gertaerek dirauten bitartean"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"edozein egutegi"</string>
@@ -3463,7 +3465,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="8814173364016139675">"Egunero"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="2078194049274875023">"Alarmak amaiera-ordua deusezta dezake"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="5556997989911412070">"Alarmak jotzen duenean, ordutegia desaktibatu egiten da"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"\"Ez molestatu\" moduaren jokabidea"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="8908861697886331001">"Ez molestatzeko moduaren jokabidea"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="3509865340195397447">"Erabili ezarpen lehenetsiak"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="7206909852887332604">"Sortu ezarpen pertsonalizatuak ordutegi honetarako"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7451686525113262087">"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> arauari dagokionez"</string>
@@ -3501,11 +3503,11 @@
     <string name="zen_mode_reminders" msgid="7560664194610054038">"Baimendu abisuak"</string>
     <string name="zen_mode_reminders_list" msgid="7347061314032326677">"abisuak"</string>
     <string name="zen_mode_events" msgid="5784076928339534984">"Baimendu gertaerak"</string>
-    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"Baimendu aplikazioek \"Ez molestatu\" ez aplikatzea"</string>
+    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"Eman \"Ez molestatu\" ez aplikatzeko baimena aplikazioei"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"Gehitu salbuespenak"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
-      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> aplikazioren jakinarazpenek dute “Ez molestatu” moduari ez ikusi egiteko aukera</item>
-      <item quantity="one">Aplikazio baten jakinarazpenek dute “Ez molestatu” moduari ez ikusi egiteko aukera</item>
+      <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> aplikazioren jakinarazpenek dute ez molestatzeko moduari ez ikusi egiteko aukera</item>
+      <item quantity="one">Aplikazio baten jakinarazpenek dute ez molestatzeko moduari ez ikusi egiteko aukera</item>
     </plurals>
     <string name="zen_mode_events_list" msgid="8578102701815684873">"gertaerak"</string>
     <string name="zen_mode_all_callers" msgid="4455039040077343838">"edonor"</string>
@@ -3537,10 +3539,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"Aldatu \"Alarmak soilik\" modura <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"Aldatu \"Eten beti\" modura"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"Pantaila piztuta dagoenean"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"Baimendu \"Ez molestatu\" moduan ezkutatutako jakinarazpenak pantailan agertzea, eta erakutsi ikono bat egoera-barran"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"Eman pantailan agertzeko eta egoera-barran ikono bat erakusteko baimena ez molestatzeko moduan ezkutatutako jakinarazpenei"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"Pantaila itzalita dagoenean"</string>
-    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila edo jakinarazpen-argia piztea"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"Baimendu \"Ez molestatu\" moduan ezkutatu beharreko jakinarazpenek pantaila piztea"</string>
+    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"Baimendu ez molestatzeko moduan ezkutatu beharreko jakinarazpenek pantaila edo jakinarazpen-argia piztea"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"Eman pantaila pizteko baimena ez molestatzeko moduan ezkutatu beharreko jakinarazpenei"</string>
     <string name="notification_app_settings_button" msgid="3651180424198580907">"Jakinarazpen-ezarpenak"</string>
     <string name="suggestion_button_text" msgid="5783566542423813847">"Ados"</string>
     <string name="device_feedback" msgid="4042352891448769818">"Bidali gailu honi buruzko oharrak"</string>
@@ -3583,9 +3585,9 @@
     <string name="slot_number" msgid="785422579177068698">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. zirrikitua)"</string>
     <string name="launch_by_default" msgid="6106985160202769725">"Ireki modu lehenetsian"</string>
     <string name="app_launch_domain_links_title" msgid="2987289657348349133">"Irekiko diren estekak"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"Ireki onartzen diren estekak"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"Ireki esteka bateragarriak"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"Ireki galdetu gabe"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Onartzen diren estekak"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Esteka bateragarriak"</string>
     <string name="app_launch_other_defaults_title" msgid="2986685757258232543">"Beste aplikazio lehenetsi batzuk"</string>
     <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="SIZE">%1$s</xliff:g> erabilita (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="4434212376539293892">"Barneko memoria"</string>
@@ -3602,7 +3604,7 @@
     <string name="notifications_silenced" msgid="538923056987616372">"Ezkutatutakoak"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"Ez erakutsi datu pertsonalik pantaila blokeatuan"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"Ez erakutsi pantaila blokeatuan"</string>
-    <string name="notifications_priority" msgid="8849045645983017929">"Ez aplikatu \"Ez molestatu\" modua"</string>
+    <string name="notifications_priority" msgid="8849045645983017929">"Ez aplikatu ez molestatzeko modua"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
     <string name="notification_summary_level" msgid="309162160355022027">"%d. maila"</string>
     <string name="notification_summary_channel" msgid="3372346622071114366">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3634,8 +3636,8 @@
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"Kategoriak: premiazkoak"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"Kategoriak: garrantzi txikikoak"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"Kategoriak: desaktibatutakoak"</string>
-    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Kategoriak: \"Ez molestatu\" salbuespenak"</string>
-    <string name="advanced_apps" msgid="6643869089344883537">"Ezarpen aurreratuak"</string>
+    <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"Kat.: ez molestatzeko moduaren salb."</string>
+    <string name="advanced_apps" msgid="6643869089344883537">"Aurreratuak"</string>
     <string name="configure_apps" msgid="4066683118857400943">"Konfiguratu aplikazioak"</string>
     <string name="unknown_app" msgid="2312052973570376877">"Aplikazio ezezaguna"</string>
     <string name="app_permissions" msgid="3215958256821756086">"Baimenen kudeatzailea"</string>
@@ -3643,7 +3645,7 @@
     <string name="tap_to_wake" msgid="1902991239401652323">"Sakatu aktibatzeko"</string>
     <string name="tap_to_wake_summary" msgid="8485222120721006793">"Sakatu birritan pantailako edozein puntu gailua aktibatzeko"</string>
     <string name="domain_urls_title" msgid="7939209950373945367">"Irekiko diren estekak"</string>
-    <string name="domain_urls_summary_none" msgid="5401203416941265109">"Ez ireki onartzen diren estekak"</string>
+    <string name="domain_urls_summary_none" msgid="5401203416941265109">"Ez ireki esteka bateragarriak"</string>
     <string name="domain_urls_summary_one" msgid="3893975485064803435">"Ireki <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="2130534984153210797">"Ireki <xliff:g id="DOMAIN">%s</xliff:g> eta beste URL batzuk"</string>
     <string name="domain_urls_apps_summary_off" msgid="1110203970617922543">"Ez dago esteka bateragarriak ireki ditzakeen aplikaziorik"</string>
@@ -3678,9 +3680,9 @@
     <string name="usage_access_description" msgid="2178083292760305207">"Erabilera-datuek zer beste aplikazio eta zer maiztasunekin erabiltzen dituzun jakiteko baimena ematen die aplikazioei, baita zer operadore duzun, zer hizkuntza-ezarpen dituzun eta beste xehetasun batzuk ere."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Memoria"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Memoriaren xehetasunak"</string>
-    <string name="always_running" msgid="5320183445080208766">"Beti ari da exekutatzen (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="sometimes_running" msgid="3830146615620696644">"Noizbehinka exekutatzen da (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="rarely_running" msgid="7726208127642450037">"Ez da ia inoiz exekutatzen (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="always_running" msgid="5320183445080208766">"Beti dago abian (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="sometimes_running" msgid="3830146615620696644">"Noizbehinka abiarazten da (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
+    <string name="rarely_running" msgid="7726208127642450037">"Ez da ia inoiz abiarazten (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="memory_max_use" msgid="5493310646751769451">"Gehienekoa"</string>
     <string name="memory_avg_use" msgid="3686245197961237899">"Batez besteko erabilera"</string>
     <string name="memory_max_desc" msgid="2013027702130684764">"Gehienekoa: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
@@ -3704,8 +3706,8 @@
     <string name="high_power_off" msgid="5906679734326490426">"Bateria optimizatu egiten da"</string>
     <string name="high_power_system" msgid="739584574711292753">"Bateria-optimizazioa ez dago erabilgarri"</string>
     <string name="high_power_desc" msgid="333756885680362741">"Ez aplikatu bateria-optimizazioa. Aukera horrekin, bizkorrago agortuko da bateria."</string>
-    <string name="high_power_prompt_title" msgid="2805745781720454052">"Beti atzeko planoan exekutatzeko baimena eman nahi diozu aplikazioari?"</string>
-    <string name="high_power_prompt_body" msgid="8067395096053552289">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari atzeko planoan beti exekutatzeko baimena emanez gero, baliteke bateriak gutxiago irautea. \n\nAukera hori aldatzeko, sakatu Ezarpenak &gt; Aplikazioak eta jakinarazpenak."</string>
+    <string name="high_power_prompt_title" msgid="2805745781720454052">"Beti atzeko planoan abiarazteko baimena eman nahi diozu aplikazioari?"</string>
+    <string name="high_power_prompt_body" msgid="8067395096053552289">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioari atzeko planoan beti abiarazteko baimena emanez gero, baliteke bateriak gutxiago irautea. \n\nAukera hori aldatzeko, sakatu Ezarpenak &gt; Aplikazioak eta jakinarazpenak."</string>
     <string name="battery_summary" msgid="4345690800899981339">"Bateriaren <xliff:g id="PERCENTAGE">%1$s</xliff:g> erabili du bateria guztiz kargatu zenetik"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"Bateriaren kudeaketa"</string>
     <string name="no_battery_summary" msgid="4105932628367471314">"Ez du bateriarik erabili bateria guztiz kargatu zenetik"</string>
@@ -3779,10 +3781,10 @@
     <string name="running_frequency" msgid="7545170806968474449">"Maiztasuna"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"Gehieneko erabilera"</string>
     <string name="no_data_usage" msgid="903383745620135746">"Ez da erabili daturik"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari \"Ez molestatu\" modua erabiltzeko baimena eman?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari ez molestatzeko modua erabiltzeko baimena eman?"</string>
+    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Aplikazioak ez molestatzeko egoera aktibatu eta desaktibatu ahal izango du, eta erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Aktibatuta egon behar du, jakinarazpenetarako sarbidea aktibatuta dagoelako"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Ez molestatzeko arauetarako sarbidea kendu nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari?"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Ez molestatzeko modurako sarbidea kendu nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Kendu egingo dira aplikazioak sortu dituen ez molestatzeko arau guztiak."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"Ez optimizatu"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"Optimizatu"</string>
@@ -3854,8 +3856,8 @@
     <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> erabilita - <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"Barneko memoria: <xliff:g id="PERCENTAGE">%1$s</xliff:g> erabilita - <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
     <string name="display_summary" msgid="5725269449657325797">"Lokartu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
-    <string name="display_dashboard_summary" msgid="7678566148167010682">"Horma-papera, inaktibo ezartzea, letra-tipoaren tamaina"</string>
-    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Estiloak eta horma-paperak, egoera inaktiboa, letra-tipoaren tamaina"</string>
+    <string name="display_dashboard_summary" msgid="7678566148167010682">"Horma-papera, inaktibo ezartzea, letra-tamaina"</string>
+    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Estiloak eta horma-paperak, egoera inaktiboa, letra-tamaina"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"Inaktibo ezartzeko modua, letra-tamaina"</string>
     <string name="display_summary_example" msgid="4555020581960719296">"Ezarri inaktibo hamar minutuan jarduerarik gabe egon ondoren"</string>
     <string name="memory_summary" msgid="9121871336058042600">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> erabili dira batez beste"</string>
@@ -3883,7 +3885,7 @@
     <string name="condition_hotspot_title" msgid="4143299802283098506">"Sare publikoa aktiboa dago"</string>
     <string name="condition_airplane_title" msgid="8484582712516148433">"Hegaldi modua aktibatuta"</string>
     <string name="condition_airplane_summary" msgid="3021193218494740742">"Sareak ez daude erabilgarri"</string>
-    <string name="condition_zen_title" msgid="2128184708916052585">"Aktibatuta dago \"Ez molestatu\" modua"</string>
+    <string name="condition_zen_title" msgid="2128184708916052585">"Aktibatuta dago ez molestatzeko modua"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"Telefonoaren audioa desaktibatuta dago"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"Salbuespenekin"</string>
     <string name="condition_battery_title" msgid="6704870010912986274">"Bateria-aurrezlea aktibatuta"</string>
@@ -4038,7 +4040,7 @@
     <string name="notification_log_details_ranking_none" msgid="3687243721168608404">"Sailkapen-objektuak ez du gako hau."</string>
     <string name="theme_customization_category" msgid="4043457940936660368">"Gaiak"</string>
     <string name="theme_customization_accent_color_title" msgid="3949108608589133216">"Nabarmentzeko kolorea"</string>
-    <string name="theme_customization_font_title" msgid="309728559821356597">"Goiburuaren eta gorputzaren letra-tipoa"</string>
+    <string name="theme_customization_font_title" msgid="309728559821356597">"Goiburuaren eta gorputzaren letra"</string>
     <string name="theme_customization_icon_shape_title" msgid="4603248388639328322">"Ikonoaren forma"</string>
     <string name="theme_customization_device_default" msgid="7188874258500934312">"Gailuaren balio lehenetsiak"</string>
     <string name="display_cutout_emulation" msgid="288975763151891685">"Pantailaren mozketa"</string>
@@ -4101,9 +4103,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Egin tokia"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Keinuak"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Telefonoa kontrolatzeko keinu azkarrak"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Tableta kontrolatzeko keinu azkarrak"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Gailua kontrolatzeko keinu azkarrak"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Telefonoa kontrolatzeko keinu bizkorrak"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Tableta kontrolatzeko keinu bizkorrak"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Gailua kontrolatzeko keinu bizkorrak"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Ireki kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan zaudela egin dezakezu hori."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Ireki kamera bizkor"</string>
@@ -4113,18 +4115,18 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Aplikazioa aldatzeko, pasatu hatza gora Hasiera botoian, eta pasa ezazu berriro aplikazio guztiak ikusteko. Edozein pantailatan funtzionatzen du. Ikuspegi orokorraren botoia ez da egongo pantailaren behealdean eskuinetara."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"Probatu Hasiera botoi berria"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"Aktibatu aplikazioa aldatzeko keinu berria"</string>
-    <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Sakatu birritan telefonoa bertan dagoena ikusteko"</string>
+    <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Sakatu birritan telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"Sakatu birritan tableta bertan dagoela ikusteko"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"Sakatu birritan gailua bertan dagoela ikusteko"</string>
     <string name="ambient_display_summary" msgid="4882910328216411109">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila birritan."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Jaso telefonoa bertan dagoena ikusteko"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Jaso telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="1555456400210301959">"Jaso tableta bertan dagoela ikusteko"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="2480126522988135037">"Jaso gailua bertan dagoela ikusteko"</string>
     <string name="ambient_display_wake_screen_title" msgid="3376988352851077102">"Esnarazi pantaila"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu telefonoa."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu tableta."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu gailua."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Sakatu telefonoa egiaztatzeko"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Sakatu telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Sakatu tableta egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Sakatu gailua egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila."</string>
@@ -4155,8 +4157,8 @@
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Sinkronizatu laneko datuak automatikoki"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Utzi aplikazioei datuak automatikoki freskatzen"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"Kontuaren sinkronizazioa"</string>
-    <string name="account_sync_summary_some_on" msgid="1934556869158274053">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta dute sinkronizazioa"</string>
-    <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Elementu guztiek aktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_some_on" msgid="1934556869158274053">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta daukate sinkronizazioa"</string>
+    <string name="account_sync_summary_all_on" msgid="3634161204232431700">"Elementu guztiek aktibatuta daukate sinkronizazioa"</string>
     <string name="account_sync_summary_all_off" msgid="1971584632343645602">"Elementu guztiek desaktibatuta dute sinkronizazioa"</string>
     <string name="enterprise_privacy_settings" msgid="2777101678653072889">"Gailu kudeatuaren informazioa"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5557859169062703683">"Erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
@@ -4265,13 +4267,15 @@
     <string name="storage_movies_tv" msgid="7282484273991655296">"Zinema- eta telebista-aplikazioak"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"Operadorearen hornikuntza-informazioa"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"Abiarazi operadorearen hornikuntza"</string>
-    <string name="zen_suggestion_title" msgid="2134699720214231950">"Eguneratu \"Ez molestatu\" modua"</string>
+    <string name="zen_suggestion_title" msgid="2134699720214231950">"Eguneratu ez molestatzeko modua"</string>
     <string name="zen_suggestion_summary" msgid="4041062903237952737">"Pausatu jakinarazpenak arreta ez galtzeko"</string>
     <string name="disabled_low_ram_device" msgid="4958060232123741721">"Eginbidea ez dago erabilgarri gailu honetan"</string>
     <string name="disabled_feature" msgid="3747549387387702365">"Eginbide hau ez dago erabilgarri"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Telefonoa moteldu egingo da"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Behartu GNSS neurketa osoak gauzatzera"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Egin GNSS konstelazio eta maiztasun guztien jarraipena, eginbeharren ziklorik gabe"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Araztu erabiltzailea aldatzeko aukera"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Erakutsi informazio xehatua erabiltzailea aldatzerakoan"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Baimendu atzeko planoko jarduerak abiaraztea"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Baimendu atzeko planoko jardueren abiarazte guztiak"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Erakutsi beti hutsegiteen leihoak"</string>
@@ -4324,7 +4328,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="3509459199090688328">"Aktibatuta (audioa desaktibatuta)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="5152618221093037451">"Desaktibatuta"</string>
     <string name="pref_title_network_details" msgid="3971074015034595956">"Sarearen xehetasunak"</string>
-    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth gailuetara konektatzean edo Wi-Fi sare publiko bat konfiguratzean."</string>
+    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth bidezko gailuetara konektatzean edo wifi-sare publiko bat konfiguratzean."</string>
     <string name="devices_title" msgid="4768432575951993648">"Gailuak"</string>
     <string name="homepage_all_settings" msgid="3201220879559136116">"Ezarpen guztiak"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"Iradokizunak"</string>
@@ -4449,7 +4453,7 @@
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gailu daude konektatuta</item>
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> gailu dago konektatuta</item>
     </plurals>
-    <string name="no_bluetooth_devices" msgid="4338224958734305244">"Ez dago Bluetooth gailurik"</string>
+    <string name="no_bluetooth_devices" msgid="4338224958734305244">"Ez dago Bluetooth bidezko gailurik"</string>
     <string name="bluetooth_left_name" msgid="4393660998014637355">"Ezkerrekoa"</string>
     <string name="bluetooth_right_name" msgid="8356091262762973801">"Eskuinekoa"</string>
     <string name="bluetooth_middle_name" msgid="1489185200445352103">"Zorroa"</string>
diff --git a/tests/CarDeveloperOptions/res/values-fa-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-fa-nokeys/strings.xml
new file mode 100644
index 0000000..83c5bb9
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fa-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"مدیریت برنامه‌های کاربردی"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fa/arrays.xml b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
new file mode 100644
index 0000000..dd1ef51
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"امریکا"</item>
+    <item msgid="4791956477275129121">"اروپا"</item>
+    <item msgid="3812126832016254559">"آفریقا"</item>
+    <item msgid="2765816300353408280">"آسیا"</item>
+    <item msgid="6683489385344409742">"استرالیا"</item>
+    <item msgid="5194868215515664953">"اقیانوسیه"</item>
+    <item msgid="7044520255415007865">"همه"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"۱۵ ثانیه"</item>
+    <item msgid="772029947136115322">"۳۰ ثانیه"</item>
+    <item msgid="8743663928349474087">"۱ دقیقه"</item>
+    <item msgid="1506508631223164814">"۲ دقیقه"</item>
+    <item msgid="8664703938127907662">"۵ دقیقه"</item>
+    <item msgid="5827960506924849753">"۱۰ دقیقه"</item>
+    <item msgid="6677424950124253938">"۳۰ دقیقه"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"هرگز"</item>
+    <item msgid="2517785806387977252">"۱۵ ثانیه"</item>
+    <item msgid="6347954399441173672">"۳۰ ثانیه"</item>
+    <item msgid="4858305253279921789">"۱ دقیقه"</item>
+    <item msgid="8109273437140044073">"۲ دقیقه"</item>
+    <item msgid="2788593551142462622">"۵ دقیقه"</item>
+    <item msgid="8012672183888404961">"۱۰ دقیقه"</item>
+    <item msgid="8271452751594598661">"۳۰ دقیقه"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"فوری"</item>
+    <item msgid="2038544972632026612">"۵ ثانیه"</item>
+    <item msgid="5558060663472279597">"۱۵ ثانیه"</item>
+    <item msgid="45341168505452037">"۳۰ ثانیه"</item>
+    <item msgid="227647485917789272">"۱ دقیقه"</item>
+    <item msgid="3367011891231217504">"۲ دقیقه"</item>
+    <item msgid="4376575879222393045">"۵ دقیقه"</item>
+    <item msgid="811192536981678974">"۱۰ دقیقه"</item>
+    <item msgid="7258394417241706272">"۳۰ دقیقه"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"کوچک"</item>
+    <item msgid="591935967183159581">"پیش‌فرض"</item>
+    <item msgid="1714184661981538355">"بزرگ"</item>
+    <item msgid="6195563047686707484">"بزرگ‌ترین"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"اسکن کردن..."</item>
+    <item msgid="5597394826455877834">"در حال اتصال..."</item>
+    <item msgid="5848277343965362748">"در حال راستی‌آزمایی..."</item>
+    <item msgid="3391238031431440676">"درحال دریافت نشانی IP…"</item>
+    <item msgid="5257597310494000224">"متصل"</item>
+    <item msgid="8472497592913050396">"معلق"</item>
+    <item msgid="1228072488815999109">"در حال قطع اتصال..."</item>
+    <item msgid="7253087004422991731">"اتصال قطع شد"</item>
+    <item msgid="4169850917304751227">"ناموفق"</item>
+    <item msgid="6266658166690831131">"مسدود شده"</item>
+    <item msgid="4517230805854909775">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"در حال اسکن..."</item>
+    <item msgid="8058143476674427024">"در حال اتصال به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"در حال راستی‌آزمایی با <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"در حال دریافت نشانی IP از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"متصل شد به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"معلق"</item>
+    <item msgid="4133290864821295785">"اتصال قطع شد از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"اتصال قطع شد"</item>
+    <item msgid="2847316776634969068">"ناموفق"</item>
+    <item msgid="4390990424746035383">"مسدود شده"</item>
+    <item msgid="3618248791367063949">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"دکمه Push"</item>
+    <item msgid="7401896200768713930">"پین از دستگاه مرتبط شده"</item>
+    <item msgid="4526848028011846710">"پین از این دستگاه"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"متصل"</item>
+    <item msgid="983792611851499732">"دعوت شده"</item>
+    <item msgid="5438273405428201793">"ناموفق"</item>
+    <item msgid="4646663015449312554">"دردسترس"</item>
+    <item msgid="3230556734162006146">"خارج از محدوده"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"۲ دقیقه"</item>
+    <item msgid="2759776603549270587">"۵ دقیقه"</item>
+    <item msgid="167772676068860015">"۱ ساعت"</item>
+    <item msgid="5985477119043628504">"بدون مهلت زمانی"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"استفاده از پیش‌فرض سیستم: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"۱"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"۵"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ضعیف"</item>
+    <item msgid="7882129634982603782">"ضعیف"</item>
+    <item msgid="6457357501905996224">"متوسط"</item>
+    <item msgid="405271628162918841">"خوب"</item>
+    <item msgid="999948812884919584">"عالی"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"۳۰ روز گذشته"</item>
+    <item msgid="3211287705232736964">"تنظیم چرخه مصرف..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"زمان استفاده"</item>
+    <item msgid="2784401352592276015">"آخرین زمان استفاده"</item>
+    <item msgid="249854287216326349">"نام برنامه"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"هیچ‌کدام"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"خالی"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"سیم کارت"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"هیچ‌کدام"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"ثابت"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"هیچ‌کدام"</item>
+    <item msgid="1464741437353223198">"دفترچه راهنما"</item>
+    <item msgid="5793600062487886090">"پیکربندی خودکار پروکسی"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"هیچ‌کدام"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP یا CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"مشخص نشده"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"خالی"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"دستگاه ذخیره‌سازی داخلی"</item>
+    <item msgid="3186681694079967527">"کارت SD جدا شدنی"</item>
+    <item msgid="6902033473986647035">"سیستم تصمیم بگیرد"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"مکان"</item>
+    <item msgid="6842381562497597649">"شخصی"</item>
+    <item msgid="3966700236695683444">"پیام‌رسانی"</item>
+    <item msgid="8563996233342430477">"رسانه"</item>
+    <item msgid="5323851085993963783">"دستگاه"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"موقعیت مکانی غیردقیق"</item>
+    <item msgid="1830619568689922920">"موقعیت مکانی دقیق"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"لرزش"</item>
+    <item msgid="8632513128515114092">"خواندن مخاطبین"</item>
+    <item msgid="3741042113569620272">"تغییر مخاطبین"</item>
+    <item msgid="4204420969709009931">"خواندن گزارش تماس"</item>
+    <item msgid="2260380357119423209">"تغییر گزارش تماس"</item>
+    <item msgid="6550710385014530934">"خواندن تقویم"</item>
+    <item msgid="3575906174264853951">"تغییر تقویم"</item>
+    <item msgid="4319843242568057174">"جستجوی شبکه Wi‑Fi"</item>
+    <item msgid="2981791890467303819">"اعلان"</item>
+    <item msgid="6617825156152476692">"جستجوی شبکه سلولی"</item>
+    <item msgid="8865260890611559753">"تماس تلفنی"</item>
+    <item msgid="3254999273961542982">"خواندن پیامک"</item>
+    <item msgid="7711446453028825171">"نوشتن پیامک"</item>
+    <item msgid="6123238544099198034">"دریافت پیامک"</item>
+    <item msgid="838342167431596036">"دریافت پیامک‌های اضطراری"</item>
+    <item msgid="8554432731560956686">"دریافت فراپیام"</item>
+    <item msgid="7464863464299515059">"دریافت پیام ارسال داده WAP"</item>
+    <item msgid="310463075729606765">"ارسال پیامک"</item>
+    <item msgid="7338021933527689514">"خواندن پیامک ICC"</item>
+    <item msgid="6130369335466613036">"نوشتن پیامک ICC"</item>
+    <item msgid="6536865581421670942">"تغییر تنظیمات"</item>
+    <item msgid="4547203129183558973">"در بالا طراحی کنید"</item>
+    <item msgid="9080347512916542840">"اعلان‌های دسترسی"</item>
+    <item msgid="5332718516635907742">"دوربین"</item>
+    <item msgid="6098422447246167852">"ضبط صدا"</item>
+    <item msgid="9182794235292595296">"پخش صدا"</item>
+    <item msgid="8760743229597702019">"خواندن بریده‌دان"</item>
+    <item msgid="2266923698240538544">"تغییر بریده‌دان"</item>
+    <item msgid="1801619438618539275">"دکمه‌های رسانه‌ای"</item>
+    <item msgid="31588119965784465">"فوکوس صدا"</item>
+    <item msgid="7565226799008076833">"میزان کنترل"</item>
+    <item msgid="5420704980305018295">"میزان صدا"</item>
+    <item msgid="5797363115508970204">"حجم حلقه"</item>
+    <item msgid="8233154098550715999">"میزان صدای رسانه"</item>
+    <item msgid="5196715605078153950">"میزان صدای زنگ"</item>
+    <item msgid="394030698764284577">"میزان صدای اعلان"</item>
+    <item msgid="8952898972491680178">"میزان صدای بلوتوث"</item>
+    <item msgid="8506227454543690851">"بیدار باش"</item>
+    <item msgid="1108160036049727420">"کنترل موقعیت مکانی"</item>
+    <item msgid="1496205959751719491">"کنترل مکان پرقدرت"</item>
+    <item msgid="3776296279910987380">"دریافت آمار استفاده"</item>
+    <item msgid="8827100324471975602">"صدادار/بی‌صدا کردن میکروفن"</item>
+    <item msgid="6880736730520126864">"نمایش پنجره خبری"</item>
+    <item msgid="4933375960222609935">"فرستادن رسانه"</item>
+    <item msgid="8357907018938895462">"فعال کردن VPN"</item>
+    <item msgid="8143812849911310973">"نوشتن تصویرزمینه"</item>
+    <item msgid="6266277260961066535">"ساختار دستیار"</item>
+    <item msgid="7715498149883482300">"عکس‌ صفحه‌نمایش دستیار"</item>
+    <item msgid="4046679376726313293">"خواندن وضعیت تلفن"</item>
+    <item msgid="6329507266039719587">"افزودن پست صوتی"</item>
+    <item msgid="7692440726415391408">"استفاده از SIP"</item>
+    <item msgid="8572453398128326267">"پردازش تماس خروجی"</item>
+    <item msgid="7775674394089376306">"اثر انگشت"</item>
+    <item msgid="3182815133441738779">"حسگرهای بدن"</item>
+    <item msgid="2793100005496829513">"خواندن پخش‌های سلولی"</item>
+    <item msgid="2633626056029384366">"مکان کاذب"</item>
+    <item msgid="8356842191824684631">"خواندن حافظه"</item>
+    <item msgid="5671906070163291500">"نوشتن در حافظه"</item>
+    <item msgid="2791955098549340418">"روشن کردن صفحه"</item>
+    <item msgid="5599435119609178367">"دریافت حساب‌ها"</item>
+    <item msgid="1165623660533024666">"اجرا در پس‌زمینه"</item>
+    <item msgid="6423861043647911030">"میزان دسترس‌پذیری"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"کوتاه"</item>
+    <item msgid="4816511817309094890">"متوسط"</item>
+    <item msgid="8305084671259331134">"طولانی"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"پیش‌فرض"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif فشرده"</item>
+    <item msgid="6529379119163117545">"Sans-serif با عرض ثابت"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif با عرض ثابت"</item>
+    <item msgid="4448481989108928248">"غیررسمی"</item>
+    <item msgid="4627069151979553527">"شکسته"</item>
+    <item msgid="6896773537705206194">"حروف بزرگ با اندازه کوچک"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"بسیار کوچک"</item>
+    <item msgid="5091603983404027034">"کوچک"</item>
+    <item msgid="176844712416932112">"عادی"</item>
+    <item msgid="2784236342175159295">"بزرگ"</item>
+    <item msgid="218913203203160606">"بسیار بزرگ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"پیش‌فرض"</item>
+    <item msgid="6488643537808152001">"هیچ‌کدام"</item>
+    <item msgid="552332815156010137">"نمای کلی"</item>
+    <item msgid="7187891159463789272">"سایه‌دار"</item>
+    <item msgid="8019330250538856521">"برجسته"</item>
+    <item msgid="8987385315647049787">"فرورفته"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"٪۲۵"</item>
+    <item msgid="4665048002584838262">"۵۰٪"</item>
+    <item msgid="1874668269931014581">"٪۷۵"</item>
+    <item msgid="6462911487571123954">"۱۰۰٪"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"استفاده از پیش‌فرض‌های برنامه"</item>
+    <item msgid="8611890312638868524">"سفید در سیاه"</item>
+    <item msgid="5891360837786277638">"سیاه در سفید"</item>
+    <item msgid="2798457065945456853">"زرد در سیاه"</item>
+    <item msgid="5799049811524553967">"زرد در آبی"</item>
+    <item msgid="3673930830658169860">"سفارشی"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN با گواهی"</item>
+    <item msgid="312397853907741968">"IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و احراز هویت Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN با گواهی و احراز هویت Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN دارای گواهی و احراز هویت دوگانه"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"هیچ‌کدام"</item>
+    <item msgid="1157046369795346308">"دفترچه راهنما"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"اتصال قطع شد"</item>
+    <item msgid="8754480102834556765">"آماده سازی..."</item>
+    <item msgid="3351334355574270250">"در حال اتصال..."</item>
+    <item msgid="8303882153995748352">"متصل"</item>
+    <item msgid="9135049670787351881">"وقفه زمانی"</item>
+    <item msgid="2124868417182583926">"ناموفق"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"سؤال شود"</item>
+    <item msgid="7718817231348607934">"همیشه غیرمجاز"</item>
+    <item msgid="8184570120217958741">"همیشه مجاز است"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"دائمی"</item>
+    <item msgid="167418068739176448">"فعالیت برتر"</item>
+    <item msgid="4760813290195199773">"مهم (پیش‌زمینه)"</item>
+    <item msgid="2328684826817647595">"مهم (پس‌زمینه)"</item>
+    <item msgid="7746406490652867365">"پشتیبان‌گیری"</item>
+    <item msgid="5597404364389196754">"سنگین وزن"</item>
+    <item msgid="1290888779300174556">"سرویس (در حال اجرا)"</item>
+    <item msgid="7241098542073939046">"سرویس (در حال شروع مجدد)"</item>
+    <item msgid="6610439017684111046">"دریافت‌کننده"</item>
+    <item msgid="7367606086319921117">"صفحه اصلی"</item>
+    <item msgid="3344660712396741826">"آخرین فعالیت"</item>
+    <item msgid="5006559348883303865">"قرار داده شده در حافظه پنهان (فعالیت)"</item>
+    <item msgid="8633480732468137525">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
+    <item msgid="6248998242443333892">"قرار داده شده در حافظه پنهان (خالی)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"فیروزه‌ای"</item>
+    <item msgid="3228505970082457852">"آبی"</item>
+    <item msgid="6590260735734795647">"نیلی"</item>
+    <item msgid="3521763377357218577">"بنفش"</item>
+    <item msgid="5932337981182999919">"صورتی"</item>
+    <item msgid="5642914536624000094">"قرمز"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"بیش از ۳۰ روز پیش"</item>
+    <item msgid="8699273238891265610">"بیش از ۶۰ روز پیش"</item>
+    <item msgid="8346279419423837266">"بیش از ۹۰ روز پیش"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"۱"</item>
+    <item msgid="3118234477029486741">"۰"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"تشخیص خودکار"</item>
+    <item msgid="773943026484148895">"محدودشده حساب شود"</item>
+    <item msgid="1008268820118852416">"محدودنشده حساب شود"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"استفاده از MAC تصادفی (پیش‌فرض)"</item>
+    <item msgid="214234417308375326">"استفاده از MAC دستگاه"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"نه"</item>
+    <item msgid="1930581185557754880">"بله"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"تیره"</item>
+    <item msgid="5079453644557603349">"روشن"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"خاموش"</item>
+    <item msgid="4072198137051566919">"اشکال‌زدایی"</item>
+    <item msgid="2473005316958868509">"درازنویسی"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"فقط خانه"</item>
+    <item msgid="1161026694891024702">"خودکار"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA برگزیده"</item>
+    <item msgid="7581481130337402578">"فقط GSM"</item>
+    <item msgid="8579197487913425819">"فقط WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA خودکار"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo خودکار"</item>
+    <item msgid="4219607161971472471">"CDMA بدون EvDo"</item>
+    <item msgid="7278975240951052041">"فقط EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"جهانی"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"فقط TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"جهانی"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fa/strings.xml b/tests/CarDeveloperOptions/res/values-fa/strings.xml
index 4f855c9..23f8022 100644
--- a/tests/CarDeveloperOptions/res/values-fa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fa/strings.xml
@@ -88,7 +88,7 @@
     <string name="font_size_preview_text_headline" msgid="8038650525913995091">"نوشتار نمونه"</string>
     <string name="font_size_preview_text_title" msgid="2593520249400910305">"جادوگر شهر اوز"</string>
     <string name="font_size_preview_text_subtitle" msgid="6106782964143379331">"فصل ۱۱: شهر زمردی شگفت‌انگیز اوز"</string>
-    <string name="font_size_preview_text_body" msgid="6803085337474390845">"با وجودی که دورتی و دوستانش عینک‌هایی سبز به چشم داشتند چشمانشان در اولین نگاه از درخشندگی این شهر فوق‌العاده خیره شد. خیابان‌ها با ردیف خانه‌هایی که همه از مرمر سبز ساخته شده بودند و در همه جای آن با زمردهای درخشنده تزئین شده بود می‌درخشید. آنها در پیاده‌رویی از همان مرمر سبز راه می‌رفتند و سنگفرش‌های پیاده‌رو با ردیف‌های زمردی که نزدیک به هم قرار گرفته بودند و در نور خورشید می‌درخشیدند به هم پیوسته بود. قاب‌های پنجره‌ها از شیشه سبز بود؛ حتی آسمان بالای شهر رنگ‌مایه سبز داشت و اشعه خورشید سبزرنگ بود. \n\nمردم زیادی از مرد و زن و بچه در اطراف راه می‌رفتند که همه لباس‌های سبزی پوشیده بودند و پوست بدنشان ته رنگ سبزی داشت. آنها به دوروتی و دوستان عجیبش با تعجب نگاه می‌کردند. بچه‌ها به‌محض دیدن شیر همه فرار کردند و پشت سر مادرانشان پنهان شدند؛ اما هیچ‌کس با آنها صحبت نکرد. تعداد زیادی مغازه در خیابان بود و دوروتی متوجه شد که همه‌چیز در این مغازه‌ها به رنگ سبز است. آبنبات سبز و پف فیل سبز برای فروش گذاشته شده بود، همین‌طور همه مدل کفش، کلاه و لباس که همه به رنگ سبز بودند. در جایی مردی لیموناد سبز می‌فروخت و وقتی بچه‌ها از او خرید می‌کردند دوروتی دید که پول آن را با سکه‌هایی سبزرنگ پرداختند. \n\nبه‌نظر می‌رسید که اسب یا حیوان دیگری در آنجا نیست؛ مردها چیزها را با گاری‌های کوچک سبزی به این طرف و آن طرف حمل می‌کردند و گاری را در جلوشان هل می‌دادند. به‌نظر می‌رسید همه شاد و راضی و مرفه بودند."</string>
+    <string name="font_size_preview_text_body" msgid="6803085337474390845">"با وجودی که دورتی و دوستانش عینک‌هایی سبز به چشم داشتند چشمانشان در اولین نگاه از درخشندگی این شهر فوق‌العاده خیره شد. خیابان‌ها با ردیف خانه‌هایی که همه از مرمر سبز ساخته شده بودند و در همه جای آن با زمردهای درخشنده تزئین شده بود می‌درخشید. آن‌ها در پیاده‌رویی از همان مرمر سبز راه می‌رفتند و سنگفرش‌های پیاده‌رو با ردیف‌های زمردی که نزدیک به هم قرار گرفته بودند و در نور خورشید می‌درخشیدند به هم پیوسته بود. قاب‌های پنجره‌ها از شیشه سبز بود؛ حتی آسمان بالای شهر رنگ‌مایه سبز داشت و اشعه خورشید سبزرنگ بود. \n\nمردم زیادی از مرد و زن و بچه در اطراف راه می‌رفتند که همه لباس‌های سبزی پوشیده بودند و پوست بدنشان ته رنگ سبزی داشت. آن‌ها به دوروتی و دوستان عجیبش با تعجب نگاه می‌کردند. بچه‌ها به‌محض دیدن شیر همه فرار کردند و پشت سر مادرانشان پنهان شدند؛ اما هیچ‌کس با آن‌ها صحبت نکرد. تعداد زیادی مغازه در خیابان بود و دوروتی متوجه شد که همه‌چیز در این مغازه‌ها به رنگ سبز است. آبنبات سبز و پف فیل سبز برای فروش گذاشته شده بود، همین‌طور همه مدل کفش، کلاه و لباس که همه به رنگ سبز بودند. در جایی مردی لیموناد سبز می‌فروخت و وقتی بچه‌ها از او خرید می‌کردند دوروتی دید که پول آن را با سکه‌هایی سبزرنگ پرداختند. \n\nبه‌نظر می‌رسید که اسب یا حیوان دیگری در آنجا نیست؛ مردها چیزها را با گاری‌های کوچک سبزی به این طرف و آن طرف حمل می‌کردند و گاری را در جلوشان هل می‌دادند. به‌نظر می‌رسید همه شاد و راضی و مرفه بودند."</string>
     <string name="font_size_save" msgid="8652044574655753921">"تأیید"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="1533784309105748696">"حافظهٔ USB"</string>
     <string name="sdcard_setting" product="default" msgid="8398782065765523178">"کارت SD"</string>
@@ -280,7 +280,7 @@
     <string name="action_drag_label_move_up" msgid="2074064283966078352">"انتقال به بالا"</string>
     <string name="action_drag_label_move_down" msgid="1367989732445492291">"انتقال به پایین"</string>
     <string name="action_drag_label_move_top" msgid="2033098833739345957">"انتقال به بالا"</string>
-    <string name="action_drag_label_move_bottom" msgid="5583190721915611567">"انتقال به آخر"</string>
+    <string name="action_drag_label_move_bottom" msgid="5583190721915611567">"انتقال به پایین"</string>
     <string name="action_drag_label_remove" msgid="3362982836323040394">"حذف زبان"</string>
     <string name="activity_picker_label" msgid="3766230432501240226">"انتخاب فعالیت"</string>
     <string name="device_info_label" msgid="3595300783366015212">"اطلاعات دستگاه"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. همچنین به گزینه قفل صفحه نیاز دارید تا احراز هویت ازطرق چهره را راه‌اندازی کنید. روی «لغو» ضربه بزنید و سپس پین تنظیم کنید یا گزینه قفل صفحه دیگری را انتخاب کنید."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"راه‌اندازی پین رد شود؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"راه‌اندازی گذرواژه رد شود؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"راه‌اندازی الگو رد شود؟"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"تنظیم قفل صفحه"</string>
@@ -510,8 +509,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آنها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آنها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آن‌ها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که رایانه لوحی را روشن می‌کنید، قفل صفحه را برای رمزگشایی از رایانه لوحی باز کنید. تنها راه دیگر برای رمزگشایی، بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت رایانه لوحی‌تان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آن‌ها را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های بارگیری شده به‌علاوه داده‌های آن‌ها، رسانه‌ها و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه یک قفل صفحه تنظیم کرده‌اید (که می‌تواند یک الگو، پین عددی یا گذرواژه باشد)، باید هر بار که تلفن را روشن می‌کنید، قفل صفحه را برای رمزگشایی از تلفن باز کنید. تنها راه دیگر برای رمزگشایی بازنشانی داده‌های کارخانه و پاک کردن همه داده‌هایتان می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری شارژ کامل باشد و در طول این مدت تلفنتان همچنان به برق وصل باشد. اگر وقفه‌ای در فرآیند به وجود آید، بعضی از داده‌هایتان یا همه آن‌ها را از دست خواهید داد."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"رمزگذاری رایانهٔ لوحی شخصی"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
@@ -1017,7 +1016,7 @@
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4899310977865228904">"Wi-Fi پیشرفته"</string>
     <string name="wifi_advanced_ssid_title" msgid="4229741334913894856">"SSID"</string>
-    <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"آدرس MAC"</string>
+    <string name="wifi_advanced_mac_address_title" msgid="1162782083754021737">"نشانی MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="2708185994512829071">"نشانی IP"</string>
     <string name="wifi_details_title" msgid="2164042631550920157">"جزئیات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="53396707004763012">"پوشش زیرشبکه"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"داده شبکه تلفن همراه"</item>
+    <item msgid="6007360612667098926">"فقط Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1437,7 +1439,7 @@
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"این <xliff:g id="NAME_0">^1</xliff:g> به‌صورت ایمن بیرون رانده شد، اما هنوز موجود است. \n\nبرای استفاده از این <xliff:g id="NAME_1">^1</xliff:g>، باید ابتدا آن را بنشانید."</string>
     <string name="storage_dialog_unmountable" msgid="7082856306456936054">"این <xliff:g id="NAME_0">^1</xliff:g> خراب شده است. \n\nبرای استفاده از این <xliff:g id="NAME_1">^1</xliff:g>، باید ابتدا آن را راه‌اندازی کنید."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"این دستگاه از این <xliff:g id="NAME_0">^1</xliff:g> پشتیبانی نمی‌کند. برای استفاده از این \n\n <xliff:g id="NAME_1">^1</xliff:g> با این دستگاه، باید ابتدا آن را راه‌اندازی کنید."</string>
-    <string name="storage_internal_format_details" msgid="2780806013122012384">"بعد از قالب‌بندی، می‌توانید از این <xliff:g id="NAME_0">^1</xliff:g> در دستگاه‌های دیگر استفاده کنید. \n\nهمه اطلاعات در این <xliff:g id="NAME_1">^1</xliff:g> پاک می‌شود. پشتیبان گرفتن از اطلاعات را قبل از شروع کار در نظر بگیرید. \n\n"<b>"از عکس‌ها و رسانه‌های دیگر پشتیبان بگیرید"</b>" \nفایل‌های رسانه‌تان را به فضای ذخیره‌سازی دیگری در این دستگاه منتقل کنید یا با استفاده از کابل USB آنها را به رایانه منتقل کنید.\n\n"<b>"از برنامه‌ها پشتیبان بگیرید"</b>" \nهمه برنامه‌های ذخیره شده در این <xliff:g id="NAME_6">^1</xliff:g> حذف نصب می‌شوند و اطلاعات آنها پاک می‌شود. برای حفظ این برنامه‌ها، آنها را به فضای ذخیره‌سازی دیگری در دستگاه منتقل کنید."</string>
+    <string name="storage_internal_format_details" msgid="2780806013122012384">"بعد از قالب‌بندی، می‌توانید از این <xliff:g id="NAME_0">^1</xliff:g> در دستگاه‌های دیگر استفاده کنید. \n\nهمه اطلاعات در این <xliff:g id="NAME_1">^1</xliff:g> پاک می‌شود. پشتیبان گرفتن از اطلاعات را قبل از شروع کار در نظر بگیرید. \n\n"<b>"از عکس‌ها و رسانه‌های دیگر پشتیبان بگیرید"</b>" \nفایل‌های رسانه‌تان را به فضای ذخیره‌سازی دیگری در این دستگاه منتقل کنید یا با استفاده از کابل USB آن‌ها را به رایانه منتقل کنید.\n\n"<b>"از برنامه‌ها پشتیبان بگیرید"</b>" \nهمه برنامه‌های ذخیره شده در این <xliff:g id="NAME_6">^1</xliff:g> حذف نصب می‌شوند و اطلاعات آن‌ها پاک می‌شود. برای حفظ این برنامه‌ها، آن‌ها را به فضای ذخیره‌سازی دیگری در دستگاه منتقل کنید."</string>
     <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"وقتی این <xliff:g id="NAME_0">^1</xliff:g> را جدا می‌کنید، برنامه‌های ذخیره شده در آن دیگر کار نمی‌کنند و فایل‌های رسانه ذخیره شده در آن تا وقتی دوباره جاگذاری نشود، در دسترس نخواهند بود."</b>" \n\nاین <xliff:g id="NAME_1">^1</xliff:g> فقط برای کار در این دستگاه قالب‌بندی شده است و در دستگاه‌های دیگر کار نمی‌کند."</string>
     <string name="storage_internal_forget_details" msgid="5655856574682184453">"برای استفاده از برنامه‌ها، عکس‌ها یا اطلاعاتی که در این <xliff:g id="NAME">^1</xliff:g> وجود دارد، آن را دوباره جاگذاری کنید.\n\nیا می‌توانید، اگر دستگاه ذخیره‌سازی در دسترس نیست، فراموش کردن آن را انتخاب کنید.\n\nاگر فراموش کردن را انتخاب کنید، همه داده‌هایی که در این دستگاه وجود دارد، برای همیشه از دست می‌رود.\n\nمی‌توانید بعداً برنامه‌ها را دوباره نصب کنید، اما داده‌های ذخیره شده آن‌ها در این دستگاه از بین می‌رود."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> فراموش شود؟"</string>
@@ -1459,9 +1461,9 @@
     <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"استفاده به عنوان حافظه داخلی"</string>
     <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"برای ذخیره کردن هر چیز فقط در این دستگاه، از جمله برنامه‌ها و عکس‌ها. به قالب‌بندی نیاز دارد که مانع از کار کردن آن با دستگاه‌های دیگر می‌شود."</string>
     <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"قالب‌بندی به عنوان حافظه داخلی"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"انجام قالب‌بندی <xliff:g id="NAME_0">^1</xliff:g> برای ایمن کردن آن لازم است. \n\nبعد از قالب‌بندی، این <xliff:g id="NAME_1">^1</xliff:g> فقط در این دستگاه کار می‌کند. \n\n"<b>"قالب‌بندی همه داده‌هایی را که درحال‌حاضر در <xliff:g id="NAME_2">^1</xliff:g> ذخیره شده است، پاک می‌کند."</b>"برای از دست ندادن داده، حتماً از آنها پشتیبان‌گیری کنید."</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"انجام قالب‌بندی <xliff:g id="NAME_0">^1</xliff:g> برای ایمن کردن آن لازم است. \n\nبعد از قالب‌بندی، این <xliff:g id="NAME_1">^1</xliff:g> فقط در این دستگاه کار می‌کند. \n\n"<b>"قالب‌بندی همه داده‌هایی را که درحال‌حاضر در <xliff:g id="NAME_2">^1</xliff:g> ذخیره شده است، پاک می‌کند."</b>"برای از دست ندادن داده، حتماً از آن‌ها پشتیبان‌گیری کنید."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="5866830103788091426">"قالب‌بندی به‌عنوان فضای قابل حمل"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"برای این کار قالب‌بندی <xliff:g id="NAME_0">^1</xliff:g> لازم است.\n\n"<b>"قالب‌بندی همه داده‌هایی را که درحال‌حاضر در <xliff:g id="NAME_1">^1</xliff:g> ذخیره شده است، پاک می‌کند."</b>" برای از دست ندادن داده‌ها، از آنها پشتیبان بگیرید."</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"برای این کار قالب‌بندی <xliff:g id="NAME_0">^1</xliff:g> لازم است.\n\n"<b>"قالب‌بندی همه داده‌هایی را که درحال‌حاضر در <xliff:g id="NAME_1">^1</xliff:g> ذخیره شده است، پاک می‌کند."</b>" برای از دست ندادن داده‌ها، از آن‌ها پشتیبان بگیرید."</string>
     <string name="storage_wizard_format_confirm_next" msgid="236947984802247625">"پاک کردن و قالب‌بندی"</string>
     <string name="storage_wizard_format_progress_title" msgid="6905902731208646436">"در حال قالب‌بندی <xliff:g id="NAME">^1</xliff:g>..."</string>
     <string name="storage_wizard_format_progress_body" msgid="5346709539457190419">"درحین قالب‌بندی، <xliff:g id="NAME">^1</xliff:g> را جدا نکنید."</string>
@@ -1844,7 +1846,7 @@
     <string name="filter_dlg_title" msgid="115313222190512670">"انتخاب گزینه‌های فیلتر"</string>
     <string name="filter_apps_all" msgid="3938077534861382701">"همه برنامه‌ها"</string>
     <string name="filter_apps_disabled" msgid="5394488790555678117">"برنامه‌های غیرفعال‌شده"</string>
-    <string name="filter_apps_third_party" msgid="3985794876813232322">"دانلودشده"</string>
+    <string name="filter_apps_third_party" msgid="3985794876813232322">"بارگیری‌شده"</string>
     <string name="filter_apps_running" msgid="6852975378502426359">"در حال اجرا"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="3501701148760911442">"حافظهٔ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="135989136394672864">"در کارت SD"</string>
@@ -2169,7 +2171,7 @@
     <string name="color_blue" msgid="4055855996393833996">"آبی"</string>
     <string name="color_cyan" msgid="7669317410901991453">"سبز آبی"</string>
     <string name="color_yellow" msgid="8847327436896180799">"زرد"</string>
-    <string name="color_magenta" msgid="721976999611563071">"زرشکی"</string>
+    <string name="color_magenta" msgid="721976999611563071">"سرخابی"</string>
     <string name="enable_service_title" msgid="2746143093464928251">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="8177719542886123788">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"چون برنامه‌ای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمی‌تواند پاسخ شما را تأیید کند."</string>
@@ -2270,9 +2272,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="203494973250969040">"عمر باتری رایانه لوحی‌تان را بهبود ببخشید"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="7419448992583346364">"عمر باتری دستگاهتان را بهبود ببخشید"</string>
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"مدیر باتری را روشن کنید"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"بهینه‌سازی باتری را روشن کنید"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"«بهینه‌سازی باتری» را روشن کنید"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"ممکن است شارژ باتری زودتر از معمول تمام شود"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"بهینه‌سازی باتری روشن است"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"«بهینه‌سازی باتری» روشن است"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"ممکن است بعضی از ویژگی‌ها محدود شود"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="4103005178310487352">"تلفن بیشتر از حد معمول استفاده شده است"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"رایانه لوحی بیشتر از حد معمول استفاده شده است"</string>
@@ -2310,9 +2312,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"این برنامه می‌تواند در پس‌زمینه از باتری استفاده کند. ممکن است شارژ باتری زودتر از حد انتظار تمام شود."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"برداشتن"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"لغو"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"میزان باتری مصرفی توسط برنامه‌هایتان معمولی است. اگر برنامه‌ها بیش‌ازحد باتری مصرف کنند، تلفنتان کنش‌هایی پیشنهاد می‌کند که می‌توانید انجام دهید.\n\nاگر باتری رو به اتمام باشد، همیشه می‌توانید بهینه‌سازی باتری را روشن کنید."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"میزان باتری مصرفی توسط برنامه‌هایتان معمولی است. اگر برنامه‌ها بیش‌ازحد باتری مصرف کنند، رایانه لوحی‌تان کنش‌هایی پیشنهاد می‌کند که می‌توانید انجام دهید.\n\nاگر باتری رو به اتمام باشد، همیشه می‌توانید بهینه‌سازی باتری را روشن کنید."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"میزان باتری مصرفی برنامه‌هایتان معمولی است. اگر برنامه‌ها بیش‌ازحد باتری مصرف کنند، دستگاهتان کنش‌هایی پیشنهاد می‌کند که می‌توانید انجام دهید.\n\nاگر باتری رو به اتمام باشد، همیشه می‌توانید بهینه‌سازی باتری را روشن کنید."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"میزان باتری مصرفی توسط برنامه‌هایتان معمولی است. اگر برنامه‌ها بیش‌ازحد باتری مصرف کنند، تلفنتان کنش‌هایی پیشنهاد می‌کند که می‌توانید انجام دهید.\n\nاگر باتری رو به اتمام باشد، همیشه می‌توانید «بهینه‌سازی باتری» را روشن کنید."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"میزان باتری مصرفی توسط برنامه‌هایتان معمولی است. اگر برنامه‌ها بیش‌ازحد باتری مصرف کنند، رایانه لوحی‌تان کنش‌هایی پیشنهاد می‌کند که می‌توانید انجام دهید.\n\nاگر باتری رو به اتمام باشد، همیشه می‌توانید «بهینه‌سازی باتری» را روشن کنید."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"میزان باتری مصرفی برنامه‌هایتان معمولی است. اگر برنامه‌ها بیش‌ازحد باتری مصرف کنند، دستگاهتان کنش‌هایی پیشنهاد می‌کند که می‌توانید انجام دهید.\n\nاگر باتری رو به اتمام باشد، همیشه می‌توانید «بهینه‌سازی باتری» را روشن کنید."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"مدیر باتری"</string>
     <string name="smart_battery_title" msgid="4919670408532804351">"مدیریت خودکار برنامه‌ها"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"محدود کردن باتری برای برنامه‌هایی که زیاد استفاده نمی‌کنید"</string>
@@ -2448,13 +2450,13 @@
     <string name="battery_saver_auto_percentage_summary" msgid="2036128588460338677">"در <xliff:g id="PERCENT">%1$s</xliff:g> روشن خواهد شد"</string>
     <string name="battery_saver_schedule_settings_title" msgid="574233428557678128">"تنظیم زمان‌بندی"</string>
     <string name="battery_saver_sticky_title_new" msgid="5328707297110866082">"وقتی شارژ کامل شد، خاموش شود"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"وقتی شارژ تلفن <xliff:g id="PERCENT">%1$s</xliff:g> باشد، بهینه‌سازی باتری خاموش می‌شود"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"وقتی شارژ رایانه لوحی <xliff:g id="PERCENT">%1$s</xliff:g> باشد، بهینه‌سازی باتری خاموش می‌شود"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"وقتی شارژ دستگاه <xliff:g id="PERCENT">%1$s</xliff:g> باشد، بهینه‌سازی باتری خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="3406582427270935879">"وقتی شارژ تلفن <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="3284967694001857194">"وقتی شارژ رایانه لوحی <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="5056520668081504111">"وقتی شارژ دستگاه <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
     <!-- no translation found for battery_saver_seekbar_title (7607123201469333645) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="2321082163892561703">"روشن کردن"</string>
-    <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"استفاده از بهینه‌سازی باتری"</string>
+    <string name="battery_saver_master_switch_title" msgid="8241862826825517212">"استفاده از «بهینه‌سازی باتری»"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7316920304024245838">"روشن شدن خودکار"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"هیچ‌وقت"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"در <xliff:g id="PERCENT">%1$s</xliff:g> باتری"</string>
@@ -2501,7 +2503,7 @@
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"سرویس‌های ورودی گفتاری"</string>
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"کلیدگفته کامل و تعامل"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"ویژگی ساده گفتار به نوشتار"</string>
-    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"این سرویس ورودی گفتاری می‌تواند کنترل صوتی همیشه فعال را اجرا کند و از طرف شما برنامه‌هایی را کنترل کند که صدا در آنها فعال است. از <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> است. استفاده از این سرویس فعال شود؟"</string>
+    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"این سرویس ورودی گفتاری می‌تواند کنترل صوتی همیشه فعال را اجرا کند و از طرف شما برنامه‌هایی را کنترل کند که صدا در آن‌ها فعال است. از <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> است. استفاده از این سرویس فعال شود؟"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"موتور ترجیحی"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"تنظیمات موتور"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"زیروبمی و سرعت گفتار"</string>
@@ -3366,7 +3368,7 @@
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"دسترسی به اعلان برای <xliff:g id="SERVICE">%1$s</xliff:g> مجاز شود؟"</string>
     <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> می‌تواند همه اعلان‌ها را بخواند، ازجمله اطلاعات شخصی مانند نام مخاطبین و پیام‌های نوشتاری که دریافت می‌کنید. همچنین می‌تواند اعلان‌ها را تغییر دهد، رد کند یا دکمه‌های عملکرد موجود در آن‌ها را راه‌اندازی کند. \n\nهمچنین به این برنامه امکان می‌دهد «مزاحم نشوید» را روشن یا خاموش کند و تنظیمات مربوطه را تغییر دهد."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"به دسترسی به اعلان برای <xliff:g id="SERVICE">%1$s</xliff:g> اجازه می‌دهید؟"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> می‌تواند همه اعلان‌ها را بخواند، از جمله اطلاعات شخصی مانند نام مخاطبین و پیام‌های نوشتاری که دریافت می‌کنید. همچنین می‌تواند اعلان‌ها را رد کند یا دکمه عمل آنها را فعال کند. \n\nهمچنین به این برنامه توانایی روشن یا خاموش کردن «مزاحم نشوید» و تغییر تنظیمات مربوطه را می‌دهد."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> می‌تواند همه اعلان‌ها را بخواند، از جمله اطلاعات شخصی مانند نام مخاطبین و پیام‌های نوشتاری که دریافت می‌کنید. همچنین می‌تواند اعلان‌ها را رد کند یا دکمه عمل آن‌ها را فعال کند. \n\nهمچنین به این برنامه توانایی روشن یا خاموش کردن «مزاحم نشوید» و تغییر تنظیمات مربوطه را می‌دهد."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"اگر دسترسی اعلان را برای <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> خاموش کنید، دسترسی «مزاحم نشوید» نیز ممکن است خاموش شود."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"خاموش کردن"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"لغو"</string>
@@ -3797,7 +3799,7 @@
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"برنامه‌ها"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"نمایش روی سایر برنامه‌ها"</string>
     <string name="permit_draw_overlay" msgid="9039092257052422344">"مجاز کردن نمایش روی سایر برنامه‌ها"</string>
-    <string name="allow_overlay_description" msgid="6669524816705082807">"به برنامه‌‌‌ اجازه می‌دهد روی سایر برنامه‌هایی که درحال استفاده از آنها هستید نشان داده شود. ممکن است این قابلیت در استفاده شما از آن برنامه‌ها تداخل ایجاد کند یا طرز نمایش یا عملکرد آنها را تغییر دهد."</string>
+    <string name="allow_overlay_description" msgid="6669524816705082807">"به برنامه‌‌‌ اجازه می‌دهد روی سایر برنامه‌هایی که درحال استفاده از آن‌ها هستید نشان داده شود. ممکن است این قابلیت در استفاده شما از آن برنامه‌ها تداخل ایجاد کند یا طرز نمایش یا عملکرد آن‌ها را تغییر دهد."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr واقعیت مجازی شنونده استریو یاور خدمات"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"نمایش کادر گفتگوی هشدار سیستم روی سایر برنامه‌ها"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"نمایش روی سایر برنامه‌ها"</string>
@@ -3886,7 +3888,7 @@
     <string name="condition_zen_title" msgid="2128184708916052585">"«مزاحم نشوید» روشن است"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"تلفن بی‌صدا است"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"بدون استثنا"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"بهینه‌سازی باتری روشن است"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"«بهینه‌سازی باتری» روشن است"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"ویژگی‌ها محدود شده‌اند"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"داده شبکه تلفن همراه خاموش است"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"اینترنت فقط ازطریق Wi‑Fi دردسترس است"</string>
@@ -4117,7 +4119,7 @@
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"برای بررسی رایانه لوحی، دو ضربه سریع بزنید"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"برای بررسی دستگاه، دو ضربه سریع بزنید"</string>
     <string name="ambient_display_summary" msgid="4882910328216411109">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش دو ضربه سریع بزنید."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"برای بررسی تلفن، آن را بردارید"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"بررسی تلفن با برداشتن"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="1555456400210301959">"برای بررسی رایانه لوحی، آن را بردارید"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="2480126522988135037">"برای بررسی دستگاه، آن را بردارید"</string>
     <string name="ambient_display_wake_screen_title" msgid="3376988352851077102">"روشن کردن نمایشگر"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"این کار عملکرد تلفن را کند می‌کند"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"اجرای کامل اندازه‌گیری GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"بدون دوره کاری، همه دسته عکس‌های پانوراما و فرکانس‌ها را ردیابی کنید."</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"اشکال‌زدایی تغییر کاربر"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"اطلاعات دقیقی درحین تغییر کاربر نمایش داده می‌شود"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"اجازه دادن به شروع فعالیت پس‌زمینه"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"به همه فعالیت‌های پس‌زمینه اجازه شروع می‌دهد"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"همیشه کادر گفتگوی خرابی نمایش داده شود"</string>
diff --git a/tests/CarDeveloperOptions/res/values-fi-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-fi-nokeys/strings.xml
new file mode 100644
index 0000000..a391f6e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fi-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Hallinnoi sovelluksia"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fi/arrays.xml b/tests/CarDeveloperOptions/res/values-fi/arrays.xml
new file mode 100644
index 0000000..2a383bb
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fi/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerikka"</item>
+    <item msgid="4791956477275129121">"Eurooppa"</item>
+    <item msgid="3812126832016254559">"Afrikka"</item>
+    <item msgid="2765816300353408280">"Aasia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Tyynimeri"</item>
+    <item msgid="7044520255415007865">"Kaikki"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekuntia"</item>
+    <item msgid="772029947136115322">"30 sekuntia"</item>
+    <item msgid="8743663928349474087">"1 minuutti"</item>
+    <item msgid="1506508631223164814">"2 minuuttia"</item>
+    <item msgid="8664703938127907662">"5 minuuttia"</item>
+    <item msgid="5827960506924849753">"10 minuuttia"</item>
+    <item msgid="6677424950124253938">"30 minuuttia"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Ei koskaan"</item>
+    <item msgid="2517785806387977252">"15 sekuntia"</item>
+    <item msgid="6347954399441173672">"30 sekuntia"</item>
+    <item msgid="4858305253279921789">"1 minuutti"</item>
+    <item msgid="8109273437140044073">"2 minuuttia"</item>
+    <item msgid="2788593551142462622">"5 minuuttia"</item>
+    <item msgid="8012672183888404961">"10 minuuttia"</item>
+    <item msgid="8271452751594598661">"30 minuuttia"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Heti"</item>
+    <item msgid="2038544972632026612">"5 sekuntia"</item>
+    <item msgid="5558060663472279597">"15 sekuntia"</item>
+    <item msgid="45341168505452037">"30 sekuntia"</item>
+    <item msgid="227647485917789272">"1 minuutti"</item>
+    <item msgid="3367011891231217504">"2 minuuttia"</item>
+    <item msgid="4376575879222393045">"5 minuuttia"</item>
+    <item msgid="811192536981678974">"10 minuuttia"</item>
+    <item msgid="7258394417241706272">"30 minuuttia"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Pieni"</item>
+    <item msgid="591935967183159581">"Oletus"</item>
+    <item msgid="1714184661981538355">"Suuri"</item>
+    <item msgid="6195563047686707484">"Suurin"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Etsitään..."</item>
+    <item msgid="5597394826455877834">"Yhdistetään…"</item>
+    <item msgid="5848277343965362748">"Varmennetaan..."</item>
+    <item msgid="3391238031431440676">"Haetaan IP-osoitetta..."</item>
+    <item msgid="5257597310494000224">"Yhdistetty"</item>
+    <item msgid="8472497592913050396">"Pidätetty"</item>
+    <item msgid="1228072488815999109">"Katkaistaan yhteyttä..."</item>
+    <item msgid="7253087004422991731">"Yhteys katkaistu"</item>
+    <item msgid="4169850917304751227">"Epäonnistui"</item>
+    <item msgid="6266658166690831131">"Estetty"</item>
+    <item msgid="4517230805854909775">"Vältetään huonoa yhteyttä tilapäisesti"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Etsitään..."</item>
+    <item msgid="8058143476674427024">"Yhdistetään verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Varmennetaan verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Haetaan IP-osoitetta verkosta <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="3283243151651124831">"Yhdistetty verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Pidätetty"</item>
+    <item msgid="4133290864821295785">"Katkaistaan yhteys verkosta <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Yhteys katkaistu"</item>
+    <item msgid="2847316776634969068">"Epäonnistui"</item>
+    <item msgid="4390990424746035383">"Estetty"</item>
+    <item msgid="3618248791367063949">"Vältetään huonoa yhteyttä tilapäisesti"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Paina painiketta"</item>
+    <item msgid="7401896200768713930">"Vertaislaitteen PIN-koodi"</item>
+    <item msgid="4526848028011846710">"PIN-koodi laitteelta"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Yhdistetty"</item>
+    <item msgid="983792611851499732">"Kutsuttu"</item>
+    <item msgid="5438273405428201793">"Epäonnistui"</item>
+    <item msgid="4646663015449312554">"Saatavilla"</item>
+    <item msgid="3230556734162006146">"Katvealueella"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuuttia"</item>
+    <item msgid="2759776603549270587">"5 minuuttia"</item>
+    <item msgid="167772676068860015">"1 tunti"</item>
+    <item msgid="5985477119043628504">"Ei aikakatkaisua"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Käytä järjestelmän oletusasetusta: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Heikko"</item>
+    <item msgid="7882129634982603782">"Huono"</item>
+    <item msgid="6457357501905996224">"Kohtalainen"</item>
+    <item msgid="405271628162918841">"Hyvä"</item>
+    <item msgid="999948812884919584">"Erinomainen"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 viime päivää"</item>
+    <item msgid="3211287705232736964">"Aseta käyttöjakso…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Käyttöaika"</item>
+    <item msgid="2784401352592276015">"Viimeinen käyttöaika"</item>
+    <item msgid="249854287216326349">"Sovelluksen nimi"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ei yhtään"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"–"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ei yhtään"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Staattinen"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ei yhtään"</item>
+    <item msgid="1464741437353223198">"Käyttöopas"</item>
+    <item msgid="5793600062487886090">"Välitysp. autom. määritys"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ei yhtään"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP tai CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Määrittelemätön"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ei mitään"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Laitteen sisäinen tallennustila"</item>
+    <item msgid="3186681694079967527">"Poistettava SD-kortti"</item>
+    <item msgid="6902033473986647035">"Anna järjestelmän päättää"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Sijainti"</item>
+    <item msgid="6842381562497597649">"Henkilökohtainen"</item>
+    <item msgid="3966700236695683444">"Viestit"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Laite"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"karkea sijainti"</item>
+    <item msgid="1830619568689922920">"tarkka sijainti"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"värinä"</item>
+    <item msgid="8632513128515114092">"lue yhteystietoja"</item>
+    <item msgid="3741042113569620272">"muokkaa yhteystietoja"</item>
+    <item msgid="4204420969709009931">"lue puhelulokia"</item>
+    <item msgid="2260380357119423209">"muokkaa puhelulokia"</item>
+    <item msgid="6550710385014530934">"lue kalenteria"</item>
+    <item msgid="3575906174264853951">"muokkaa kalenteria"</item>
+    <item msgid="4319843242568057174">"Wi-Fi-haku"</item>
+    <item msgid="2981791890467303819">"ilmoitus"</item>
+    <item msgid="6617825156152476692">"soluhaku"</item>
+    <item msgid="8865260890611559753">"soita numeroon"</item>
+    <item msgid="3254999273961542982">"lue tekstiviestejä"</item>
+    <item msgid="7711446453028825171">"kirjoita tekstiviestejä"</item>
+    <item msgid="6123238544099198034">"vastaanota tekstiviestejä"</item>
+    <item msgid="838342167431596036">"vastaanota hätätekstiviestejä"</item>
+    <item msgid="8554432731560956686">"vastaanota multimediaviestejä"</item>
+    <item msgid="7464863464299515059">"vastaanota WAP push -viestejä"</item>
+    <item msgid="310463075729606765">"lähetä tekstiviestejä"</item>
+    <item msgid="7338021933527689514">"lue ICC-tekstiviestejä"</item>
+    <item msgid="6130369335466613036">"kirjoita ICC-tekstiviestejä"</item>
+    <item msgid="6536865581421670942">"muokkaa asetuksia"</item>
+    <item msgid="4547203129183558973">"piirrä päälle"</item>
+    <item msgid="9080347512916542840">"käytä ilmoituksia"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"tallenna ääntä"</item>
+    <item msgid="9182794235292595296">"toista ääntä"</item>
+    <item msgid="8760743229597702019">"lue leikepöytä"</item>
+    <item msgid="2266923698240538544">"muokkaa leikepöytää"</item>
+    <item msgid="1801619438618539275">"mediapainikkeet"</item>
+    <item msgid="31588119965784465">"äänen painopiste"</item>
+    <item msgid="7565226799008076833">"pää-äänenvoimakkuus"</item>
+    <item msgid="5420704980305018295">"puheäänen voimakkuus"</item>
+    <item msgid="5797363115508970204">"soittoäänen voimakkuus"</item>
+    <item msgid="8233154098550715999">"median äänenvoimakkuus"</item>
+    <item msgid="5196715605078153950">"hälytyksen äänenvoimakkuus"</item>
+    <item msgid="394030698764284577">"ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="8952898972491680178">"bluetooth-äänenvoimakkuus"</item>
+    <item msgid="8506227454543690851">"ei virransäästötilaa"</item>
+    <item msgid="1108160036049727420">"sijainnin seuranta"</item>
+    <item msgid="1496205959751719491">"seuraa suuritehoista sijaintia"</item>
+    <item msgid="3776296279910987380">"hae käyttötilastot"</item>
+    <item msgid="8827100324471975602">"mykistä mikrofoni / poista mykistys"</item>
+    <item msgid="6880736730520126864">"näytä ilmoitus"</item>
+    <item msgid="4933375960222609935">"lähetä media"</item>
+    <item msgid="8357907018938895462">"aktivoi VPN"</item>
+    <item msgid="8143812849911310973">"kirjoita taustakuva"</item>
+    <item msgid="6266277260961066535">"apurakenne"</item>
+    <item msgid="7715498149883482300">"apukuvakaappaus"</item>
+    <item msgid="4046679376726313293">"tarkastele puhelimen tilaa"</item>
+    <item msgid="6329507266039719587">"lisää vastaajaviesti"</item>
+    <item msgid="7692440726415391408">"käytä SIP:tä"</item>
+    <item msgid="8572453398128326267">"käsittele lähtevä puhelu"</item>
+    <item msgid="7775674394089376306">"sormenjälki"</item>
+    <item msgid="3182815133441738779">"kehon anturit"</item>
+    <item msgid="2793100005496829513">"tarkastele solulähetyksiä"</item>
+    <item msgid="2633626056029384366">"käytä imitoitua sijaintia"</item>
+    <item msgid="8356842191824684631">"tarkastele tallennustilaa"</item>
+    <item msgid="5671906070163291500">"kirjoita tallennustilaan"</item>
+    <item msgid="2791955098549340418">"kytke näyttö päälle"</item>
+    <item msgid="5599435119609178367">"hae tilit"</item>
+    <item msgid="1165623660533024666">"toimi taustalla"</item>
+    <item msgid="6423861043647911030">"esteettömyys äänenvoimakkuus"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Lyhyt"</item>
+    <item msgid="4816511817309094890">"Keskitaso"</item>
+    <item msgid="8305084671259331134">"Pitkä"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Oletus"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif, tiivistetty"</item>
+    <item msgid="6529379119163117545">"Sans Serif Monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif Monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Kursiivi"</item>
+    <item msgid="6896773537705206194">"Isot kirjaimet"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Hyvin pieni"</item>
+    <item msgid="5091603983404027034">"Pieni"</item>
+    <item msgid="176844712416932112">"Normaali"</item>
+    <item msgid="2784236342175159295">"Suuri"</item>
+    <item msgid="218913203203160606">"Hyvin suuri"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Oletus"</item>
+    <item msgid="6488643537808152001">"Ei yhtään"</item>
+    <item msgid="552332815156010137">"Ääriviiva"</item>
+    <item msgid="7187891159463789272">"Varjostus"</item>
+    <item msgid="8019330250538856521">"Korotettu"</item>
+    <item msgid="8987385315647049787">"Laskettu"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Käytä sovelluksen oletusarvoja"</item>
+    <item msgid="8611890312638868524">"Valkoinen mustalla"</item>
+    <item msgid="5891360837786277638">"Musta valkoisella"</item>
+    <item msgid="2798457065945456853">"Keltainen mustalla"</item>
+    <item msgid="5799049811524553967">"Keltainen sinisellä"</item>
+    <item msgid="3673930830658169860">"Muokattu"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"Esijaettuun avaimeen perustuva L2TP-/IPSec-VPN-verkko"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec-suojattu VPN-verkko varmenteilla"</item>
+    <item msgid="312397853907741968">"Esijaettuun avaimeen perustuva IPSec-suojattu VPN-verkko Xauth-todennuksella"</item>
+    <item msgid="3319427315593649917">"IPSec-suojattu VPN-verkko varmenteilla ja Xauth-todennuksella"</item>
+    <item msgid="8258927774145391041">"IPSec-suojattu VPN-verkko varmenteilla ja hybriditodennuksella"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ei mitään"</item>
+    <item msgid="1157046369795346308">"Käyttöopas"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Yhteys katkaistu"</item>
+    <item msgid="8754480102834556765">"Alustetaan..."</item>
+    <item msgid="3351334355574270250">"Yhdistetään…"</item>
+    <item msgid="8303882153995748352">"Yhdistetty"</item>
+    <item msgid="9135049670787351881">"Aikaraja"</item>
+    <item msgid="2124868417182583926">"Epäonnistui"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Kysy"</item>
+    <item msgid="7718817231348607934">"Älä salli koskaan"</item>
+    <item msgid="8184570120217958741">"Salli aina"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Pysyvä"</item>
+    <item msgid="167418068739176448">"Tärkein toiminta"</item>
+    <item msgid="4760813290195199773">"Tärkeä (etualalla)"</item>
+    <item msgid="2328684826817647595">"Tärkeä (taustalla)"</item>
+    <item msgid="7746406490652867365">"Varmuuskopiointi"</item>
+    <item msgid="5597404364389196754">"Resursseja kuluttava"</item>
+    <item msgid="1290888779300174556">"Palvelu (käynnissä)"</item>
+    <item msgid="7241098542073939046">"Palvelu (käynnistyy uudelleen)"</item>
+    <item msgid="6610439017684111046">"Vastaanottaja"</item>
+    <item msgid="7367606086319921117">"Aloitusruutu"</item>
+    <item msgid="3344660712396741826">"Viimeinen toiminta"</item>
+    <item msgid="5006559348883303865">"Välimuistissa (toiminta)"</item>
+    <item msgid="8633480732468137525">"Välimuistissa (toiminnan suorittaja)"</item>
+    <item msgid="6248998242443333892">"Välimuistissa (tyhjä)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Turkoosi"</item>
+    <item msgid="3228505970082457852">"Sininen"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Violetti"</item>
+    <item msgid="5932337981182999919">"Vaaleanpunainen"</item>
+    <item msgid="5642914536624000094">"Punainen"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Yli 30 päivää vanhat"</item>
+    <item msgid="8699273238891265610">"Yli 60 päivää vanhat"</item>
+    <item msgid="8346279419423837266">"Yli 90 päivää vanhat"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Tunnista automaattisesti."</item>
+    <item msgid="773943026484148895">"Merkitse maksulliseksi"</item>
+    <item msgid="1008268820118852416">"Merkitse maksuttomaksi"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Käytä satunnaistettua MAC-osoitetta (oletus)."</item>
+    <item msgid="214234417308375326">"Käytä laitteen MAC-osoitetta"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ei"</item>
+    <item msgid="1930581185557754880">"Kyllä"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tumma"</item>
+    <item msgid="5079453644557603349">"Vaalea"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Pois käytöstä"</item>
+    <item msgid="4072198137051566919">"Virheenkorjaus"</item>
+    <item msgid="2473005316958868509">"Monisanainen"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Vain kotipuhelin"</item>
+    <item msgid="1161026694891024702">"Automaattinen"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Ensisijaisesti GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Vain GSM"</item>
+    <item msgid="8579197487913425819">"Vain WCDMA"</item>
+    <item msgid="8465243227505412498">"Automaattinen GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automaattinen CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA ilman EvDoa"</item>
+    <item msgid="7278975240951052041">"Vain EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Maailmanlaajuinen"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Vain TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Maailmanlaajuinen"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fi/strings.xml b/tests/CarDeveloperOptions/res/values-fi/strings.xml
index cb13d36..64e8db2 100644
--- a/tests/CarDeveloperOptions/res/values-fi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fi/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Suojaa tablettiasi näytön lukituksella, jotta kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi kasvojentunnistuksen. Valitse Peruuta, ja määritä sitten PIN-koodi tai valitse toinen näytönlukitustapa."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Suojaa laitettasi näytön lukituksella, jotta kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi kasvojentunnistuksen. Valitse Peruuta, ja määritä sitten PIN-koodi tai valitse toinen näytönlukitustapa."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Suojaa puhelintasi näytön lukituksella, jotta kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi kasvojentunnistuksen. Valitse Peruuta, ja määritä sitten PIN-koodi tai valitse toinen näytönlukitustapa."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ohitetaanko PIN-koodin asetus?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ohitetaanko salasanan asetus?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ohitetaanko kuvion asetus?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ota näytön lukitus käyttöön"</string>
@@ -943,7 +942,7 @@
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="572011882416511818">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> skannaamalla tämä QR-koodi"</string>
     <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="27667719861826438">"QR-koodin luku epäonnistui. Keskitä koodi ja yritä uudelleen."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="9142051662156233679">"Yritä uudelleen. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
-    <string name="wifi_dpp_failure_not_compatible" msgid="4320027179973678283">"Jokin meni pieleen"</string>
+    <string name="wifi_dpp_failure_not_compatible" msgid="4320027179973678283">"Jotain meni pieleen"</string>
     <string name="wifi_dpp_failure_timeout" msgid="5060065168142109420">"Varmista, että laite on liitetty virtalähteeseen, ladattu ja päällä"</string>
     <string name="wifi_dpp_failure_generic" msgid="7840142544736640189">"Varmista, että laite on liitetty virtalähteeseen, ladattu ja päällä. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
     <string name="wifi_dpp_failure_not_supported" msgid="111779621766171626">"Tämä laite ei tue <xliff:g id="SSID">%1$s</xliff:g>:n lisäämistä"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobiili"</item>
+    <item msgid="6007360612667098926">"Vain Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1258,7 +1260,7 @@
     <string name="doze_summary" msgid="6762274282827831706">"Aktivoi näyttö, kun saat ilmoituksia."</string>
     <string name="doze_always_on_title" msgid="8555184965031789941">"Aina käytössä"</string>
     <string name="doze_always_on_summary" msgid="7654436900436328950">"Näytä aika, ilmoituskuvakkeet ja muut tiedot. Tämä asetus kuluttaa akkua nopeammin."</string>
-    <string name="title_font_size" msgid="5021464556860010851">"Kirjasimen koko"</string>
+    <string name="title_font_size" msgid="5021464556860010851">"Fontin koko"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"SIM-kortin lukitusasetukset"</string>
     <string name="sim_lock_settings_category" msgid="1126759898277681516">"SIM-kortin lukitus"</string>
@@ -1706,7 +1708,7 @@
     <string name="lockpassword_choose_your_pin_message" msgid="8942598950627277885">"Määritä PIN-koodi tietoturvan parantamiseksi."</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="1102927520952116303">"Sormenjälki: aseta PIN-koodi"</string>
     <string name="lockpassword_choose_your_pattern_message" msgid="1503075455752279687">"Aseta kuvio tietoturvan parantamiseksi."</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Anna salasana uudelleen"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="9055242184126838887">"Lisää salasana uudelleen"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7137526922696316545">"Vahvista kuvio"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="4335593948303036343">"Anna PIN-koodi uudelleen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="1783767008133345784">"Salasanat eivät täsmää"</string>
@@ -2032,7 +2034,7 @@
     <string name="accessibility_settings_summary" msgid="5742379519336396561">"Näytönlukijat, näyttö, käytönhallinta"</string>
     <string name="vision_settings_title" msgid="7315352351051423944">"Näköasetukset"</string>
     <string name="vision_settings_description" msgid="3476589459009287332">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
-    <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Muuta kirjasinkokoa"</string>
+    <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Muuta fonttikokoa"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"Näytönlukuohjelmat"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"Ääni ja näyttöteksti"</string>
     <string name="display_category_title" msgid="545168481672250195">"Näyttö"</string>
@@ -2154,7 +2156,7 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Tekstin läpinäkyvyys"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Reunan väri"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Reunan tyyppi"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Kirjasinperhe"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Fonttiperhe"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Tekstitys näyttää tältä"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"Oletus"</string>
@@ -3855,8 +3857,8 @@
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"Sisäinen tallennustila: <xliff:g id="PERCENTAGE">%1$s</xliff:g> käytössä, <xliff:g id="FREE_SPACE">%2$s</xliff:g> vapaana"</string>
     <string name="display_summary" msgid="5725269449657325797">"Jos laitetta ei käytetä, se siirtyy virransäästötilaan, kun <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> on kulunut."</string>
     <string name="display_dashboard_summary" msgid="7678566148167010682">"Taustakuva, virransäästö, fonttikoko"</string>
-    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Tyylit ja taustakuvat, virransäästö, kirjasinkoko"</string>
-    <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"Virransäästö, kirjasinkoko"</string>
+    <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"Tyylit ja taustakuvat, virransäästö, fonttikoko"</string>
+    <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"Virransäästö, fonttikoko"</string>
     <string name="display_summary_example" msgid="4555020581960719296">"Jos laitetta ei käytetä, se siirtyy virransäästötilaan, kun 10 minuuttia on kulunut."</string>
     <string name="memory_summary" msgid="9121871336058042600">"Muistia käytetty keskimäärin <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_summary" msgid="6693338169439092387">"Kirjautunut sisään käyttäjänä <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3960,7 +3962,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sovellusta saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
       <item quantity="one">1 sovellus saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
     </plurals>
-    <string name="data_usage_title" msgid="7874606430902201083">"Ensisijainen Data"</string>
+    <string name="data_usage_title" msgid="7874606430902201083">"Ensisijainen data"</string>
     <string name="data_usage_wifi_title" msgid="7161828479387766556">"Wi‑Fi-data"</string>
     <string name="data_used" msgid="1063553292806661784">"<xliff:g id="ID_1">^1</xliff:g> käytetty"</string>
     <string name="data_used_formatted" msgid="9150356955895106822">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> käytetty"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Se hidastaa puhelinta"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Pakota täydet GNSS-mitat"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Seuraa kaikkia GNSS-kuvioita ja ‑taajuuksia, joissa ei ole pulssisuhdetta."</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Käyttäjän vaihdon virheenkorjaus"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Näytä yksityiskohtaiset tiedot käyttäjän vaihdon aikana"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Taustatoiminnan salliminen alkaa"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Kaiken taustatoiminnan salliminen alkaa."</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Näytä aina kaatumisikkuna"</string>
@@ -4442,7 +4446,7 @@
     <string name="network_connection_request_dialog_title" msgid="3150489262902506588">"Käytettävä laite: <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
     <string name="network_connection_timeout_dialog_message" msgid="7036704569274087733">"Laitteita ei löytynyt. Varmista, että laitteet ovat päällä ja voivat muodostaa yhteyden."</string>
     <string name="network_connection_timeout_dialog_ok" msgid="5156496438627748361">"Yritä uudelleen"</string>
-    <string name="network_connection_errorstate_dialog_message" msgid="1599445930536043943">"Jokin meni vikaan. Sovellus peruutti laitteenvalintapyynnön."</string>
+    <string name="network_connection_errorstate_dialog_message" msgid="1599445930536043943">"Jotain meni pieleen.. Sovellus peruutti laitteenvalintapyynnön."</string>
     <string name="network_connection_connect_successful" msgid="888912275986965748">"Yhteyden muodostus onnistui"</string>
     <string name="network_connection_request_dialog_showall" msgid="396928496030183071">"Näytä kaikki"</string>
     <plurals name="show_bluetooth_devices" formatted="false" msgid="7451733907387872891">
diff --git a/tests/CarDeveloperOptions/res/values-fr-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-fr-nokeys/strings.xml
new file mode 100644
index 0000000..973a29d
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fr-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gérer les applications"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-fr-rCA-nokeys/strings.xml
new file mode 100644
index 0000000..666523e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gérer applications"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml b/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml
new file mode 100644
index 0000000..40e4daa
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amérique"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Afrique"</item>
+    <item msgid="2765816300353408280">"Asie"</item>
+    <item msgid="6683489385344409742">"Australie"</item>
+    <item msgid="5194868215515664953">"Pacifique"</item>
+    <item msgid="7044520255415007865">"Tous"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 secondes"</item>
+    <item msgid="772029947136115322">"30 secondes"</item>
+    <item msgid="8743663928349474087">"1 minute"</item>
+    <item msgid="1506508631223164814">"2 minutes"</item>
+    <item msgid="8664703938127907662">"5 minutes"</item>
+    <item msgid="5827960506924849753">"10 minutes"</item>
+    <item msgid="6677424950124253938">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Jamais"</item>
+    <item msgid="2517785806387977252">"15 secondes"</item>
+    <item msgid="6347954399441173672">"30 secondes"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immédiatement"</item>
+    <item msgid="2038544972632026612">"5 secondes"</item>
+    <item msgid="5558060663472279597">"15 secondes"</item>
+    <item msgid="45341168505452037">"30 secondes"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Petit"</item>
+    <item msgid="591935967183159581">"Par défaut"</item>
+    <item msgid="1714184661981538355">"Grande"</item>
+    <item msgid="6195563047686707484">"La plus grande"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Recherche…"</item>
+    <item msgid="5597394826455877834">"Connexion en cours…"</item>
+    <item msgid="5848277343965362748">"Authentification en cours…"</item>
+    <item msgid="3391238031431440676">"Récupération de l\'adresse IP…"</item>
+    <item msgid="5257597310494000224">"Connecté"</item>
+    <item msgid="8472497592913050396">"Suspendu"</item>
+    <item msgid="1228072488815999109">"Déconnexion…"</item>
+    <item msgid="7253087004422991731">"Déconnecté"</item>
+    <item msgid="4169850917304751227">"Échec"</item>
+    <item msgid="6266658166690831131">"Bloqué"</item>
+    <item msgid="4517230805854909775">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Recherche…"</item>
+    <item msgid="8058143476674427024">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Authentification avec <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Obtention de l\'adresse IP à partir de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspendu"</item>
+    <item msgid="4133290864821295785">"Déconnexion de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Déconnecté"</item>
+    <item msgid="2847316776634969068">"Échec"</item>
+    <item msgid="4390990424746035383">"Bloqué"</item>
+    <item msgid="3618248791367063949">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Bouton de commande"</item>
+    <item msgid="7401896200768713930">"NIP de l\'appareil associé"</item>
+    <item msgid="4526848028011846710">"NIP de l\'appareil"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connecté"</item>
+    <item msgid="983792611851499732">"Invité"</item>
+    <item msgid="5438273405428201793">"Échec"</item>
+    <item msgid="4646663015449312554">"Disponible"</item>
+    <item msgid="3230556734162006146">"Hors de portée"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutes"</item>
+    <item msgid="2759776603549270587">"5 minutes"</item>
+    <item msgid="167772676068860015">"1 heure"</item>
+    <item msgid="5985477119043628504">"Aucun délai"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utiliser les paramètres système par défaut : <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Faible"</item>
+    <item msgid="7882129634982603782">"Faible"</item>
+    <item msgid="6457357501905996224">"Acceptable"</item>
+    <item msgid="405271628162918841">"Bonne"</item>
+    <item msgid="999948812884919584">"Excellent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 derniers jours"</item>
+    <item msgid="3211287705232736964">"Défin. du cycle d\'util..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Temps d\'utilisation"</item>
+    <item msgid="2784401352592276015">"Dernière utilisation :"</item>
+    <item msgid="249854287216326349">"Nom de l\'application"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Aucun"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Aucune"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Aucun"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"Protocole DHCP"</item>
+    <item msgid="4377002609760712163">"Statique"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Aucun"</item>
+    <item msgid="1464741437353223198">"Manuel"</item>
+    <item msgid="5793600062487886090">"Config. auto du mandataire"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Aucun"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ou CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non précisé"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Aucun"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Mémoire interne du mobile"</item>
+    <item msgid="3186681694079967527">"Carte SD amovible"</item>
+    <item msgid="6902033473986647035">"Laisser le système décider"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Position"</item>
+    <item msgid="6842381562497597649">"Personnel"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Médias"</item>
+    <item msgid="5323851085993963783">"Appareil"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"position approximative"</item>
+    <item msgid="1830619568689922920">"position précise"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibration"</item>
+    <item msgid="8632513128515114092">"accéder aux contacts"</item>
+    <item msgid="3741042113569620272">"modifier les contacts"</item>
+    <item msgid="4204420969709009931">"lire le journal d\'appels"</item>
+    <item msgid="2260380357119423209">"modifier le journal d\'appels"</item>
+    <item msgid="6550710385014530934">"accéder à l\'agenda"</item>
+    <item msgid="3575906174264853951">"modifier l\'agenda"</item>
+    <item msgid="4319843242568057174">"détection du Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"détection du réseau mobile"</item>
+    <item msgid="8865260890611559753">"appeler"</item>
+    <item msgid="3254999273961542982">"lire les SMS"</item>
+    <item msgid="7711446453028825171">"écrire des SMS"</item>
+    <item msgid="6123238544099198034">"recevoir des SMS"</item>
+    <item msgid="838342167431596036">"recevoir des SMS d\'urgence"</item>
+    <item msgid="8554432731560956686">"recevoir des MMS"</item>
+    <item msgid="7464863464299515059">"recevoir des messages push WAP"</item>
+    <item msgid="310463075729606765">"envoyer des SMS"</item>
+    <item msgid="7338021933527689514">"lire les SMS ICC"</item>
+    <item msgid="6130369335466613036">"écrire des SMS ICC"</item>
+    <item msgid="6536865581421670942">"modifier les paramètres"</item>
+    <item msgid="4547203129183558973">"dessiner par dessus"</item>
+    <item msgid="9080347512916542840">"accéder aux notifications"</item>
+    <item msgid="5332718516635907742">"caméra"</item>
+    <item msgid="6098422447246167852">"enregistrer des fichiers audio"</item>
+    <item msgid="9182794235292595296">"lire le fichier audio"</item>
+    <item msgid="8760743229597702019">"lire le presse-papiers"</item>
+    <item msgid="2266923698240538544">"modifier le presse-papiers"</item>
+    <item msgid="1801619438618539275">"boutons multimédias"</item>
+    <item msgid="31588119965784465">"priorité audio"</item>
+    <item msgid="7565226799008076833">"volume général"</item>
+    <item msgid="5420704980305018295">"volume de la voix"</item>
+    <item msgid="5797363115508970204">"volume des sonneries"</item>
+    <item msgid="8233154098550715999">"volume des contenus multimédias"</item>
+    <item msgid="5196715605078153950">"volume des alarmes"</item>
+    <item msgid="394030698764284577">"volume des notifications"</item>
+    <item msgid="8952898972491680178">"volume Bluetooth"</item>
+    <item msgid="8506227454543690851">"maintenir activé"</item>
+    <item msgid="1108160036049727420">"suivre la position"</item>
+    <item msgid="1496205959751719491">"surveiller les lieux de grande puissance"</item>
+    <item msgid="3776296279910987380">"obtenir les statistiques d\'utilisation"</item>
+    <item msgid="8827100324471975602">"activer/désactiver le micro"</item>
+    <item msgid="6880736730520126864">"afficher le message"</item>
+    <item msgid="4933375960222609935">"projeter des contenus multimédias"</item>
+    <item msgid="8357907018938895462">"activer le RPV"</item>
+    <item msgid="8143812849911310973">"définir le fond d\'écran"</item>
+    <item msgid="6266277260961066535">"structure d\'assistance"</item>
+    <item msgid="7715498149883482300">"saisie d\'écran d\'assistance"</item>
+    <item msgid="4046679376726313293">"lire l\'état du téléphone"</item>
+    <item msgid="6329507266039719587">"ajouter des messages vocaux"</item>
+    <item msgid="7692440726415391408">"utiliser le protocole SIP"</item>
+    <item msgid="8572453398128326267">"traiter l\'appel sortant"</item>
+    <item msgid="7775674394089376306">"empreintes digitales"</item>
+    <item msgid="3182815133441738779">"capteurs corporels"</item>
+    <item msgid="2793100005496829513">"lire les messages de diffusion cellulaire"</item>
+    <item msgid="2633626056029384366">"créer une position fictive"</item>
+    <item msgid="8356842191824684631">"lire les données de l\'espace de stockage"</item>
+    <item msgid="5671906070163291500">"écrire dans les données de l\'espace de stockage"</item>
+    <item msgid="2791955098549340418">"activer l\'écran"</item>
+    <item msgid="5599435119609178367">"obtenir les comptes"</item>
+    <item msgid="1165623660533024666">"fonctionner en arrière-plan"</item>
+    <item msgid="6423861043647911030">"volume d\'accessibilité"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Court"</item>
+    <item msgid="4816511817309094890">"Moyenne"</item>
+    <item msgid="8305084671259331134">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Par défaut"</item>
+    <item msgid="4147246073737933622">"Sans empattement"</item>
+    <item msgid="3117680749167407907">"Sans empattement condensée"</item>
+    <item msgid="6529379119163117545">"Espace unique, sans empattement"</item>
+    <item msgid="1487203730637617924">"Avec empattement"</item>
+    <item msgid="4937790671987480464">"Espace unique, avec empattement"</item>
+    <item msgid="4448481989108928248">"Scripte"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Petites majuscules"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Très petite"</item>
+    <item msgid="5091603983404027034">"Petite"</item>
+    <item msgid="176844712416932112">"Normale"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Très grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Par défaut"</item>
+    <item msgid="6488643537808152001">"Aucune"</item>
+    <item msgid="552332815156010137">"Plan"</item>
+    <item msgid="7187891159463789272">"Ombre projetée"</item>
+    <item msgid="8019330250538856521">"Surélevée"</item>
+    <item msgid="8987385315647049787">"Surbaissée"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Paramètres par défaut de l\'appli"</item>
+    <item msgid="8611890312638868524">"Texte blanc sur fond noir"</item>
+    <item msgid="5891360837786277638">"Texte noir sur fond blanc"</item>
+    <item msgid="2798457065945456853">"Texte jaune sur fond noir"</item>
+    <item msgid="5799049811524553967">"Texte jaune sur fond bleu"</item>
+    <item msgid="3673930830658169860">"Personnalisé"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"RPV PPTP"</item>
+    <item msgid="1349760781118368659">"RPV L2TP/IPSec avec clés pré-partagées"</item>
+    <item msgid="6128519070545038358">"RPV L2TP/IPSec avec certificats"</item>
+    <item msgid="312397853907741968">"RPV IPSec avec clés pré-partagées et authentification Xauth"</item>
+    <item msgid="3319427315593649917">"RPV IPSec avec certificats et authentification Xauth"</item>
+    <item msgid="8258927774145391041">"RPV IPSec avec certificats et authentification hybride"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Aucun"</item>
+    <item msgid="1157046369795346308">"Manuel"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Déconnecté"</item>
+    <item msgid="8754480102834556765">"Initialisation en cours..."</item>
+    <item msgid="3351334355574270250">"Connexion en cours…"</item>
+    <item msgid="8303882153995748352">"Connecté"</item>
+    <item msgid="9135049670787351881">"Expiration du délai"</item>
+    <item msgid="2124868417182583926">"Échec"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Demander"</item>
+    <item msgid="7718817231348607934">"Ne jamais autoriser"</item>
+    <item msgid="8184570120217958741">"Toujours autoriser"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Permanent"</item>
+    <item msgid="167418068739176448">"Activité principale"</item>
+    <item msgid="4760813290195199773">"Important (premier plan)"</item>
+    <item msgid="2328684826817647595">"Important (arrière-plan)"</item>
+    <item msgid="7746406490652867365">"Sauvegarde"</item>
+    <item msgid="5597404364389196754">"Poids lourd"</item>
+    <item msgid="1290888779300174556">"Service (en cours)"</item>
+    <item msgid="7241098542073939046">"Service (redémarrage)"</item>
+    <item msgid="6610439017684111046">"Récepteur"</item>
+    <item msgid="7367606086319921117">"Accueil"</item>
+    <item msgid="3344660712396741826">"Dernière activité"</item>
+    <item msgid="5006559348883303865">"Mise en cache (activité)"</item>
+    <item msgid="8633480732468137525">"Mise en cache (client d\'activité)"</item>
+    <item msgid="6248998242443333892">"Mise en cache (vide)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Turquoise"</item>
+    <item msgid="3228505970082457852">"Bleu"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Mauve"</item>
+    <item msgid="5932337981182999919">"Rose"</item>
+    <item msgid="5642914536624000094">"Rouge"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Depuis plus de 30 jours"</item>
+    <item msgid="8699273238891265610">"Depuis plus de 60 jours"</item>
+    <item msgid="8346279419423837266">"Depuis plus de 90 jours"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Détecter automatiquement"</item>
+    <item msgid="773943026484148895">"Considérer comme facturé à l\'usage"</item>
+    <item msgid="1008268820118852416">"Considérer comme non facturé à l\'usage"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Utiliser une adresse MAC aléatoire (par défaut)"</item>
+    <item msgid="214234417308375326">"Utiliser l\'adresse MAC de l\'appareil"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Non"</item>
+    <item msgid="1930581185557754880">"Oui"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Sombre"</item>
+    <item msgid="5079453644557603349">"Clair"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Désactivé"</item>
+    <item msgid="4072198137051566919">"Déboguer"</item>
+    <item msgid="2473005316958868509">"Détaillé"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Réseaux domestiques uniquement"</item>
+    <item msgid="1161026694891024702">"Automatique"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA de préférence"</item>
+    <item msgid="7581481130337402578">"GSM uniquement"</item>
+    <item msgid="8579197487913425819">"WCDMA uniquement"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatique"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatique"</item>
+    <item msgid="4219607161971472471">"CDMA sans EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo seulement"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA uniquement"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
index eb6583a..4f4a8c2 100644
--- a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
@@ -427,7 +427,7 @@
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Suppr. données visage"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Votre visage peut être utilisé pour déverrouiller votre appareil et accéder aux applications. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Supprimer les données des visages?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Les données enregistrées par Face Unlock seront supprimées de manière permanente et sécuritaire. Après la suppression, vous aurez besoin de notre NIP, de votre schéma ou de votre mot de passe pour déverrouiller votre téléphone, vous connecter à des applications et confirmer les paiements."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Les données enregistrées par Face Unlock seront supprimées de manière permanente et sécuritaire. Après la suppression, vous aurez besoin de votre NIP, de votre schéma ou de votre mot de passe pour déverrouiller votre téléphone, vous connecter à des applications et confirmer les paiements."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Lecteur d\'empreintes digitales"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Gérer les empreintes digitales"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"Util. empr. dig. pour"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protégez votre tablette avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification du visage. Touchez Annuler, puis définissez un NIP ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protégez votre appareil avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification du visage. Touchez Annuler, puis définissez un NIP ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protégez votre téléphone avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification du visage. Touchez Annuler, puis définissez un NIP ou sélectionnez une autre option de verrouillage de l\'écran."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ignorer la configuration du NIP?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ignorer config. du m. de passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ignorer la config. du schéma?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurer le verrouil. de l\'écran"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Cellulaire"</item>
+    <item msgid="6007360612667098926">"Wi-Fi seulement"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2642,7 +2644,7 @@
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="452240217913675728">"Tout sélectionner"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"Utilisation des données"</string>
-    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Données cell. et Wi-Fi"</string>
+    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Données cellulaires et Wi-Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
     <string name="data_usage_app" msgid="4995297799363021198">"Utilisation de l\'appli"</string>
     <string name="data_usage_app_info_label" msgid="5358288895158910477">"DÉTAILS DE L\'APPLICATION"</string>
@@ -2868,7 +2870,7 @@
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Configurer l\'utilisateur?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Assurez-vous que la personne est disponible et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Configurer le profil maintenant?"</string>
-    <string name="user_setup_button_setup_now" msgid="4941459406266856176">"Configurer maintenant"</string>
+    <string name="user_setup_button_setup_now" msgid="4941459406266856176">"Configurer"</string>
     <string name="user_setup_button_setup_later" msgid="6596031428556518752">"Pas maintenant"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7108992906553210763">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="915260531390608092">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
@@ -3656,7 +3658,7 @@
     <string name="app_link_open_never" msgid="5774359835242754350">"Ne pas ouvrir dans cette application"</string>
     <string name="default_apps_title" msgid="3848048391400989931">"Par défaut"</string>
     <string name="default_for_work" msgid="7290411716804495366">"Par déf. pour util. professionn."</string>
-    <string name="assist_and_voice_input_title" msgid="324148194703846130">"Assist. et entrée vocale"</string>
+    <string name="assist_and_voice_input_title" msgid="324148194703846130">"Assist./entrée vocale"</string>
     <string name="default_assist_title" msgid="2060846994203235317">"Application d\'assistance"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"Définir <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> comme assistant?"</string>
     <string name="assistant_security_warning" msgid="1304057692847069938">"L\'assistant pourra accéder aux données des applications en cours d\'utilisation sur votre système, y compris les données visibles à l\'écran ou accessibles au sein des applications."</string>
@@ -4122,8 +4124,8 @@
     <string name="ambient_display_pickup_title" product="device" msgid="2480126522988135037">"Saisissez l\'appareil pour consulter les notifications"</string>
     <string name="ambient_display_wake_screen_title" msgid="3376988352851077102">"Réactiver l\'écran"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisir votre téléphone."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisissez votre tablette."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisissez votre appareil."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisir votre tablette."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisir votre appareil."</string>
     <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Toucher pour vérifier le téléphone"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Toucher pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Toucher pour vérifier l\'appareil"</string>
@@ -4154,7 +4156,7 @@
     <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Synchroniser automatiquement les données personnelles"</string>
     <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Synchroniser automatiquement les données professionnelles"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Autoriser les applications à actualiser les données automatiquement"</string>
-    <string name="account_sync_title" msgid="1570164819114297154">"Synchro. du compte"</string>
+    <string name="account_sync_title" msgid="1570164819114297154">"Synchro du compte"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"La synchronisation est activée pour <xliff:g id="ID_1">%1$d</xliff:g> élément(s) sur <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="account_sync_summary_all_on" msgid="3634161204232431700">"La synchronisation est activée pour tous les éléments"</string>
     <string name="account_sync_summary_all_off" msgid="1971584632343645602">"La synchronisation est désactivée pour tous les éléments"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Elle ralentirait ce téléphone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forcer les mesures GNSS complètes"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Faire le suivi de toutes les constellations et les fréquences GNSS sans cycle de tâches"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Déboguer le changement d\'utilisateur"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Affiche des renseignements détaillés lors du changement d\'utilisateur"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Autoriser le démarrage d\'activité en arrière-plan"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Autoriser tous les démarrages d\'activité en arrière-plan"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Toujours afficher la fenêtre de plantage"</string>
diff --git a/tests/CarDeveloperOptions/res/values-fr/arrays.xml b/tests/CarDeveloperOptions/res/values-fr/arrays.xml
new file mode 100644
index 0000000..27ba552
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-fr/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amérique"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Afrique"</item>
+    <item msgid="2765816300353408280">"Asie"</item>
+    <item msgid="6683489385344409742">"Australie"</item>
+    <item msgid="5194868215515664953">"Pacifique"</item>
+    <item msgid="7044520255415007865">"Tous"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 secondes"</item>
+    <item msgid="772029947136115322">"30 secondes"</item>
+    <item msgid="8743663928349474087">"1 minute"</item>
+    <item msgid="1506508631223164814">"2 minutes"</item>
+    <item msgid="8664703938127907662">"5 minutes"</item>
+    <item msgid="5827960506924849753">"10 minutes"</item>
+    <item msgid="6677424950124253938">"30 minutes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Jamais"</item>
+    <item msgid="2517785806387977252">"15 secondes"</item>
+    <item msgid="6347954399441173672">"30 secondes"</item>
+    <item msgid="4858305253279921789">"1 minute"</item>
+    <item msgid="8109273437140044073">"2 minutes"</item>
+    <item msgid="2788593551142462622">"5 minutes"</item>
+    <item msgid="8012672183888404961">"10 minutes"</item>
+    <item msgid="8271452751594598661">"30 minutes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immédiatement"</item>
+    <item msgid="2038544972632026612">"5 secondes"</item>
+    <item msgid="5558060663472279597">"15 secondes"</item>
+    <item msgid="45341168505452037">"30 secondes"</item>
+    <item msgid="227647485917789272">"1 minute"</item>
+    <item msgid="3367011891231217504">"2 minutes"</item>
+    <item msgid="4376575879222393045">"5 minutes"</item>
+    <item msgid="811192536981678974">"10 minutes"</item>
+    <item msgid="7258394417241706272">"30 minutes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Petite"</item>
+    <item msgid="591935967183159581">"Par défaut"</item>
+    <item msgid="1714184661981538355">"Grande"</item>
+    <item msgid="6195563047686707484">"Très grande"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Recherche…"</item>
+    <item msgid="5597394826455877834">"Connexion en cours…"</item>
+    <item msgid="5848277343965362748">"Authentification..."</item>
+    <item msgid="3391238031431440676">"Récupération de l\'adresse IP…"</item>
+    <item msgid="5257597310494000224">"Connecté"</item>
+    <item msgid="8472497592913050396">"Interrompu"</item>
+    <item msgid="1228072488815999109">"Déconnexion…"</item>
+    <item msgid="7253087004422991731">"Déconnecté"</item>
+    <item msgid="4169850917304751227">"Échec"</item>
+    <item msgid="6266658166690831131">"Bloqué"</item>
+    <item msgid="4517230805854909775">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Recherche…"</item>
+    <item msgid="8058143476674427024">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Authentification avec <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Récupération de l\'adresse IP à partir de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Interrompu"</item>
+    <item msgid="4133290864821295785">"Déconnexion de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Déconnecté"</item>
+    <item msgid="2847316776634969068">"Échec"</item>
+    <item msgid="4390990424746035383">"Bloqué"</item>
+    <item msgid="3618248791367063949">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Bouton de commande"</item>
+    <item msgid="7401896200768713930">"Code de l\'appareil associé"</item>
+    <item msgid="4526848028011846710">"Code de l\'appareil"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connecté"</item>
+    <item msgid="983792611851499732">"Invité"</item>
+    <item msgid="5438273405428201793">"Échec"</item>
+    <item msgid="4646663015449312554">"Disponible"</item>
+    <item msgid="3230556734162006146">"Hors de portée"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutes"</item>
+    <item msgid="2759776603549270587">"5 minutes"</item>
+    <item msgid="167772676068860015">"1 heure"</item>
+    <item msgid="5985477119043628504">"Aucun délai"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utiliser la valeur par défaut du système : <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Faible"</item>
+    <item msgid="7882129634982603782">"Faible"</item>
+    <item msgid="6457357501905996224">"Satisfaisante"</item>
+    <item msgid="405271628162918841">"Bonne"</item>
+    <item msgid="999948812884919584">"Excellente"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 derniers jours"</item>
+    <item msgid="3211287705232736964">"Définir cycle conso..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Durée d\'utilisation"</item>
+    <item msgid="2784401352592276015">"Dernière utilisation"</item>
+    <item msgid="249854287216326349">"Nom de l\'application"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Aucun"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Aucune"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Aucun"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"Protocole DHCP"</item>
+    <item msgid="4377002609760712163">"Statique"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Aucun"</item>
+    <item msgid="1464741437353223198">"Manuel"</item>
+    <item msgid="5793600062487886090">"Configuration auto du proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Aucun"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ou CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non spécifié"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"3G+"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Aucun"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Mémoire interne du mobile"</item>
+    <item msgid="3186681694079967527">"Carte SD amovible"</item>
+    <item msgid="6902033473986647035">"Laisser le système décider"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Localisation"</item>
+    <item msgid="6842381562497597649">"Personnel"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Support"</item>
+    <item msgid="5323851085993963783">"Appareil"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"position approximative"</item>
+    <item msgid="1830619568689922920">"position précise"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibreur"</item>
+    <item msgid="8632513128515114092">"accéder aux contacts"</item>
+    <item msgid="3741042113569620272">"modifier les contacts"</item>
+    <item msgid="4204420969709009931">"lire le journal d\'appels"</item>
+    <item msgid="2260380357119423209">"modifier le journal d\'appels"</item>
+    <item msgid="6550710385014530934">"accéder à l\'agenda"</item>
+    <item msgid="3575906174264853951">"modifier l\'agenda"</item>
+    <item msgid="4319843242568057174">"détection du Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"détection du réseau mobile"</item>
+    <item msgid="8865260890611559753">"appeler"</item>
+    <item msgid="3254999273961542982">"lire les SMS"</item>
+    <item msgid="7711446453028825171">"écrire des SMS"</item>
+    <item msgid="6123238544099198034">"recevoir des SMS"</item>
+    <item msgid="838342167431596036">"recevoir des SMS d\'urgence"</item>
+    <item msgid="8554432731560956686">"recevoir des MMS"</item>
+    <item msgid="7464863464299515059">"recevoir des messages push WAP"</item>
+    <item msgid="310463075729606765">"envoyer des SMS"</item>
+    <item msgid="7338021933527689514">"lire les SMS ICC"</item>
+    <item msgid="6130369335466613036">"écrire des SMS ICC"</item>
+    <item msgid="6536865581421670942">"modifier les paramètres"</item>
+    <item msgid="4547203129183558973">"dessiner par dessus"</item>
+    <item msgid="9080347512916542840">"accéder aux notifications"</item>
+    <item msgid="5332718516635907742">"caméra"</item>
+    <item msgid="6098422447246167852">"enregistrer fichier audio"</item>
+    <item msgid="9182794235292595296">"lire le fichier audio"</item>
+    <item msgid="8760743229597702019">"lire le presse-papiers"</item>
+    <item msgid="2266923698240538544">"modifier le presse-papiers"</item>
+    <item msgid="1801619438618539275">"boutons pour contenus multimédias"</item>
+    <item msgid="31588119965784465">"priorité audio"</item>
+    <item msgid="7565226799008076833">"volume général"</item>
+    <item msgid="5420704980305018295">"volume de la voix"</item>
+    <item msgid="5797363115508970204">"volume des sonneries"</item>
+    <item msgid="8233154098550715999">"volume multimédia"</item>
+    <item msgid="5196715605078153950">"volume des alarmes"</item>
+    <item msgid="394030698764284577">"volume des notifications"</item>
+    <item msgid="8952898972491680178">"volume Bluetooth"</item>
+    <item msgid="8506227454543690851">"maintenir activé"</item>
+    <item msgid="1108160036049727420">"suivre la position"</item>
+    <item msgid="1496205959751719491">"surveiller les requêtes de localisation qui nécessitent une quantité d\'énergie importante"</item>
+    <item msgid="3776296279910987380">"obtenir des statistiques d\'utilisation"</item>
+    <item msgid="8827100324471975602">"activer/désactiver le micro"</item>
+    <item msgid="6880736730520126864">"afficher le message"</item>
+    <item msgid="4933375960222609935">"projeter des contenus multimédias"</item>
+    <item msgid="8357907018938895462">"activer le VPN"</item>
+    <item msgid="8143812849911310973">"modifier le fond d\'écran"</item>
+    <item msgid="6266277260961066535">"structure d\'assistance"</item>
+    <item msgid="7715498149883482300">"aide à la capture d\'écran"</item>
+    <item msgid="4046679376726313293">"lire l\'état du téléphone"</item>
+    <item msgid="6329507266039719587">"ajouter des messages vocaux"</item>
+    <item msgid="7692440726415391408">"utiliser le protocole SIP"</item>
+    <item msgid="8572453398128326267">"traiter l\'appel sortant"</item>
+    <item msgid="7775674394089376306">"empreinte digitale"</item>
+    <item msgid="3182815133441738779">"capteurs corporels"</item>
+    <item msgid="2793100005496829513">"lire les diffusions cellulaires"</item>
+    <item msgid="2633626056029384366">"position fictive"</item>
+    <item msgid="8356842191824684631">"lire les données de l\'espace de stockage"</item>
+    <item msgid="5671906070163291500">"écrire dans les données de l\'espace de stockage"</item>
+    <item msgid="2791955098549340418">"activer l\'écran"</item>
+    <item msgid="5599435119609178367">"obtenir les comptes"</item>
+    <item msgid="1165623660533024666">"exécuter en arrière-plan"</item>
+    <item msgid="6423861043647911030">"volume d\'accessibilité"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Localisation"</item>
+    <item msgid="6656077694190491067">"Localisation"</item>
+    <item msgid="8790228218278477369">"Localisation"</item>
+    <item msgid="7836406246005211990">"Vibreur"</item>
+    <item msgid="3951439024549922598">"Accéder aux contacts"</item>
+    <item msgid="8802152411647068">"Modifier les contacts"</item>
+    <item msgid="229544934599698735">"Lire le journal d\'appels"</item>
+    <item msgid="7396102294405899613">"Modifier le journal d\'appels"</item>
+    <item msgid="3597797992398484655">"Accéder à l\'agenda"</item>
+    <item msgid="2705975774250907343">"Modifier l\'agenda"</item>
+    <item msgid="4668747371441932697">"Localisation"</item>
+    <item msgid="1487578921720243646">"Publier des notifications"</item>
+    <item msgid="4636080349724146638">"Localisation"</item>
+    <item msgid="673510900286463926">"Appeler"</item>
+    <item msgid="542083422784609790">"Lire des SMS ou des MMS"</item>
+    <item msgid="1033780373029588436">"Écrire des SMS ou des MMS"</item>
+    <item msgid="5647111115517787488">"Recevoir des SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Recevoir des SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Recevoir des SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Recevoir des SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Envoyer des SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Lire des SMS ou des MMS"</item>
+    <item msgid="6555678522277865572">"Écrire des SMS ou des MMS"</item>
+    <item msgid="6981734935578130884">"Modifier les paramètres"</item>
+    <item msgid="8705854389991425629">"Dessiner par dessus"</item>
+    <item msgid="5861356020344153651">"Accéder aux notifications"</item>
+    <item msgid="78432174621628659">"Caméra"</item>
+    <item msgid="3986116419882154794">"Enregistrer fichier audio"</item>
+    <item msgid="4516840825756409490">"Lire le fichier audio"</item>
+    <item msgid="6811712502798183957">"Lire le presse-papiers"</item>
+    <item msgid="2780369012602289114">"Modifier le presse-papiers"</item>
+    <item msgid="2331359440170850868">"Boutons multimédias"</item>
+    <item msgid="6133599737122751231">"Priorité audio"</item>
+    <item msgid="6844485713404805301">"Volume général"</item>
+    <item msgid="1600379420669104929">"Volume de la voix"</item>
+    <item msgid="6296768210470214866">"Volume de la sonnerie"</item>
+    <item msgid="510690696071629241">"Volume multimédia"</item>
+    <item msgid="406861638631430109">"Volume de l\'alarme"</item>
+    <item msgid="4715864795872233884">"Volume des notifications"</item>
+    <item msgid="2311478519251301183">"Volume Bluetooth"</item>
+    <item msgid="5133991377896747027">"Maintenir activé"</item>
+    <item msgid="2464189519136248621">"Localisation"</item>
+    <item msgid="2062677934050803037">"Localisation"</item>
+    <item msgid="1735171933192715957">"Obtenir des statistiques d\'utilisation"</item>
+    <item msgid="1014093788778383554">"Activer/Désactiver le micro"</item>
+    <item msgid="4199297950608622850">"Afficher le message"</item>
+    <item msgid="2527962435313398821">"Projeter des contenus multimédias"</item>
+    <item msgid="5117506254221861929">"Activer le VPN"</item>
+    <item msgid="8291198322681891160">"Modifier le fond d\'écran"</item>
+    <item msgid="7106921284621230961">"Structure d\'assistance"</item>
+    <item msgid="4496533640894624799">"Aide à la capture d\'écran"</item>
+    <item msgid="2598847264853993611">"Lire l\'état du téléphone"</item>
+    <item msgid="9215610846802973353">"Ajouter des messages vocaux"</item>
+    <item msgid="9186411956086478261">"Utiliser le protocole SIP"</item>
+    <item msgid="6884763100104539558">"Traiter l\'appel sortant"</item>
+    <item msgid="125513972170580692">"Empreinte digitale"</item>
+    <item msgid="2556071024281275619">"Capteurs corporels"</item>
+    <item msgid="617168514928339387">"Lire les diffusions cellulaires"</item>
+    <item msgid="7134693570516523585">"Position fictive"</item>
+    <item msgid="7224489175375229399">"Lire les données de l\'espace de stockage"</item>
+    <item msgid="8472735063903258202">"Écrire dans les données de l\'espace de stockage"</item>
+    <item msgid="4069276819909595110">"Activer l\'écran"</item>
+    <item msgid="1228338896751121025">"Obtenir les comptes"</item>
+    <item msgid="3181581793459233672">"Exécuter en arrière-plan"</item>
+    <item msgid="2340936043025374076">"Volume d\'accessibilité"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Court"</item>
+    <item msgid="4816511817309094890">"Moyenne "</item>
+    <item msgid="8305084671259331134">"Long"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Par défaut"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif condensé"</item>
+    <item msgid="6529379119163117545">"Sans Serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Scripte"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Petites majuscules"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Très petite"</item>
+    <item msgid="5091603983404027034">"Petite"</item>
+    <item msgid="176844712416932112">"Normale"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Très grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Par défaut"</item>
+    <item msgid="6488643537808152001">"Aucun"</item>
+    <item msgid="552332815156010137">"Contour"</item>
+    <item msgid="7187891159463789272">"Ombre projetée"</item>
+    <item msgid="8019330250538856521">"Surélevé"</item>
+    <item msgid="8987385315647049787">"Bord en retrait"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Paramètres par défaut de l\'appli"</item>
+    <item msgid="8611890312638868524">"Texte blanc sur fond noir"</item>
+    <item msgid="5891360837786277638">"Texte noir sur fond blanc"</item>
+    <item msgid="2798457065945456853">"Texte jaune sur fond noir"</item>
+    <item msgid="5799049811524553967">"Texte jaune sur fond bleu"</item>
+    <item msgid="3673930830658169860">"Personnalisé"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"VPN L2TP/IPSec avec clés pré-partagées"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec avec certificats"</item>
+    <item msgid="312397853907741968">"VPN IPSec avec clés pré-partagées et authentification Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec avec certificats et authentification Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec avec certificats et authentification hybride"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Aucune"</item>
+    <item msgid="1157046369795346308">"Manuel"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Déconnecté"</item>
+    <item msgid="8754480102834556765">"Initialisation en cours..."</item>
+    <item msgid="3351334355574270250">"Connexion en cours…"</item>
+    <item msgid="8303882153995748352">"Connecté"</item>
+    <item msgid="9135049670787351881">"Délai"</item>
+    <item msgid="2124868417182583926">"Échec"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Demander"</item>
+    <item msgid="7718817231348607934">"Ne jamais autoriser"</item>
+    <item msgid="8184570120217958741">"Toujours autoriser"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Permanent"</item>
+    <item msgid="167418068739176448">"Activité principale"</item>
+    <item msgid="4760813290195199773">"Important (premier plan)"</item>
+    <item msgid="2328684826817647595">"Important (arrière-plan)"</item>
+    <item msgid="7746406490652867365">"Sauvegarde"</item>
+    <item msgid="5597404364389196754">"Haute densité"</item>
+    <item msgid="1290888779300174556">"Service (en cours)"</item>
+    <item msgid="7241098542073939046">"Service (redémarrage)"</item>
+    <item msgid="6610439017684111046">"Récepteur"</item>
+    <item msgid="7367606086319921117">"Accueil"</item>
+    <item msgid="3344660712396741826">"Dernière activité"</item>
+    <item msgid="5006559348883303865">"Mise en cache (activité)"</item>
+    <item msgid="8633480732468137525">"Mise en cache (client d\'activité)"</item>
+    <item msgid="6248998242443333892">"Mise en cache (vide)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Turquoise"</item>
+    <item msgid="3228505970082457852">"Bleu"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Violet"</item>
+    <item msgid="5932337981182999919">"Rose"</item>
+    <item msgid="5642914536624000094">"Rouge"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Depuis plus de 30 jours"</item>
+    <item msgid="8699273238891265610">"Depuis plus de 60 jours"</item>
+    <item msgid="8346279419423837266">"Depuis plus de 90 jours"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Détecter automatiquement"</item>
+    <item msgid="773943026484148895">"Considérer comme facturé à l\'usage"</item>
+    <item msgid="1008268820118852416">"Considérer comme non facturé à l\'usage"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Utiliser adresse MAC aléatoire (par défaut)"</item>
+    <item msgid="214234417308375326">"Utiliser l\'adresse MAC de l\'appareil"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Non"</item>
+    <item msgid="1930581185557754880">"Oui"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Sombre"</item>
+    <item msgid="5079453644557603349">"Clair"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Désactivé"</item>
+    <item msgid="4072198137051566919">"Débogage"</item>
+    <item msgid="2473005316958868509">"Détaillé"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Réseaux domestiques uniquement"</item>
+    <item msgid="1161026694891024702">"Automatique"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA de préférence"</item>
+    <item msgid="7581481130337402578">"GSM uniquement"</item>
+    <item msgid="8579197487913425819">"WCDMA uniquement"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatique"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatique"</item>
+    <item msgid="4219607161971472471">"CDMA sans EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo uniquement"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Général"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA uniquement"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Général"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-fr/strings.xml b/tests/CarDeveloperOptions/res/values-fr/strings.xml
index f67319d..f243009 100644
--- a/tests/CarDeveloperOptions/res/values-fr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr/strings.xml
@@ -426,7 +426,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"Toujours demander confirmation lors de l\'authentification dans applis"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Suppr. données visage"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Vous pouvez utiliser votre visage pour déverrouiller votre appareil et accéder à des applications. "<annotation id="url">"En savoir plus"</annotation></string>
-    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Supprimer les données du visage ?"</string>
+    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Supprimer les données de reconnaissance faciale ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Les données enregistrées par Face Unlock seront supprimées de manière sécurisée et définitive. Une fois l\'inscription retirée, vous devrez utiliser votre code, votre motif ou votre mot de passe pour déverrouiller votre téléphone, vous connecter aux applications et confirmer les paiements."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Empreinte digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Gérer empreintes num."</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protégez votre tablette avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification faciale. Appuyez sur \"Annuler\", puis définissez un code ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protégez votre appareil avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification faciale. Appuyez sur \"Annuler\", puis définissez un code ou sélectionnez une autre option de verrouillage de l\'écran."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protégez votre téléphone avec une option de verrouillage de l\'écran afin que personne ne puisse l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer l\'authentification faciale. Appuyez sur \"Annuler\", puis définissez un code ou sélectionnez une autre option de verrouillage de l\'écran."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Passer la configuration code ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Passer config. mot de passe ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Passer configuration schéma ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Verrouillage de l\'écran"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi uniquement"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1220,7 +1222,7 @@
     <string name="night_display_summary_on" msgid="6580571388791426596">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5461580863060506687">"Ne jamais désactiver automatiquement"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2200631112239399233">"Désactiver automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"Désactiver automatiquement au lever du soleil"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"Se désactivera automatiquement au lever du soleil"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"Activer maintenant"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"Désactiver"</string>
     <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"Activer jusqu\'au lever du soleil"</string>
@@ -1256,7 +1258,7 @@
     <string name="ambient_display_category_triggers" msgid="3496111745340047504">"Activation du mode Veille"</string>
     <string name="doze_title" msgid="235269029233857546">"Nouvelles notifications"</string>
     <string name="doze_summary" msgid="6762274282827831706">"Activer l\'écran lors de la réception de notifications"</string>
-    <string name="doze_always_on_title" msgid="8555184965031789941">"Toujours activé"</string>
+    <string name="doze_always_on_title" msgid="8555184965031789941">"Mode Always-on"</string>
     <string name="doze_always_on_summary" msgid="7654436900436328950">"Afficher l\'heure, les icônes de notification et d\'autres informations. Batterie davantage sollicitée."</string>
     <string name="title_font_size" msgid="5021464556860010851">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"Agrandir ou réduire le texte"</string>
@@ -2056,7 +2058,7 @@
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Le bouton Accessibilité est défini sur <xliff:g id="SERVICE">%1$s</xliff:g>. Pour utiliser la loupe, appuyez de manière prolongée sur le bouton Accessibilité, puis sélectionnez la loupe."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Raccourci (volume)"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Service associé au raccourci"</string>
-    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Autoriser depuis écran verrouillage"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Autoriser depuis l\'écran verrouillé"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Lorsque le raccourci est activé, vous pouvez appuyer sur les deux touches de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Texte avec contraste élevé"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Mise à jour auto de la loupe"</string>
@@ -2075,7 +2077,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 minute"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 minutes"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"Durée d\'affichage"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Temps pour réagir"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Délai d\'affichage"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Choisissez la durée d\'affichage des messages que vous avez besoin de lire, mais dont la visibilité est temporaire.\n\nCertaines applications ne sont pas compatibles avec ce paramètre."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Choisissez la durée d\'affichage des messages qui vous demandent d\'effectuer une action, mais dont la visibilité est temporaire.\n\nCertaines applications ne sont pas compatibles avec ce paramètre."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Délai de pression"</string>
@@ -3096,16 +3098,16 @@
     <string name="keywords_sim_status" msgid="3852088576719874387">"réseau, état du réseau mobile, état du service, force du signal, type de réseau mobile, roaming, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"numéro de série, version logicielle"</string>
     <string name="keywords_android_version" msgid="4842749998088987740">"mise à jour du correctif de sécurité Android, version de bande de base, version de noyau"</string>
-    <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"thème, clair, foncé, mode"</string>
+    <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"thème, clair, sombre, mode"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"application financière, sms, autorisation"</string>
-    <string name="keywords_systemui_theme" msgid="9150908170417305866">"thème foncé"</string>
+    <string name="keywords_systemui_theme" msgid="9150908170417305866">"thème sombre"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"bug"</string>
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"affichage en mode veille, affichage de l\'écran de verrouillage"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"notification de l\'écran de verrouillage, notifications"</string>
     <string name="keywords_face_settings" msgid="4117345666006836599">"visage"</string>
     <string name="keywords_fingerprint_settings" msgid="902902368701134163">"empreinte digitale, ajouter une empreinte digitale"</string>
     <string name="keywords_display_auto_brightness" msgid="1810596220466483996">"réduire la luminosité de l\'écran, écran tactile, batterie, réglage intelligent de la luminosité, luminosité dynamique"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"assombrir l\'écran, veille, batterie, délai d\'inactivité, attention, affichage, écran, inactivité"</string>
+    <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"assombrir l\'écran, veille, batterie, délai d\'inactivité, regard, affichage, écran, inactivité"</string>
     <string name="keywords_auto_rotate" msgid="4320791369951647513">"faire pivoter, inverser, rotation, portrait, paysage, orientation, vertical, horizontal"</string>
     <string name="keywords_system_update_settings" msgid="4419971277998986067">"mettre à jour, android"</string>
     <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"ne pas déranger, calendrier, notifications, bloquer, silence, vibreur, veille, travail, sélectionner, son, couper le son, jour, jour de semaine, week-end, soir de semaine, événement"</string>
@@ -3127,7 +3129,7 @@
     <string name="sound_settings_summary_vibrate" msgid="2194491116884798590">"Sonnerie en mode vibreur"</string>
     <string name="sound_settings_summary_silent" msgid="899823817462768876">"Sonnerie en mode silencieux"</string>
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"Volume de sonnerie à 80 %"</string>
-    <string name="media_volume_option_title" msgid="3553411883305505682">"Volume des contenus multimédias"</string>
+    <string name="media_volume_option_title" msgid="3553411883305505682">"Volume multimédia"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"Volume de diffusion"</string>
     <string name="call_volume_option_title" msgid="5028003296631037334">"Volume d\'appel"</string>
     <string name="alarm_volume_option_title" msgid="3184076022438477047">"Volume de l\'alarme"</string>
@@ -3779,7 +3781,7 @@
     <string name="running_frequency" msgid="7545170806968474449">"Fréquence"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"Utilisation maximale"</string>
     <string name="no_data_usage" msgid="903383745620135746">"Aucune donnée utilisée"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"Autoriser l\'accès au mode Ne pas déranger pour <xliff:g id="APP">%1$s</xliff:g> ?"</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"Autoriser \"<xliff:g id="APP">%1$s</xliff:g>\" à accéder au mode Ne pas déranger ?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"L\'application disposera d\'une autorisation d\'activation ou de désactivation du mode Ne pas déranger et de modification des paramètres associés."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Doit rester activé, car l\'accès aux notifications est activé"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"Révoquer l\'accès au mode Ne pas déranger pour <xliff:g id="APP">%1$s</xliff:g> ?"</string>
@@ -4070,7 +4072,7 @@
     <string name="dark_ui_mode" msgid="703844190192599217">"Thème"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Sélectionner un thème"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Ce paramètre s\'applique aussi aux applications"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Le thème foncé s\'appliquera également aux applications compatibles."</string>
+    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Le thème sombre s\'appliquera également aux applications compatibles."</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Tuiles de configuration rapide pour les développeurs"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Trace Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Capteurs désactivés"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Elle ralentit le téléphone"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forcer les mesures GNSS complètes"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Effectuer le suivi de toutes les fréquences et constellations GNSS sans rapport cyclique"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Voir plus d\'informations sur le changement d\'utilisateur"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Afficher des informations détaillées pendant le changement d\'utilisateur"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Autoriser le démarrage des activités en arrière-plan"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Autoriser le démarrage de toutes les activités en arrière-plan"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Toujours afficher une boîte de dialogue en cas de plantage"</string>
diff --git a/tests/CarDeveloperOptions/res/values-gl-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-gl-nokeys/strings.xml
new file mode 100644
index 0000000..be6ba2e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-gl-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Xestionar aplicacións"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-gl/arrays.xml b/tests/CarDeveloperOptions/res/values-gl/arrays.xml
new file mode 100644
index 0000000..905bdc7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-gl/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"América"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"África"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacífico"</item>
+    <item msgid="7044520255415007865">"Todo"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundos"</item>
+    <item msgid="772029947136115322">"30 segundos"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minutos"</item>
+    <item msgid="8664703938127907662">"5 minutos"</item>
+    <item msgid="5827960506924849753">"10 minutos"</item>
+    <item msgid="6677424950124253938">"30 minutos"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Inmediatamente"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Rede conectada"</item>
+    <item msgid="983792611851499732">"Invitado"</item>
+    <item msgid="5438273405428201793">"Incorrecto"</item>
+    <item msgid="4646663015449312554">"Dispoñible"</item>
+    <item msgid="3230556734162006146">"Fóra de cobertura"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutos"</item>
+    <item msgid="2759776603549270587">"5 minutos"</item>
+    <item msgid="167772676068860015">"1 hora"</item>
+    <item msgid="5985477119043628504">"Sen tempo de espera"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usa os valores predeterminados do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Últimos 30 días"</item>
+    <item msgid="3211287705232736964">"Definir ciclo de uso..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Tempo de uso"</item>
+    <item msgid="2784401352592276015">"Última vez que se utilizou"</item>
+    <item msgid="249854287216326349">"Nome da aplicación"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ningunha"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ningún"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ningunha"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ningunha"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Proxy autoconfigurado"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ningunha"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ou CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ningún"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Almacenamento interno do dispositivo"</item>
+    <item msgid="3186681694079967527">"Tarxeta SD extraíble"</item>
+    <item msgid="6902033473986647035">"Deixar decidir ao sistema"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Localización"</item>
+    <item msgid="6842381562497597649">"Persoal"</item>
+    <item msgid="3966700236695683444">"Mensaxaría"</item>
+    <item msgid="8563996233342430477">"Multimedia"</item>
+    <item msgid="5323851085993963783">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"localización aproximada"</item>
+    <item msgid="1830619568689922920">"localización precisa"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibración"</item>
+    <item msgid="8632513128515114092">"ler contactos"</item>
+    <item msgid="3741042113569620272">"modificar contactos"</item>
+    <item msgid="4204420969709009931">"ler rexistro de chamadas"</item>
+    <item msgid="2260380357119423209">"modificar rexistro de chamadas"</item>
+    <item msgid="6550710385014530934">"ler calendario"</item>
+    <item msgid="3575906174264853951">"modificar calendario"</item>
+    <item msgid="4319843242568057174">"exploración de wifi"</item>
+    <item msgid="2981791890467303819">"notificación"</item>
+    <item msgid="6617825156152476692">"exploración de cela"</item>
+    <item msgid="8865260890611559753">"chamada telefónica"</item>
+    <item msgid="3254999273961542982">"ler SMS"</item>
+    <item msgid="7711446453028825171">"escribir SMS"</item>
+    <item msgid="6123238544099198034">"recibir SMS"</item>
+    <item msgid="838342167431596036">"recibir SMS de emerxencia"</item>
+    <item msgid="8554432731560956686">"recibir MMS"</item>
+    <item msgid="7464863464299515059">"recibir WAP push"</item>
+    <item msgid="310463075729606765">"enviar SMS"</item>
+    <item msgid="7338021933527689514">"ler SMS ICC"</item>
+    <item msgid="6130369335466613036">"escribir SMS ICC"</item>
+    <item msgid="6536865581421670942">"modificar configuración"</item>
+    <item msgid="4547203129183558973">"debuxar na parte superior"</item>
+    <item msgid="9080347512916542840">"acceso ás notificacións"</item>
+    <item msgid="5332718516635907742">"cámara"</item>
+    <item msgid="6098422447246167852">"gravar audio"</item>
+    <item msgid="9182794235292595296">"reproducir audio"</item>
+    <item msgid="8760743229597702019">"ler portapapeis"</item>
+    <item msgid="2266923698240538544">"modificar portapapeis"</item>
+    <item msgid="1801619438618539275">"botóns multimedia"</item>
+    <item msgid="31588119965784465">"enfoque de audio"</item>
+    <item msgid="7565226799008076833">"volume principal"</item>
+    <item msgid="5420704980305018295">"volume da voz"</item>
+    <item msgid="5797363115508970204">"volume do ton"</item>
+    <item msgid="8233154098550715999">"volume multimedia"</item>
+    <item msgid="5196715605078153950">"volume da alarma"</item>
+    <item msgid="394030698764284577">"volume das notificacións"</item>
+    <item msgid="8952898972491680178">"volume do Bluetooth"</item>
+    <item msgid="8506227454543690851">"manter activo"</item>
+    <item msgid="1108160036049727420">"supervisar a localización"</item>
+    <item msgid="1496205959751719491">"supervisar localización de alta potencia"</item>
+    <item msgid="3776296279910987380">"obter estatísticas de uso"</item>
+    <item msgid="8827100324471975602">"desactivar/activar o son do micrófono"</item>
+    <item msgid="6880736730520126864">"mostrar notificación emerxente"</item>
+    <item msgid="4933375960222609935">"multimedia do proxecto"</item>
+    <item msgid="8357907018938895462">"activar VPN"</item>
+    <item msgid="8143812849911310973">"escribir fondo de pantalla"</item>
+    <item msgid="6266277260961066535">"estrutura do asistente"</item>
+    <item msgid="7715498149883482300">"captura de pantalla do asistente"</item>
+    <item msgid="4046679376726313293">"ler estado do teléfono"</item>
+    <item msgid="6329507266039719587">"engadir correo de voz"</item>
+    <item msgid="7692440726415391408">"usar SIP"</item>
+    <item msgid="8572453398128326267">"procesar chamada saínte"</item>
+    <item msgid="7775674394089376306">"impresión dixital"</item>
+    <item msgid="3182815133441738779">"sensores corporais"</item>
+    <item msgid="2793100005496829513">"ler difusións de cela"</item>
+    <item msgid="2633626056029384366">"localización falsa"</item>
+    <item msgid="8356842191824684631">"ler almacenamento"</item>
+    <item msgid="5671906070163291500">"escribir almacenamento"</item>
+    <item msgid="2791955098549340418">"activar pantalla"</item>
+    <item msgid="5599435119609178367">"obter contas"</item>
+    <item msgid="1165623660533024666">"executar en segundo plano"</item>
+    <item msgid="6423861043647911030">"volume de accesibilidade"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Curto"</item>
+    <item msgid="4816511817309094890">"Media"</item>
+    <item msgid="8305084671259331134">"Longo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predeterminado"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif condensada"</item>
+    <item msgid="6529379119163117545">"Monoespazado sen serifas"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Monoespazado con serifas"</item>
+    <item msgid="4448481989108928248">"Informal"</item>
+    <item msgid="4627069151979553527">"Cursiva"</item>
+    <item msgid="6896773537705206194">"Versaleta"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predeterminado"</item>
+    <item msgid="6488643537808152001">"Ningunha"</item>
+    <item msgid="552332815156010137">"Contorno"</item>
+    <item msgid="7187891159463789272">"Sombra"</item>
+    <item msgid="8019330250538856521">"Con relevo"</item>
+    <item msgid="8987385315647049787">"Afundido"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"VPN L2TP/IPSec con claves precompartidas"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec con certificados"</item>
+    <item msgid="312397853907741968">"VPN IPSec con claves precompartidas e autenticación Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec con certificados e autenticación Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec con certificados e autenticación híbrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ningún"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Preguntar"</item>
+    <item msgid="7718817231348607934">"Non permitir nunca"</item>
+    <item msgid="8184570120217958741">"Permitir sempre"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistente"</item>
+    <item msgid="167418068739176448">"Actividade principal"</item>
+    <item msgid="4760813290195199773">"Importante (primeiro plano)"</item>
+    <item msgid="2328684826817647595">"Importante (segundo plano)"</item>
+    <item msgid="7746406490652867365">"Copia de seguranza"</item>
+    <item msgid="5597404364389196754">"Peso pesado"</item>
+    <item msgid="1290888779300174556">"Servizo (en execución)"</item>
+    <item msgid="7241098542073939046">"Servizo (reiniciando)"</item>
+    <item msgid="6610439017684111046">"Receptor"</item>
+    <item msgid="7367606086319921117">"Inicio"</item>
+    <item msgid="3344660712396741826">"Última actividade"</item>
+    <item msgid="5006559348883303865">"Na caché (actividade)"</item>
+    <item msgid="8633480732468137525">"Na caché (cliente de actividade)"</item>
+    <item msgid="6248998242443333892">"Na caché (en branco)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Verde azulado"</item>
+    <item msgid="3228505970082457852">"Azul"</item>
+    <item msgid="6590260735734795647">"Índigo"</item>
+    <item msgid="3521763377357218577">"Violeta"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Vermello"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"De máis de 30 días"</item>
+    <item msgid="8699273238891265610">"De máis de 60 días"</item>
+    <item msgid="8346279419423837266">"De máis de 90 días"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detectar automaticamente"</item>
+    <item msgid="773943026484148895">"Tratar como rede sen tarifa plana"</item>
+    <item msgid="1008268820118852416">"Tratar como rede con tarifa plana"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Usar MAC aleatorio (valor predeterminado)"</item>
+    <item msgid="214234417308375326">"Usar dispositivo MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Non"</item>
+    <item msgid="1930581185557754880">"Si"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Escuro"</item>
+    <item msgid="5079453644557603349">"Claro"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desactivado"</item>
+    <item msgid="4072198137051566919">"Depuración"</item>
+    <item msgid="2473005316958868509">"Detallado"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Só redes domésticas"</item>
+    <item msgid="1161026694891024702">"Automaticamente"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Preferencia: GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Só GSM"</item>
+    <item msgid="8579197487913425819">"Só WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automático"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automático"</item>
+    <item msgid="4219607161971472471">"CDMA sen EvDo"</item>
+    <item msgid="7278975240951052041">"Só EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA e LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Só TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-gl/strings.xml b/tests/CarDeveloperOptions/res/values-gl/strings.xml
index 39c99aa..7c516e0 100644
--- a/tests/CarDeveloperOptions/res/values-gl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gl/strings.xml
@@ -396,7 +396,7 @@
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"Engadiuse a cara"</string>
     <string name="security_settings_face_preference_summary_none" msgid="8427755590493904386">"Toca e configura a autenticación facial"</string>
     <string name="security_settings_face_preference_title" msgid="2630071872604654381">"Autenticación facial"</string>
-    <string name="security_settings_face_enroll_introduction_accessibility" msgid="1563255314851533140">"Usar configur. de accesibilidade"</string>
+    <string name="security_settings_face_enroll_introduction_accessibility" msgid="1563255314851533140">"Usar axustes de accesibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="1130222333285509856"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_vision" msgid="356568621735811168"></string>
     <string name="security_settings_face_enroll_introduction_cancel" msgid="4190924649721437238">"Cancelar"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protexe a túa tableta cunha opción de bloqueo de pantalla para que ninguén poida utilizala se a perdes ou cha rouban. Tamén é necesario para configurar a autenticación facial. Toca Cancelar e, despois, define un PIN ou escolle outra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protexe o teu dispositivo cunha opción de bloqueo de pantalla para que ninguén poida utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación facial. Toca Cancelar e, despois, define un PIN ou escolle outra opción de bloqueo de pantalla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protexe o teu teléfono cunha opción de bloqueo de pantalla para que ninguén poida utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación facial. Toca Cancelar e, despois, define un PIN ou escolle outra opción de bloqueo de pantalla."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Omitir a configuración do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Omitir a conf. do contrasinal?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Omitir a configur. do padrón?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueo da pantalla"</string>
@@ -762,7 +761,7 @@
     <string name="bluetooth_device_context_unpair" msgid="250588431708253041">"Desincronizar"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="4519151805677280077">"Desconectar e desincronizar"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Opcións..."</string>
-    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Config. avanzada"</string>
+    <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"Axustes avanzada"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Co Bluetooth activado, o dispositivo pode comunicarse con outros dispositivos Bluetooth próximos."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Cando o Bluetooth está activado, o dispositivo pode comunicarse con outros dispositivos Bluetooth das proximidades.\n\nPara mellorar a experiencia de uso do dispositivo, as aplicacións e os servizos poden seguir buscando dispositivos próximos en calquera momento, mesmo cando o Bluetooth está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización. Podes cambiar esta opción na "<annotation id="link">"configuración de busca"</annotation>"."</string>
@@ -831,7 +830,7 @@
     <string name="android_beam_off_summary" msgid="7365818039159364600">"Desactivado"</string>
     <string name="nfc_disabled_summary" msgid="2181777971122724361">"Non está dispoñible debido a que a opción NFC está desactivada"</string>
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="4501176353247859329">"Cando esta función está activada, podes transferir contido de aplicacións a outros dispositivos compatibles con NFC achegando os dispositivos entre si. Por exemplo, podes transmitir páxinas web, vídeos de YouTube, contactos, etc.\n\nSimplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transfire."</string>
+    <string name="android_beam_explained" msgid="4501176353247859329">"Cando esta función está activada, podes transferir contido de aplicacións a outros dispositivos compatibles con NFC achegando os dispositivos entre si. Por exemplo, podes transmitir páxinas web, vídeos de YouTube, contactosetc.\n\nSimplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transfire."</string>
     <string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2879870570547594266">"Activar a wifi"</string>
     <string name="wifi_settings" msgid="7486492317310514109">"Wifi"</string>
@@ -881,7 +880,7 @@
     <string name="wifi_menu_more_options" msgid="8318269834264035524">"Máis opcións"</string>
     <string name="wifi_menu_p2p" msgid="4945665601551289791">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="9082691677803181629">"Explorar"</string>
-    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Config. avanzada"</string>
+    <string name="wifi_menu_advanced" msgid="5984484498045511072">"Axustes avanzada"</string>
     <string name="wifi_menu_configure" msgid="52192491120701266">"Configurar"</string>
     <string name="wifi_menu_connect" msgid="3984327567173931219">"Conectar coa rede"</string>
     <string name="wifi_menu_remember" msgid="717257200269700641">"Lembrar rede"</string>
@@ -891,7 +890,7 @@
     <string name="wifi_empty_list_wifi_on" msgid="881478805041020600">"Buscando redes wifi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="2341613007817352431">"Non tes permiso para cambiar a rede wifi."</string>
     <string name="wifi_more" msgid="3538241640407382185">"Máis"</string>
-    <string name="wifi_setup_wps" msgid="6730131677695521321">"Config. automática (WPS)"</string>
+    <string name="wifi_setup_wps" msgid="6730131677695521321">"Axustes automática (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Queres activar a busca de redes wifi?"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"Para activar a wifi automaticamente, primeiro debes activar a busca de redes wifi."</string>
     <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"A busca de redes wifi permite que as aplicacións e os servizos busquen estas redes en calquera momento, mesmo se este tipo de conexión está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wifi"</item>
+    <item msgid="4421333712484542489">"Datos móbiles"</item>
+    <item msgid="6007360612667098926">"Só por wifi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1317,7 +1319,7 @@
     <string name="device_status_activity_title" msgid="4046298541311839468">"Estado"</string>
     <string name="device_status" msgid="395318738663800026">"Estado"</string>
     <string name="device_status_summary" product="tablet" msgid="8975790197766171710">"Estado da batería, da rede e outra información"</string>
-    <string name="device_status_summary" product="default" msgid="8282235230720651642">"Número de teléfono, sinal, etc."</string>
+    <string name="device_status_summary" product="default" msgid="8282235230720651642">"Número de teléfono, sinal etc."</string>
     <string name="storage_settings" msgid="7009733301485139652">"Almacenamento"</string>
     <string name="storage_settings_for_app" msgid="3028887232073069965">"Almacenamento e memoria caché"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"Almacenamento"</string>
@@ -1366,7 +1368,7 @@
     <string name="memory_media_usage" msgid="2744652206722240527">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="7039979723012065168">"Descargas"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"Imaxes, vídeos"</string>
-    <string name="memory_music_usage" msgid="809605300042546279">"Audio (música, tons de chamada, podcasts, etc.)"</string>
+    <string name="memory_music_usage" msgid="809605300042546279">"Audio (música, tons de chamada, podcasts etc.)"</string>
     <string name="memory_media_misc_usage" msgid="6258827529046910705">"Outros ficheiros"</string>
     <string name="memory_media_cache_usage" msgid="1307620682751377717">"Datos da caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="3016608823130472449">"Desactivar almacenamento"</string>
@@ -1450,7 +1452,7 @@
     <string name="storage_detail_other" msgid="9164851767437306618">"Outro"</string>
     <string name="storage_detail_system" msgid="6784247618772153283">"Sistema"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"Na sección Outros inclúense os ficheiros compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou por Bluetooth, os ficheiros de Android, etc. \n\nPara ver o contido visible da <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"Na sección Outros inclúense os ficheiros compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou por Bluetooth, os ficheiros de Android etc. \n\nPara ver o contido visible da <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"O sistema inclúe arquivos usados para executar a versión <xliff:g id="VERSION">%s</xliff:g> de Android"</string>
     <string name="storage_detail_dialog_user" msgid="1663117417635010371">"É posible que <xliff:g id="USER_0">^1</xliff:g> gardase fotos, música, aplicacións ou outros datos que ocupan <xliff:g id="SIZE">^2</xliff:g> do almacenamento. \n\nPara ver máis detalles, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1458,7 +1460,7 @@
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"Para migrar fotos e outros contidos multimedia entre dispositivos."</string>
     <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"Usar como almacenamento interno"</string>
     <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"Para almacenar calquera cousa só neste dispositivo, incluídas as aplicacións e as fotos. É necesario formatar para evitar que funcione con outros dispositivos."</string>
-    <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"Formatar como almacenam. interno"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"Formatar como almacenaxe interna"</string>
     <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"Esta acción esixe que se formate a <xliff:g id="NAME_0">^1</xliff:g> para que estea protexida. \n\nDespois de formatala, esta <xliff:g id="NAME_1">^1</xliff:g> só funcionará neste dispositivo. \n\n"<b>"Ao formatar borraranse todos os datos almacenados actualmente na <xliff:g id="NAME_2">^1</xliff:g>."</b>" Para evitar perder os datos, considera a posibilidade de facer unha copia de seguranza."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="5866830103788091426">"Formatar como almacen. portátil"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"Esta acción esixe que se formate a <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"O formatado borra todos os datos actualmente almacenados en <xliff:g id="NAME_1">^1</xliff:g>."</b>" Para evitar perder os datos, pensa na posibilidade de facer unha copia de seguranza."</string>
@@ -1566,7 +1568,7 @@
     <string name="reset_network_title" msgid="8944059136930806211">"Restablecer wifi, rede móbil e Bluetooth"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"Con esta selección, restableceranse todas as opcións de configuración de rede, entre elas as referentes a:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"Borrar SIM descargadas"</string>
-    <string name="reset_esim_desc" msgid="433226911566802">"Para descargar tarxetas SIM de substitución, ponte en contacto co teu operador. Non se cancelará ningún dos plans de servizos para móbiles que teñas."</string>
+    <string name="reset_esim_desc" msgid="433226911566802">"Para descargar tarxetas SIM de substitución, ponte en contacto co teu operador. Non se cancelará ningún dos plans de servizos móbiles que teñas."</string>
     <string name="reset_network_button_text" msgid="4293271046867912819">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="2463817067048751373">"Queres restablecer toda a configuración de rede? Non se pode desfacer esta acción."</string>
     <string name="reset_network_final_desc_esim" msgid="4676436976372555750">"Queres restablecer todas as opcións de configuración de rede e borrar as SIM descargadas? Non se pode desfacer esta acción."</string>
@@ -1611,7 +1613,7 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="1289593649526514499">"Zona wifi e conexión compartida activadas"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="8010689354668285422">"Zona wifi activada"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1349909238672649877">"Conexión compartida activada"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"Non se pode compartir a conexión nin utilizar zonas wifi portátiles mentres o economizador de datos estea activado"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"Non se pode compartir a conexión nin utilizar zonas wifi portátiles mentres o aforro de datos estea activado"</string>
     <string name="usb_title" msgid="7480927657535578688">"USB"</string>
     <string name="usb_tethering_button_text" msgid="6242228383142012332">"Compartir conexión por USB"</string>
     <string name="usb_tethering_subtext" product="default" msgid="1573513260339548671">"Comparte a conexión a Internet do teléfono por USB"</string>
@@ -1854,7 +1856,7 @@
     <string name="internal_storage" msgid="7392373600013294853">"Almacenamento interno"</string>
     <string name="recompute_size" msgid="4290692197892743928">"Recalculando o tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="7388024498687029597">"Eliminar os datos da aplicación?"</string>
-    <string name="clear_data_dlg_text" msgid="6849657743695013414">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, opcións de configuracións, contas, bases de datos, etc."</string>
+    <string name="clear_data_dlg_text" msgid="6849657743695013414">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, opcións de configuracións, contas, bases de datos etc."</string>
     <string name="dlg_ok" msgid="4666570206507476557">"Aceptar"</string>
     <string name="dlg_cancel" msgid="2434951039156262467">"Cancelar"</string>
     <string name="app_not_found_dlg_title" msgid="394147475018718483"></string>
@@ -2499,7 +2501,7 @@
     <string name="voice_input_settings" msgid="4983011614890521505">"Configuración da entrada de voz"</string>
     <string name="voice_input_settings_title" msgid="6865032806501269306">"Entrada de voz"</string>
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"Servizos de entrada de voz"</string>
-    <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"Interacción e palabra activa completa"</string>
+    <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"Interacción e palabra de activación completa"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"Síntese de voz simple"</string>
     <string name="voice_interaction_security_warning" msgid="4986261746316889768">"Este servizo de entrada de voz poderá supervisar que a voz sempre estea activada e controlar as aplicacións compatibles coa voz no teu nome. Procede da aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Queres activar o uso deste servizo?"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"Motor preferido"</string>
@@ -2534,7 +2536,7 @@
     <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"Instalada para a VPN e as aplicacións"</string>
     <string name="credential_for_wifi" msgid="2903295786961726388">"Instalada para a wifi"</string>
     <string name="credentials_reset_hint" msgid="3484350477764088169">"Queres eliminar todos os contidos?"</string>
-    <string name="credentials_erased" msgid="7287088033523869085">"Almacenam. credenciais borrado"</string>
+    <string name="credentials_erased" msgid="7287088033523869085">"Almacenaxe credenciais borrada"</string>
     <string name="credentials_not_erased" msgid="9137227570738627637">"Imposible borrar almacen. credenciais"</string>
     <string name="usage_access_title" msgid="7981321142726540574">"Apps con acceso de uso"</string>
     <string name="emergency_tone_title" msgid="130211364025984428">"Sinal de marcación de emerxencia"</string>
@@ -2546,8 +2548,8 @@
     <string name="personal_data_section_title" msgid="9161854418510071558">"Datos persoais"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Realizar copia de seguranza dos meus datos"</string>
     <string name="backup_data_summary" msgid="555459891017933746">"Crea unha copia de seguranza dos datos da aplicación, dos contrasinais das redes wifi e doutras configuracións en servidores de Google"</string>
-    <string name="backup_configure_account_title" msgid="1534734650559070294">"Conta de copia seguranza"</string>
-    <string name="backup_data_management_title" msgid="6299288795610243508">"Xestionar conta de copia de seguranza"</string>
+    <string name="backup_configure_account_title" msgid="1534734650559070294">"Copia de seguranza: conta"</string>
+    <string name="backup_data_management_title" msgid="6299288795610243508">"Xestionar conta para a copia de seguranza"</string>
     <string name="include_app_data_title" msgid="6117211611131913293">"Incluír datos de aplicacións"</string>
     <string name="auto_restore_title" msgid="8367486774010915221">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="1941047568966428377">"Cando volvas instalar unha aplicación, restaura a configuración e os datos dos que fixeches unha copia de seguranza"</string>
@@ -2615,7 +2617,7 @@
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
     <string name="sync_calendar" msgid="6573708019827519372">"Calendario"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"Contactos"</string>
-    <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Benvido á sincronización de Google."</font>" \nUn método de Google que che permite sincronizar datos para que poidas acceder aos teus contactos, citas, etc. esteas onde esteas."</string>
+    <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Benvido á sincronización de Google."</font>" \nUn método de Google que che permite sincronizar datos para que poidas acceder aos teus contactos, citas etc. esteas onde esteas."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"Configuración da sincronización de aplicacións"</string>
     <string name="header_data_and_synchronization" msgid="400831816068697286">"Datos e sincronización"</string>
     <string name="preference_change_password_title" msgid="7243527448378789274">"Cambiar contrasinal"</string>
@@ -2864,7 +2866,7 @@
     <string name="user_add_user_item_title" msgid="6835385073795492410">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"Perfil restrinxido"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"Engadir un usuario novo?"</string>
-    <string name="user_add_user_message_long" msgid="686637203224195465">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla, etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios. Non se poden transferir ao novo usuario os servizos nin a configuración de accesibilidade."</string>
+    <string name="user_add_user_message_long" msgid="686637203224195465">"Podes compartir este dispositivo con outras persoas a través da creación de usuarios adicionais. Cada usuario ten o seu propio espazo que pode personalizar coas súas propias aplicacións, fondos de pantalla etc. Os usuarios tamén poden modificar as opcións de configuración do dispositivo, como a rede wifi, que afectan a todo o mundo.\n\nCando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios. Non se poden transferir ao novo usuario os servizos nin a configuración de accesibilidade."</string>
     <string name="user_add_user_message_short" msgid="1802594476285458254">"Cando engadas un usuario novo, este deberá configurar o seu espazo.\n\nCalquera usuario pode actualizar as aplicacións para todos os demais usuarios."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"Configurar o usuario agora?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Asegúrate de que a persoa está dispoñible para acceder ao dispositivo e configurar o seu espazo"</string>
@@ -3365,9 +3367,9 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"Ningún asistente"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"Ningunha aplicación instalada solicitou o acceso ás notificacións."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"Queres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> teña acceso ás notificacións?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, como os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá modificar ou ignorar as notificacións e activar os botóns de acción que conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, como os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá modificar ou ignorar as notificacións e activar os botóns de acción que estas conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"Queres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> teña acceso ás notificacións?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, coma os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá ignorar notificacións ou activar os botóns de acción que conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, coma os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá ignorar notificacións ou activar os botóns de acción que estas conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"Se desactivas o acceso de <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ás notificacións, é posible que tamén se desactive o acceso en modo Non molestar."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Cancelar"</string>
@@ -3522,7 +3524,7 @@
     <string name="zen_mode_when" msgid="7835420687948416255">"Activar automaticam."</string>
     <string name="zen_mode_when_never" msgid="4506296396609224524">"Nunca"</string>
     <string name="zen_mode_when_every_night" msgid="3942151668791426194">"Todas as noites"</string>
-    <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"Noites pola semana"</string>
+    <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"Noites entre semana"</string>
     <string name="zen_mode_start_time" msgid="5979122139937561731">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="3188578493250909972">"Hora de finalización"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do día seguinte"</string>
@@ -3804,8 +3806,8 @@
     <string name="overlay_settings" msgid="3325154759946433666">"Superpoñer sobre aplicacións"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"Aplicacións con permiso para superpoñerse a outras: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6336897660213304743">"Aplicacións con permiso"</string>
-    <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Aplicación permitida"</string>
-    <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Aplicación non permitida"</string>
+    <string name="app_permission_summary_allowed" msgid="6458476982015518778">"Permitido"</string>
+    <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"Non permitido"</string>
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"instalar aplicacións fontes descoñecidas"</string>
     <string name="write_settings" msgid="9009040811145552108">"Modificar configuración"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"editar ou modificar axustes do sistema"</string>
@@ -3891,7 +3893,7 @@
     <string name="condition_battery_summary" msgid="1236078243905690620">"Hai funcións restrinxidas"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"Datos móbiles desactivados"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Internet só está dispoñible mediante a wifi"</string>
-    <string name="condition_bg_data_title" msgid="184684435298857712">"Economizador de datos"</string>
+    <string name="condition_bg_data_title" msgid="184684435298857712">"Aforro de datos"</string>
     <string name="condition_bg_data_summary" msgid="5194942860807136682">"Hai funcións restrinxidas"</string>
     <string name="condition_work_title" msgid="9046811302347490371">"Perfil de traballo desactivado"</string>
     <string name="condition_work_summary" msgid="5586134491975748565">"Para aplicacións e notificacións"</string>
@@ -3958,8 +3960,8 @@
     <string name="configure" msgid="8232696842838580549">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="7002491980141402084">"Outras aplicacións incluídas no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacións poden usar datos sen restricións cando o Economizador de datos está activado</item>
-      <item quantity="one">1 aplicación pode usar datos sen restricións cando o Economizador de datos está activado</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacións poden usar datos sen restricións cando o aforro de datos está activado</item>
+      <item quantity="one">1 aplicación pode usar datos sen restricións cando o aforro de datos está activado</item>
     </plurals>
     <string name="data_usage_title" msgid="7874606430902201083">"Datos principais"</string>
     <string name="data_usage_wifi_title" msgid="7161828479387766556">"Datos wifi"</string>
@@ -3979,14 +3981,14 @@
     <string name="no_carrier_update_now_text" msgid="4405472895804759042">"Actualizado agora mesmo"</string>
     <string name="launch_mdp_app_text" msgid="9186559496664208252">"Ver plan"</string>
     <string name="launch_wifi_text" msgid="317820210431682605">"Ver detalles"</string>
-    <string name="data_saver_title" msgid="7903308134514179256">"Economizador de datos"</string>
+    <string name="data_saver_title" msgid="7903308134514179256">"Aforro de datos"</string>
     <string name="unrestricted_data_saver" msgid="9139401849550738720">"Datos sen restricións"</string>
     <string name="restrict_background_blacklisted" msgid="7158991683849067124">"Desactiváronse os datos en segundo plano"</string>
     <string name="data_saver_on" msgid="7281809065420480881">"Activado"</string>
     <string name="data_saver_off" msgid="7439439787358504018">"Desactivado"</string>
-    <string name="data_saver_switch_title" msgid="8244008132112735207">"Usar Economizador de datos"</string>
+    <string name="data_saver_switch_title" msgid="8244008132112735207">"Usar Aforro de datos"</string>
     <string name="unrestricted_app_title" msgid="4390661122069905122">"Uso de datos sen restricións"</string>
-    <string name="unrestricted_app_summary" msgid="2829141815077800483">"Acceso sen restricións co Economizador de datos activado"</string>
+    <string name="unrestricted_app_summary" msgid="2829141815077800483">"Acceso sen restricións co aforro de datos activado"</string>
     <string name="home_app" msgid="3695063566006954160">"Aplicación de Inicio"</string>
     <string name="no_default_home" msgid="1518949210961918497">"Non hai inicio predeterminado"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="63693894094570367">"Inicio seguro"</string>
@@ -4114,25 +4116,25 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Para cambiar de aplicacións, pasa o dedo cara arriba no botón de inicio. Pásao de novo para ver todas as aplicacións. Este xesto funciona en calquera pantalla, así que deixarás de ter na parte inferior dereita o botón Visión xeral."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"Proba o novo botón de inicio"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"Activa o novo xesto para cambiar de aplicacións"</string>
-    <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Dobre toque para consultar o teléfono"</string>
+    <string name="ambient_display_title" product="default" msgid="6785677099744344088">"Dobre toque no teléfono para consultalo"</string>
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"Tocar dúas veces para consultar a tableta"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"Tocar dúas veces para consultar o dispositivo"</string>
     <string name="ambient_display_summary" msgid="4882910328216411109">"Para consultar a hora, as notificacións e outra información, toca a pantalla dúas veces."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Levantar teléfono para consultalo"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="7141652156907066938">"Levantar o teléfono para consultalo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="1555456400210301959">"Levantar a tableta para consultala"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="2480126522988135037">"Levantar o dispositivo para consultalo"</string>
     <string name="ambient_display_wake_screen_title" msgid="3376988352851077102">"Activar a pantalla de bloqueo"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Para consultar a hora, as notificacións e outros datos, colle o teléfono."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Para consultar a hora, as notificacións e outros datos, colle a tableta."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Para consultar a hora, as notificacións e outros datos, colle o dispositivo."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Tocar para consultar o teléfono"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Toque no teléfono para consultalo"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Toca para consultar a tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Tocar para consultar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Para consultar a hora, as notificacións e outra información, toca a pantalla."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"Dedo no sensor para ver notificacións"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Pasar dedo polo sensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="4347999905190477310">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira da tableta."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="3480057984564476283">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital, situado na parte traseira da tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"Consultar notificacións rapidamente"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"Activado"</string>
@@ -4273,6 +4275,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Esta función reducirá a velocidade do teléfono"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forzar medicións completas de GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Realiza un seguimento de todas as frecuencias e constelacións de satélites de GNSS sen ciclos"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Depurar ao cambiar de usuario"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Mostra información detallada ao cambiar de usuario"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permitir inicio de actividades en segundo plano"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permite que se inicie a actividade en segundo plano"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Mostrar sempre o cadro de diálogo de fallos"</string>
diff --git a/tests/CarDeveloperOptions/res/values-gu-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-gu-nokeys/strings.xml
new file mode 100644
index 0000000..310e9da
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-gu-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"એપ્લિકેશન્સનું સંચાલન કરો"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-gu/arrays.xml b/tests/CarDeveloperOptions/res/values-gu/arrays.xml
new file mode 100644
index 0000000..4691201
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-gu/arrays.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"અમેરિકા"</item>
+    <item msgid="4791956477275129121">"યુરોપ"</item>
+    <item msgid="3812126832016254559">"આફ્રિકા"</item>
+    <item msgid="2765816300353408280">"એશિયા"</item>
+    <item msgid="6683489385344409742">"ઑસ્ટ્રેલિયા"</item>
+    <item msgid="5194868215515664953">"પેસિફિક"</item>
+    <item msgid="7044520255415007865">"તમામ"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ત્વરિત"</item>
+    <item msgid="2038544972632026612">"5 સેકન્ડ"</item>
+    <item msgid="5558060663472279597">"15 સેકન્ડ"</item>
+    <item msgid="45341168505452037">"30 સેકન્ડ"</item>
+    <item msgid="227647485917789272">"1 મિનિટ"</item>
+    <item msgid="3367011891231217504">"2 મિનિટ"</item>
+    <item msgid="4376575879222393045">"5 મિનિટ"</item>
+    <item msgid="811192536981678974">"10 મિનિટ"</item>
+    <item msgid="7258394417241706272">"30 મિનિટ"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"કનેક્ટ થયું"</item>
+    <item msgid="983792611851499732">"આમંત્રિત"</item>
+    <item msgid="5438273405428201793">"અસફળ"</item>
+    <item msgid="4646663015449312554">"ઉપલબ્ધ"</item>
+    <item msgid="3230556734162006146">"શ્રેણીથી બહાર"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"સિસ્ટમ ડિફૉલ્ટનો ઉપયોગ કરો: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"છેલ્લા 30 દિવસ"</item>
+    <item msgid="3211287705232736964">"વપરાશ સાયકલ સેટ કરો..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"વપરાશ સમય"</item>
+    <item msgid="2784401352592276015">"છેલ્લે ઉપયોગ કરેલ સમય"</item>
+    <item msgid="249854287216326349">"એપ્લિકેશનનું નામ"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"કોઈ નહીં"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"કોઈ નહીં"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"સિમ"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"કોઈ નહીં"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"કોઈ નહીં"</item>
+    <item msgid="1464741437353223198">"મેન્યુઅલ"</item>
+    <item msgid="5793600062487886090">"પ્રોક્સી આપમેળે ગોઠવો"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"કોઈ નહીં"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP અથવા CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"અનિર્દિષ્ટ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"કોઈ નહીં"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"આંતરિક ઉપકરણ સંગ્રહ"</item>
+    <item msgid="3186681694079967527">"દૂર કરવા યોગ્ય SD કાર્ડ"</item>
+    <item msgid="6902033473986647035">"સિસ્ટમને નક્કી કરવા દો"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"સ્થાન"</item>
+    <item msgid="6842381562497597649">"વ્યક્તિગત"</item>
+    <item msgid="3966700236695683444">"મેસેજિંગ"</item>
+    <item msgid="8563996233342430477">"મીડિયા"</item>
+    <item msgid="5323851085993963783">"ઉપકરણ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ખરબચડું સ્થાન"</item>
+    <item msgid="1830619568689922920">"સારું સ્થાન"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"વાઇબ્રેટ"</item>
+    <item msgid="8632513128515114092">"સંપર્કો વાંચો"</item>
+    <item msgid="3741042113569620272">"સંપર્કો સંશોધિત કરો"</item>
+    <item msgid="4204420969709009931">"કૉલ લૉગ વાંચો"</item>
+    <item msgid="2260380357119423209">"કૉલ લૉગ સંશોધિત કરો"</item>
+    <item msgid="6550710385014530934">"કૅલેન્ડર વાંચો"</item>
+    <item msgid="3575906174264853951">"કૅલેન્ડર સંશોધિત કરો"</item>
+    <item msgid="4319843242568057174">"wi-fi સ્કેન કરો"</item>
+    <item msgid="2981791890467303819">"નોટિફિકેશન"</item>
+    <item msgid="6617825156152476692">"સેલ સ્કેન"</item>
+    <item msgid="8865260890611559753">"કૉલ કરો"</item>
+    <item msgid="3254999273961542982">"SMS વાંચો"</item>
+    <item msgid="7711446453028825171">"SMS લખો"</item>
+    <item msgid="6123238544099198034">"SMS પ્રાપ્ત કરો"</item>
+    <item msgid="838342167431596036">"કટોકટી SMS પ્રાપ્ત કરો"</item>
+    <item msgid="8554432731560956686">"MMS પ્રાપ્ત કરો"</item>
+    <item msgid="7464863464299515059">"WAP પુશ પ્રાપ્ત કરો"</item>
+    <item msgid="310463075729606765">"SMS મોકલો"</item>
+    <item msgid="7338021933527689514">"ICC SMS વાંચો"</item>
+    <item msgid="6130369335466613036">"ICC SMS લખો"</item>
+    <item msgid="6536865581421670942">"સેટિંગ્સ સંશોધિત કરો"</item>
+    <item msgid="4547203129183558973">"શીર્ષ પર ખેંચો"</item>
+    <item msgid="9080347512916542840">"ઍક્સેસ સૂચનાઓ"</item>
+    <item msgid="5332718516635907742">"કૅમેરો"</item>
+    <item msgid="6098422447246167852">"ઑડિઓ રેકોર્ડ કરો"</item>
+    <item msgid="9182794235292595296">"ઑડિઓ ચલાવો"</item>
+    <item msgid="8760743229597702019">"ક્લિપબોર્ડ વાંચો"</item>
+    <item msgid="2266923698240538544">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
+    <item msgid="1801619438618539275">"મીડિયા બટન્સ"</item>
+    <item msgid="31588119965784465">"ઑડિઓ ફોકસ"</item>
+    <item msgid="7565226799008076833">"માસ્ટર વૉલ્યૂમ"</item>
+    <item msgid="5420704980305018295">"વૉઇસ વૉલ્યૂમ"</item>
+    <item msgid="5797363115508970204">"રિંગ વૉલ્યૂમ"</item>
+    <item msgid="8233154098550715999">"મીડિયા વૉલ્યૂમ"</item>
+    <item msgid="5196715605078153950">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="394030698764284577">"નોટિફિકેશન વૉલ્યૂમ"</item>
+    <item msgid="8952898972491680178">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+    <item msgid="8506227454543690851">"સક્રિય રાખો"</item>
+    <item msgid="1108160036049727420">"સ્થાનને મૉનિટર કરો"</item>
+    <item msgid="1496205959751719491">"હાઇ પાવર સ્થાન મૉનિટર કરો"</item>
+    <item msgid="3776296279910987380">"વપરાશ આંકડા મેળવો"</item>
+    <item msgid="8827100324471975602">"માઇક્રોફોનનો અવાજ બંધ/ચાલુ કરો"</item>
+    <item msgid="6880736730520126864">"ટોસ્ટ બતાવો"</item>
+    <item msgid="4933375960222609935">"પ્રોજેક્ટ મીડિયા"</item>
+    <item msgid="8357907018938895462">"VPN સક્રિય કરો"</item>
+    <item msgid="8143812849911310973">"વૉલપેપર પર લખો"</item>
+    <item msgid="6266277260961066535">"મદદ સંરચના"</item>
+    <item msgid="7715498149883482300">"મદદ સ્ક્રીનશોટ"</item>
+    <item msgid="4046679376726313293">"ફોન સ્થિતિ વાંચો"</item>
+    <item msgid="6329507266039719587">"વૉઇસમેઇલ ઉમેરો"</item>
+    <item msgid="7692440726415391408">"sip નો ઉપયોગ કરો"</item>
+    <item msgid="8572453398128326267">"આઉટગોઇંગ કૉલ પર પ્રક્રિયા કરો"</item>
+    <item msgid="7775674394089376306">"ફિંગરપ્રિન્ટની સેટિંગ"</item>
+    <item msgid="3182815133441738779">"બોડી સેન્સર્સ"</item>
+    <item msgid="2793100005496829513">"સેલ બ્રોડકાસ્ટ્સ વાંચો"</item>
+    <item msgid="2633626056029384366">"મોક સ્થાન"</item>
+    <item msgid="8356842191824684631">"સ્ટોરેજ વાંચો"</item>
+    <item msgid="5671906070163291500">"સ્ટોરેજ પર લખો"</item>
+    <item msgid="2791955098549340418">"સ્ક્રીન ચાલુ કરો"</item>
+    <item msgid="5599435119609178367">"એકાઉન્ટ્સ મેળવો"</item>
+    <item msgid="1165623660533024666">"પૃષ્ઠભૂમિમાં ચલાવો"</item>
+    <item msgid="6423861043647911030">"ઍક્સેસિબિલિટી વૉલ્યૂમ"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"નાનો"</item>
+    <item msgid="4816511817309094890">"મધ્યમ"</item>
+    <item msgid="8305084671259331134">"લાંબો"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ડિફૉલ્ટ"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"કૅઝૂઅલ"</item>
+    <item msgid="4627069151979553527">"કર્સિવ"</item>
+    <item msgid="6896773537705206194">"નાના કેપિટલ્સ"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"પહેલાંથી શેર કરેલ કીઝ સાથે L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"પ્રમાણપત્રો સાથે L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"પૂર્વ શેર કરેલી કીઝ અને Xauth પ્રમાણીકરણ સાથે IPSec VPN"</item>
+    <item msgid="3319427315593649917">"પ્રમાણપત્રો અને Xauth પ્રમાણીકરણ સાથે IPSec VPN"</item>
+    <item msgid="8258927774145391041">"પ્રમાણપત્રો અને સંકર પ્રમાણીકરણ સાથે IPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_proxy_settings:0 (2958623927055120839) -->
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"પૂછો"</item>
+    <item msgid="7718817231348607934">"ક્યારેય મંજૂરી આપશો નહીં"</item>
+    <item msgid="8184570120217958741">"હંમેશા મંજૂરી આપો"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"નિરંતર"</item>
+    <item msgid="167418068739176448">"ટોચની પ્રવૃત્તિ"</item>
+    <item msgid="4760813290195199773">"મહત્વપૂર્ણ (અગ્રભૂમિ)"</item>
+    <item msgid="2328684826817647595">"મહત્વપૂર્ણ (બૅકગ્રાઉન્ડ)"</item>
+    <item msgid="7746406490652867365">"બૅકઅપ"</item>
+    <item msgid="5597404364389196754">"ભારે વજન"</item>
+    <item msgid="1290888779300174556">"સેવા (ચાલે છે)"</item>
+    <item msgid="7241098542073939046">"સેવા (પુનઃપ્રારંભ થાય છે)"</item>
+    <item msgid="6610439017684111046">"પ્રાપ્તકર્તા"</item>
+    <item msgid="7367606086319921117">"ઘર"</item>
+    <item msgid="3344660712396741826">"છેલ્લી પ્રવૃત્તિ"</item>
+    <item msgid="5006559348883303865">"કેશ્ડ (પ્રવૃત્તિ)"</item>
+    <item msgid="8633480732468137525">"કેશ્ડ (પ્રવૃત્તિ ક્લાઇન્ટ)"</item>
+    <item msgid="6248998242443333892">"કેશ્ડ (ખાલી)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"મોરપીછ"</item>
+    <item msgid="3228505970082457852">"વાદળી"</item>
+    <item msgid="6590260735734795647">"ઘેરો વાદળી રંગ"</item>
+    <item msgid="3521763377357218577">"જાંબલી"</item>
+    <item msgid="5932337981182999919">"ગુલાબી"</item>
+    <item msgid="5642914536624000094">"લાલ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 દિવસથી વધુ જૂના"</item>
+    <item msgid="8699273238891265610">"60 દિવસથી વધુ જૂના"</item>
+    <item msgid="8346279419423837266">"90 દિવસથી વધુ જૂના"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"આપમેળે શોધો"</item>
+    <item msgid="773943026484148895">"મીટર કરેલ તરીકે ગણો"</item>
+    <item msgid="1008268820118852416">"મીટર ન કરેલ તરીકે ગણો"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"રેન્ડમ કરેલ MACનો ઉપયોગ કરો (ડિફૉલ્ટ)"</item>
+    <item msgid="214234417308375326">"MAC ડિવાઇસનો ઉપયોગ કરો"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"નહીં"</item>
+    <item msgid="1930581185557754880">"હા"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ઘેરી"</item>
+    <item msgid="5079453644557603349">"આછું"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"બંધ"</item>
+    <item msgid="4072198137051566919">"ડિબગ કરો"</item>
+    <item msgid="2473005316958868509">"શબ્દબહુલ"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"માત્ર હોમ"</item>
+    <item msgid="1161026694891024702">"આપમેળે"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA પસંદ કર્યો છે"</item>
+    <item msgid="7581481130337402578">"માત્ર GSM"</item>
+    <item msgid="8579197487913425819">"માત્ર WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ઑટો"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ઑટો"</item>
+    <item msgid="4219607161971472471">"EvDo વિના CDMA"</item>
+    <item msgid="7278975240951052041">"માત્ર EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"વૈશ્વિક"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"માત્ર TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"વૈશ્વિક"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-gu/strings.xml b/tests/CarDeveloperOptions/res/values-gu/strings.xml
index 66f468b..41d4146 100644
--- a/tests/CarDeveloperOptions/res/values-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/strings.xml
@@ -165,7 +165,7 @@
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> તમારા સિમ કાર્ડને અ‍ૅક્સેસ કરવા માગે છે. સિમ કાર્ડની અ‍ૅક્સેસને મંજૂરી આપવું કનેક્શનના સમયગાળા માટે તમારા ઉપકરણ પર ડેટા કનેક્ટિવિટીને અક્ષમ કરશે. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> ને અ‍ૅક્સેસ આપો"</string>
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"તે અન્ય ઉપકરણોને \'<xliff:g id="DEVICE_NAME">^1</xliff:g>\' તરીકે દેખાય છે"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"અન્ય ઉપકરણો સાથે કનેક્ટ કરવા માટે બ્લૂટૂથ ચાલુ કરો."</string>
-    <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"તમારા ઉપકરણો"</string>
+    <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"તમારા ડિવાઇસ"</string>
     <string name="bluetooth_pairing_page_title" msgid="9053463656712597709">"નવા ઉપકરણ જોડો"</string>
     <string name="bluetooth_pref_summary" product="tablet" msgid="3601662966604648212">"તમારા ટૅબ્લેટને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
     <string name="bluetooth_pref_summary" product="device" msgid="2286727776570956969">"તમારા ઉપકરણને નજીકના બ્લૂટૂથ ઉપકરણો સાથે સંચાર કરવાની મંજૂરી આપો"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ટૅબ્લેટનું રક્ષણ કરો કે જેથી તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકે નહીં. ચહેરાના પ્રમાણીકરણનું સેટઅપ કરવા માટે સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પણ તમે સેટ કરેલો હોવો જોઈએ. રદ કરોને ટૅપ કરો, પછી પિન સેટ કરો અથવા સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પસંદ કરો."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ડિવાઇસનું રક્ષણ કરો કે જેથી તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકે નહીં. ચહેરાના પ્રમાણીકરણનું સેટઅપ કરવા માટે સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પણ તમે સેટ કરેલો હોવો જોઈએ. રદ કરોને ટૅપ કરો, પછી પિન સેટ કરો અથવા સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પસંદ કરો."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ફોનનું રક્ષણ કરો કે જેથી તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકે નહીં. ચહેરાના પ્રમાણીકરણનું સેટઅપ કરવા માટે સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પણ તમે સેટ કરેલો હોવો જોઈએ. રદ કરોને ટૅપ કરો, પછી પિન સેટ કરો અથવા સ્ક્રીન લૉકનો કોઈ અન્ય વિકલ્પ પસંદ કરો."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"પિન સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"પાસવર્ડ સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"પૅટર્ન સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"સ્ક્રીન લૉક સેટ કરો"</string>
@@ -821,7 +820,7 @@
     <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"ડીબગ કરવા યોગ્ય ઍપ માટે બાઇટકોડને ચકાસવા ARTને મંજૂરી આપો"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"જ્યારે ફોન બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"જ્યારે ફોન બીજા ડિવાઇસને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
     <string name="nfc_disclaimer_title" msgid="4860231267351602970">"NFC ચાલુ કરો"</string>
     <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC આ ઉપકરણ અને અન્ય નજીકના ઉપકરણો અથવા લક્ષ્યો વચ્ચે ડેટાની આપ-લે કરે છે, જેમ કે ચુકવણી ટર્મિનલ્સ, અ‍ૅક્સેસ રીડર્સ અને ક્રિયા-પ્રતિક્રિયાત્મક જાહેરાતો અથવા ટૅગ્સ."</string>
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"NFCને સુરક્ષિત કરો"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"વાઇ-ફાઇ"</item>
+    <item msgid="4421333712484542489">"મોબાઇલ"</item>
+    <item msgid="6007360612667098926">"ફક્ત વાઇ-ફાઇ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1163,7 +1165,7 @@
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"વ્યક્તિગત એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="5809250790214921377">"શોધો"</string>
     <string name="display_settings" msgid="1045535829232307190">"ડિસ્પ્લે"</string>
-    <string name="accelerometer_title" msgid="2427487734964971453">"સ્ક્રીનને આપમેળે ફેરવો"</string>
+    <string name="accelerometer_title" msgid="2427487734964971453">"ઑટો રોટેટ સ્ક્રીન"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"રંગો"</string>
     <string name="color_mode_option_natural" msgid="1292837781836645320">"કુદરતી"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"બુસ્ટ કરેલ"</string>
@@ -1214,7 +1216,7 @@
     <string name="night_display_status_title" msgid="1727020934735770319">"સ્થિતિ"</string>
     <string name="night_display_temperature_title" msgid="8375126629902616296">"તીવ્રતા"</string>
     <string name="night_display_summary_off" msgid="8850539785332228069">"બંધ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"આપમેળે ક્યારેય ચાલુ નહીં થાય"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"ક્યારેય ઑટોમૅટિક રીતે ચાલુ નહીં થાય"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે ચાલુ થઈ જશે"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"સૂર્યાસ્ત સમયે આપમેળે ચાલુ થઈ જશે"</string>
     <string name="night_display_summary_on" msgid="6580571388791426596">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1321,7 +1323,7 @@
     <string name="storage_settings" msgid="7009733301485139652">"સ્ટોરેજ"</string>
     <string name="storage_settings_for_app" msgid="3028887232073069965">"સ્ટોરેજ અને કૅશ મેમરી"</string>
     <string name="storage_usb_settings" msgid="4470138799276333403">"સ્ટોરેજ"</string>
-    <string name="storage_settings_title" msgid="7348362600789024415">"સ્ટોરેજ સેટિંગ્સ"</string>
+    <string name="storage_settings_title" msgid="7348362600789024415">"સ્ટોરેજ સેટિંગ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="600267641559698394">"USB સંગ્રહને અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
     <string name="storage_settings_summary" product="default" msgid="6233147555590816245">"SD કાર્ડ અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
     <string name="imei_multi_sim" msgid="6462221220123699987">"IMEI (સિમ સ્લૉટ %1$d)"</string>
@@ -1815,7 +1817,7 @@
     <string name="external_data_size_label" product="default" msgid="1097584278225902734">"SD કાર્ડ"</string>
     <string name="uninstall_text" msgid="4859715815689705801">"અનઇન્સ્ટોલ કરો"</string>
     <string name="uninstall_all_users_text" msgid="2620518509352561416">"બધા વપરાશકર્તાઓ માટે અનઇન્સ્ટોલ કરો"</string>
-    <string name="install_text" msgid="2798092278891807849">"ઇન્સ્ટોલ કરો"</string>
+    <string name="install_text" msgid="2798092278891807849">"ઇન્સ્ટૉલ કરો"</string>
     <string name="disable_text" msgid="5065834603951474397">"અક્ષમ કરો"</string>
     <string name="enable_text" msgid="7179141636849225884">"સક્ષમ કરો"</string>
     <string name="clear_user_data_text" msgid="8894073247302821764">"સ્ટોરેજ સાફ કરો"</string>
@@ -2377,7 +2379,7 @@
     <string name="usage_type_data_wifi_send" msgid="4457097885099163617">"વાઇ-ફાઇ પૅકેટ્સ મોકલ્યાં"</string>
     <string name="usage_type_data_wifi_recv" msgid="6629526425662663926">"વાઇ-ફાઇ પૅકેટ્સ પ્રાપ્ત થયાં"</string>
     <string name="usage_type_audio" msgid="510459400845396879">"ઑડિઓ"</string>
-    <string name="usage_type_video" msgid="8161701367674306793">"વીડિઓ"</string>
+    <string name="usage_type_video" msgid="8161701367674306793">"વીડિયો"</string>
     <string name="usage_type_camera" msgid="2276450385733155264">"કૅમેરો"</string>
     <string name="usage_type_flashlight" msgid="954750302897154167">"ફ્લેશલાઇટ"</string>
     <string name="usage_type_on_time" msgid="4622180623970638221">"સમય ચાલુ"</string>
@@ -2612,7 +2614,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"હમણાં સમન્વયિત કરવા માટે ટૅપ કરો<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"કૅલેન્ડર"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"સંપર્કો"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google સમન્વયન પર સ્વાગત છે!"</font>" \nતમારા સંપર્કો, એપોઇન્ટમેન્ટ્સ અને વધુના અ‍ૅક્સેસની તમે જ્યાં પણ હોવ ત્યાંથી મંજૂરી આપવા માટે ડેટાને સમન્વયિત કરવાનો એક Google અભિગમ."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"ઍપ્લિકેશન સમન્વયન સેટિંગ્સ"</string>
@@ -2902,7 +2904,7 @@
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"કૉલ ઇતિહાસ આ વપરાશકર્તા સાથે શેર કરવામાં આવશે."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"ફોન કૉલ્સ અને SMS ચાલુ કરીએ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"કૉલ અને SMS ઇતિહાસ આ વપરાશકર્તા સાથે શેર કરવામાં આવશે."</string>
-    <string name="emergency_info_title" msgid="1522609271881425375">"કટોકટી માહિતી"</string>
+    <string name="emergency_info_title" msgid="1522609271881425375">"ઇમર્જન્સીની માહિતી"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટે માહિતી અને સંપર્કો"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"ઍપ્લિકેશનો અને સામગ્રીને મંજૂરી આપો"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"પ્રતિબંધો ધરાવતી ઍપ્લિકેશનો"</string>
@@ -2968,7 +2970,7 @@
     <string name="restriction_nfc_enable_title" msgid="5146674482590550598">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="405349698260328073">"જ્યારે આ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> બીજા NFC ઉપકરણને ટચ કરે ત્યારે ડેટા ફેરબદલીની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3292205836938064931">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="226439584043333608">"જ્યારે ફોન બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="226439584043333608">"જ્યારે ફોન બીજા ડિવાઇસને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
     <string name="restriction_location_enable_title" msgid="358506740636434856">"સ્થાન"</string>
     <string name="restriction_location_enable_summary" msgid="4159500201124004463">"એપ્લિકેશન્સને તમારી સ્થાન માહિતીનો ઉપયોગ કરવા દો"</string>
     <string name="wizard_back" msgid="223654213898117594">"પાછળ"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"તે તમારા ફોનની કાર્ય કરવાની ગતિ ધીમી કરશે"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"સંપૂર્ણ GNSS માપને લાગુ કરો"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"કોઈપણ ડ્યૂટી-સાઈક્લિંગ વગર બધા GNSS તારામંડળો અને આવર્તનો ટ્રૅક કરો"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"વપરાશકર્તા સ્વિચ કરતી વખતે ડિબગ કરો"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"વપરાશકર્તા સ્વિચ કરતી વખતેની વિગતવાર માહિતી બતાવો"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"બૅકગ્રાઉન્ડ પ્રવૃત્તિ શરૂ કરવાની પરવાનગી આપો"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"બધી બૅકગ્રાઉન્ડ પ્રવૃત્તિ શરૂ કરવાની પરવાનગી આપે છે"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"હંમેશા ક્રૅશ સંવાદ બતાવો"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hi-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-hi-nokeys/strings.xml
new file mode 100644
index 0000000..edadd10
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hi-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ऐप्लिकेशन प्रबंधित करें"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hi/arrays.xml b/tests/CarDeveloperOptions/res/values-hi/arrays.xml
new file mode 100644
index 0000000..68fe0bf
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hi/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"अमेरिका"</item>
+    <item msgid="4791956477275129121">"यूरोप"</item>
+    <item msgid="3812126832016254559">"अफ़्रीका"</item>
+    <item msgid="2765816300353408280">"एशिया"</item>
+    <item msgid="6683489385344409742">"ऑस्ट्रेलिया"</item>
+    <item msgid="5194868215515664953">"पेसिफ़िक"</item>
+    <item msgid="7044520255415007865">"सभी"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 सेकंड"</item>
+    <item msgid="772029947136115322">"30 सेकंड"</item>
+    <item msgid="8743663928349474087">"एक मिनट"</item>
+    <item msgid="1506508631223164814">"दो मिनट"</item>
+    <item msgid="8664703938127907662">"5 मिनट"</item>
+    <item msgid="5827960506924849753">"10 मिनट"</item>
+    <item msgid="6677424950124253938">"30 मिनट"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"कभी नहीं"</item>
+    <item msgid="2517785806387977252">"15 सेकंड"</item>
+    <item msgid="6347954399441173672">"30 सेकंड"</item>
+    <item msgid="4858305253279921789">"एक मिनट"</item>
+    <item msgid="8109273437140044073">"दो मिनट"</item>
+    <item msgid="2788593551142462622">"5 मिनट"</item>
+    <item msgid="8012672183888404961">"10 मिनट"</item>
+    <item msgid="8271452751594598661">"30 मिनट"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"तत्‍काल"</item>
+    <item msgid="2038544972632026612">"5 सेकंड"</item>
+    <item msgid="5558060663472279597">"15 सेकंड"</item>
+    <item msgid="45341168505452037">"30 सेकंड"</item>
+    <item msgid="227647485917789272">"एक मिनट"</item>
+    <item msgid="3367011891231217504">"दो मिनट"</item>
+    <item msgid="4376575879222393045">"5 मिनट"</item>
+    <item msgid="811192536981678974">"10 मिनट"</item>
+    <item msgid="7258394417241706272">"30 मिनट"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"छोटा"</item>
+    <item msgid="591935967183159581">"डिफ़ॉल्ट"</item>
+    <item msgid="1714184661981538355">"बड़ा"</item>
+    <item msgid="6195563047686707484">"सबसे बड़ा"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"स्‍कैन कर रहा है…"</item>
+    <item msgid="5597394826455877834">"कनेक्ट हो रहा है..."</item>
+    <item msgid="5848277343965362748">"प्रमाणीकरण कर रहा है…"</item>
+    <item msgid="3391238031431440676">"आईपी पता ले रहा है…"</item>
+    <item msgid="5257597310494000224">"कनेक्ट किया गया"</item>
+    <item msgid="8472497592913050396">"निलंबित"</item>
+    <item msgid="1228072488815999109">"डिस्‍कनेक्‍ट हो रहा है..."</item>
+    <item msgid="7253087004422991731">"डिसकनेक्ट किया गया"</item>
+    <item msgid="4169850917304751227">"असफल"</item>
+    <item msgid="6266658166690831131">"अवरोधित"</item>
+    <item msgid="4517230805854909775">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"स्‍कैन कर रहा है…"</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट कर रहा है…"</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> के साथ प्रमाणीकरण कर रहा है…"</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से IP पता पा रहा है..."</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट किया गया"</item>
+    <item msgid="6600156231416890902">"निलंबित"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से डिस्‍कनेक्‍ट कर रहा है…"</item>
+    <item msgid="3980154971187953257">"डिसकनेक्ट किया गया"</item>
+    <item msgid="2847316776634969068">"असफल"</item>
+    <item msgid="4390990424746035383">"अवरोधित"</item>
+    <item msgid="3618248791367063949">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"पुश बटन"</item>
+    <item msgid="7401896200768713930">"साथी डिवाइस से पिन"</item>
+    <item msgid="4526848028011846710">"इस डिवाइस से पिन"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"कनेक्ट किया गया"</item>
+    <item msgid="983792611851499732">"आमंत्रित"</item>
+    <item msgid="5438273405428201793">"असफल"</item>
+    <item msgid="4646663015449312554">"उपलब्ध"</item>
+    <item msgid="3230556734162006146">"सीमा क्षेत्र से बाहर"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"दो मिनट"</item>
+    <item msgid="2759776603549270587">"5 मिनट"</item>
+    <item msgid="167772676068860015">"एक घंटा"</item>
+    <item msgid="5985477119043628504">"कभी टाइम आउट नहीं होगा"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"सिस्टम की डिफ़ॉल्ट सेटिंग का इस्तेमाल करें: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"कमज़ोर"</item>
+    <item msgid="7882129634982603782">"खराब"</item>
+    <item msgid="6457357501905996224">"ठीक-ठीक"</item>
+    <item msgid="405271628162918841">"अच्छा"</item>
+    <item msgid="999948812884919584">"बहुत अच्छा"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"पिछले 30 दिन"</item>
+    <item msgid="3211287705232736964">"उपयोग चक्र सेट करें..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"उपयोग समय"</item>
+    <item msgid="2784401352592276015">"पिछली बार उपयोग किया गया"</item>
+    <item msgid="249854287216326349">"ऐप्लिकेशन का नाम"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"कुछ नहीं"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"कोई नहीं"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"कुछ नहीं"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"स्थिर"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"कुछ नहीं"</item>
+    <item msgid="1464741437353223198">"मैन्युअल"</item>
+    <item msgid="5793600062487886090">"प्रॉक्सी ऑटो-कॉन्फ़िग"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"कुछ नहीं"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP या CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"अनिर्दिष्ट"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"कोई नहीं"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"आंतरिक डिवाइस मेमोरी"</item>
+    <item msgid="3186681694079967527">"निकाले जाने योग्‍य SD कार्ड"</item>
+    <item msgid="6902033473986647035">"सिस्‍टम को तय करने दें"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"जगह"</item>
+    <item msgid="6842381562497597649">"व्यक्तिगत"</item>
+    <item msgid="3966700236695683444">"संदेश सेवा"</item>
+    <item msgid="8563996233342430477">"मीडिया"</item>
+    <item msgid="5323851085993963783">"डिवाइस"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"अस्पष्ट जगह"</item>
+    <item msgid="1830619568689922920">"सटीक जगह"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"कंपन (वाइब्रेशन)"</item>
+    <item msgid="8632513128515114092">"संपर्क पढ़ें"</item>
+    <item msgid="3741042113569620272">"संपर्कों को बदलें"</item>
+    <item msgid="4204420969709009931">"कॉल लॉग पढ़ें"</item>
+    <item msgid="2260380357119423209">"कॉल लॉग बदलें"</item>
+    <item msgid="6550710385014530934">"कैलेंडर पढ़ें"</item>
+    <item msgid="3575906174264853951">"कैलेंडर बदलें"</item>
+    <item msgid="4319843242568057174">"वाई-फ़ाई स्कैन"</item>
+    <item msgid="2981791890467303819">"सूचना"</item>
+    <item msgid="6617825156152476692">"सेल स्कैन"</item>
+    <item msgid="8865260890611559753">"फ़ोन पर कॉल करें"</item>
+    <item msgid="3254999273961542982">"मैसेज (एसएमएस) पढ़ें"</item>
+    <item msgid="7711446453028825171">"मैसेज (एसएमएस) लिखें"</item>
+    <item msgid="6123238544099198034">"मैसेज (एसएमएस) पाएं"</item>
+    <item msgid="838342167431596036">"आपातकालीन मैसेज (एसएमएस) पाएं"</item>
+    <item msgid="8554432731560956686">"मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="7464863464299515059">"WAP पुश पाएं"</item>
+    <item msgid="310463075729606765">"मैसेज (एसएमएस) भेजें"</item>
+    <item msgid="7338021933527689514">"ICC मैसेज (एसएमएस) पढ़ें"</item>
+    <item msgid="6130369335466613036">"ICC मैसेज (एसएमएस) लिखें"</item>
+    <item msgid="6536865581421670942">"सेटिंग बदलें"</item>
+    <item msgid="4547203129183558973">"ऊपर बनाएं"</item>
+    <item msgid="9080347512916542840">"सूचना पाएं"</item>
+    <item msgid="5332718516635907742">"कैमरा"</item>
+    <item msgid="6098422447246167852">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="9182794235292595296">"ऑडियो चलाएं"</item>
+    <item msgid="8760743229597702019">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="2266923698240538544">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="1801619438618539275">"मीडिया बटन"</item>
+    <item msgid="31588119965784465">"ऑडियो फ़ोकस"</item>
+    <item msgid="7565226799008076833">"मास्टर आवाज़"</item>
+    <item msgid="5420704980305018295">"बोलने की आवाज़"</item>
+    <item msgid="5797363115508970204">"रिंग आवाज़"</item>
+    <item msgid="8233154098550715999">"मीडिया की आवाज़"</item>
+    <item msgid="5196715605078153950">"अलार्म की आवाज़"</item>
+    <item msgid="394030698764284577">"सूचना की आवाज़"</item>
+    <item msgid="8952898972491680178">"ब्लूटूथ की आवाज़"</item>
+    <item msgid="8506227454543690851">"सचेत रखें"</item>
+    <item msgid="1108160036049727420">"जगह की निगरानी करें"</item>
+    <item msgid="1496205959751719491">"उच्च पावर वाली जगह की निगरानी करें"</item>
+    <item msgid="3776296279910987380">"उपयोग के आंकड़े पाएं"</item>
+    <item msgid="8827100324471975602">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+    <item msgid="6880736730520126864">"टोस्ट दिखाएं"</item>
+    <item msgid="4933375960222609935">"प्रोजेक्ट मीडिया"</item>
+    <item msgid="8357907018938895462">"VPN सक्रिय करें"</item>
+    <item msgid="8143812849911310973">"वॉलपेपर पर लिखें"</item>
+    <item msgid="6266277260961066535">"सहायक संरचना"</item>
+    <item msgid="7715498149883482300">"सहायक स्क्रीनशॉट"</item>
+    <item msgid="4046679376726313293">"फ़ोन स्‍थिति पढ़ें"</item>
+    <item msgid="6329507266039719587">"वॉइसमेल जोड़ें"</item>
+    <item msgid="7692440726415391408">"सिप का उपयोग करें"</item>
+    <item msgid="8572453398128326267">"कॉल करें"</item>
+    <item msgid="7775674394089376306">"फ़िंगरप्रिंट"</item>
+    <item msgid="3182815133441738779">"शरीर संवेदक"</item>
+    <item msgid="2793100005496829513">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+    <item msgid="2633626056029384366">"नकली जगह"</item>
+    <item msgid="8356842191824684631">"मेमोरी पढ़ें"</item>
+    <item msgid="5671906070163291500">"मेमोरी लिखें"</item>
+    <item msgid="2791955098549340418">"स्क्रीन चालू करें"</item>
+    <item msgid="5599435119609178367">"खाते पाएं"</item>
+    <item msgid="1165623660533024666">"पृष्ठभूमि में चलाएं"</item>
+    <item msgid="6423861043647911030">"सुलभता सुविधाओं के लिए आवाज़"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"जगह"</item>
+    <item msgid="6656077694190491067">"जगह"</item>
+    <item msgid="8790228218278477369">"जगह"</item>
+    <item msgid="7836406246005211990">"कंपन"</item>
+    <item msgid="3951439024549922598">"संपर्क पढ़ें"</item>
+    <item msgid="8802152411647068">"संपर्कों को बदलें"</item>
+    <item msgid="229544934599698735">"कॉल लॉग पढ़ें"</item>
+    <item msgid="7396102294405899613">"कॉल लॉग बदलें"</item>
+    <item msgid="3597797992398484655">"कैलेंडर पढ़ें"</item>
+    <item msgid="2705975774250907343">"कैलेंडर बदलें"</item>
+    <item msgid="4668747371441932697">"जगह"</item>
+    <item msgid="1487578921720243646">"सूचना पोस्ट करें"</item>
+    <item msgid="4636080349724146638">"जगह"</item>
+    <item msgid="673510900286463926">"फ़ोन पर कॉल करें"</item>
+    <item msgid="542083422784609790">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+    <item msgid="1033780373029588436">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
+    <item msgid="5647111115517787488">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="8591105601108455893">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="7730995008517841903">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="2613033109026626086">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="3037159047591081136">"SMS/MMS भेजें"</item>
+    <item msgid="4726682243833913568">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+    <item msgid="6555678522277865572">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
+    <item msgid="6981734935578130884">"सेटिंग बदलें"</item>
+    <item msgid="8705854389991425629">"ऊपर बनाएं"</item>
+    <item msgid="5861356020344153651">"सूचना पाएं"</item>
+    <item msgid="78432174621628659">"कैमरा"</item>
+    <item msgid="3986116419882154794">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="4516840825756409490">"ऑडियो चलाएं"</item>
+    <item msgid="6811712502798183957">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="2780369012602289114">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="2331359440170850868">"मीडिया बटन"</item>
+    <item msgid="6133599737122751231">"ऑडियो फ़ोकस"</item>
+    <item msgid="6844485713404805301">"मास्टर आवाज़"</item>
+    <item msgid="1600379420669104929">"बोलने की आवाज़"</item>
+    <item msgid="6296768210470214866">"रिंग की आवाज़"</item>
+    <item msgid="510690696071629241">"मीडिया की आवाज़"</item>
+    <item msgid="406861638631430109">"अलार्म की आवाज़"</item>
+    <item msgid="4715864795872233884">"सूचना की आवाज़"</item>
+    <item msgid="2311478519251301183">"ब्लूटूथ की आवाज़"</item>
+    <item msgid="5133991377896747027">"सचेत रखें"</item>
+    <item msgid="2464189519136248621">"स्थान"</item>
+    <item msgid="2062677934050803037">"जगह"</item>
+    <item msgid="1735171933192715957">"उपयोग के आंकड़े पाएं"</item>
+    <item msgid="1014093788778383554">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+    <item msgid="4199297950608622850">"टोस्ट दिखाएं"</item>
+    <item msgid="2527962435313398821">"प्रोजेक्ट मीडिया"</item>
+    <item msgid="5117506254221861929">"VPN सक्रिय करें"</item>
+    <item msgid="8291198322681891160">"वॉलपेपर पर लिखें"</item>
+    <item msgid="7106921284621230961">"सहायक संरचना"</item>
+    <item msgid="4496533640894624799">"सहायक स्क्रीनशॉट"</item>
+    <item msgid="2598847264853993611">"फ़ोन स्‍थिति पढ़ें"</item>
+    <item msgid="9215610846802973353">"वॉइसमेल जोड़ें"</item>
+    <item msgid="9186411956086478261">"सिप का उपयोग करें"</item>
+    <item msgid="6884763100104539558">"कॉल करें"</item>
+    <item msgid="125513972170580692">"फ़िंगरप्रिंट"</item>
+    <item msgid="2556071024281275619">"शरीर संवेदक"</item>
+    <item msgid="617168514928339387">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+    <item msgid="7134693570516523585">"नकली जगह"</item>
+    <item msgid="7224489175375229399">"मेमोरी पढ़ें"</item>
+    <item msgid="8472735063903258202">"मेमोरी लिखें"</item>
+    <item msgid="4069276819909595110">"स्क्रीन चालू करें"</item>
+    <item msgid="1228338896751121025">"खाते पाएं"</item>
+    <item msgid="3181581793459233672">"पृष्ठभूमि में चलाएं"</item>
+    <item msgid="2340936043025374076">"सुलभता सुविधाओं के लिए आवाज़"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"कम"</item>
+    <item msgid="4816511817309094890">"मध्यम"</item>
+    <item msgid="8305084671259331134">"ज़्यादा"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"डिफ़ॉल्ट"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"बहुत छोटा"</item>
+    <item msgid="5091603983404027034">"छोटा"</item>
+    <item msgid="176844712416932112">"सामान्य"</item>
+    <item msgid="2784236342175159295">"बड़ा"</item>
+    <item msgid="218913203203160606">"बहुत बड़ा"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"डिफ़ॉल्ट"</item>
+    <item msgid="6488643537808152001">"कुछ नहीं"</item>
+    <item msgid="552332815156010137">"आउटलाइन"</item>
+    <item msgid="7187891159463789272">"ड्रॉप शैडो"</item>
+    <item msgid="8019330250538856521">"विस्तृत"</item>
+    <item msgid="8987385315647049787">"संक्षिप्त"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"ऐप्लिकेशन की डिफ़ॉल्ट शैलियां"</item>
+    <item msgid="8611890312638868524">"काले पर सफ़ेद"</item>
+    <item msgid="5891360837786277638">"सफ़ेद पर काला"</item>
+    <item msgid="2798457065945456853">"काले पर पीला"</item>
+    <item msgid="5799049811524553967">"नीले पर पीला"</item>
+    <item msgid="3673930830658169860">"पसंद के मुताबिक"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"पहले से शेयर की गई कुंजी के साथ L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"प्रमाणपत्रों के साथ L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"पहले से शेयर की गई कुंजियों और Xauth प्रमाणीकरण के साथ IPSec VPN"</item>
+    <item msgid="3319427315593649917">"प्रमाणपत्रों और Xauth प्रमाणीकरण के साथ IPSec VPN"</item>
+    <item msgid="8258927774145391041">"प्रमाणपत्रों और संकर प्रमाणीकरण के साथ IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"कोई नहीं"</item>
+    <item msgid="1157046369795346308">"मैन्युअल"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"डिसकनेक्ट किया गया"</item>
+    <item msgid="8754480102834556765">"आरंभ हो रहा है..."</item>
+    <item msgid="3351334355574270250">"कनेक्ट हो रहा है..."</item>
+    <item msgid="8303882153995748352">"कनेक्ट किया गया"</item>
+    <item msgid="9135049670787351881">"समयबाह्य"</item>
+    <item msgid="2124868417182583926">"असफल"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"पूछें"</item>
+    <item msgid="7718817231348607934">"कभी भी अनुमति न दें"</item>
+    <item msgid="8184570120217958741">"हमेशा अनुमति दें"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"निरंतर"</item>
+    <item msgid="167418068739176448">"शीर्ष गतिविधि"</item>
+    <item msgid="4760813290195199773">"महत्वपूर्ण (अग्रभाग)"</item>
+    <item msgid="2328684826817647595">"महत्वपूर्ण (पृष्ठभूमि)"</item>
+    <item msgid="7746406490652867365">"बैकअप लें"</item>
+    <item msgid="5597404364389196754">"अत्यधिक"</item>
+    <item msgid="1290888779300174556">"सेवा (चल रही है)"</item>
+    <item msgid="7241098542073939046">"सेवा (फिर से प्रारंभ हो रही है)"</item>
+    <item msgid="6610439017684111046">"प्राप्तकर्ता"</item>
+    <item msgid="7367606086319921117">"घर"</item>
+    <item msgid="3344660712396741826">"अंतिम गतिविधि"</item>
+    <item msgid="5006559348883303865">"संचित (गतिविधि)"</item>
+    <item msgid="8633480732468137525">"संचित (गतिविधि क्लाइंट)"</item>
+    <item msgid="6248998242443333892">"संचित (खाली)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"हरा-नीला"</item>
+    <item msgid="3228505970082457852">"नीला"</item>
+    <item msgid="6590260735734795647">"गहरा नीला"</item>
+    <item msgid="3521763377357218577">"बैंगनी"</item>
+    <item msgid="5932337981182999919">"गुलाबी"</item>
+    <item msgid="5642914536624000094">"लाल"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 दिन से ज़्यादा पुराने"</item>
+    <item msgid="8699273238891265610">"60 दिन से ज़्यादा पुराने"</item>
+    <item msgid="8346279419423837266">"90 दिन से ज़्यादा पुराने"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"नेटवर्क की अपने आप पहचान हो"</item>
+    <item msgid="773943026484148895">"इस कनेक्शन में डेटा से जुड़ी पाबंदी है"</item>
+    <item msgid="1008268820118852416">"इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"किसी भी MAC पते का इस्तेमाल करें (डिफ़ॉल्ट सेटिंग)"</item>
+    <item msgid="214234417308375326">"डिवाइस के एमएसी का इस्तेमाल करें"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"नहीं"</item>
+    <item msgid="1930581185557754880">"हां"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"गहरे रंग की थीम"</item>
+    <item msgid="5079453644557603349">"हल्के रंग की थीम"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"बंद"</item>
+    <item msgid="4072198137051566919">"डीबग"</item>
+    <item msgid="2473005316958868509">"ज़्यादा जानकारी डालें"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"सिर्फ़ होम पेज"</item>
+    <item msgid="1161026694891024702">"ऑटोमैटिक"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA पसंदीदा"</item>
+    <item msgid="7581481130337402578">"सिर्फ़ GSM"</item>
+    <item msgid="8579197487913425819">"सिर्फ़ WCDMA"</item>
+    <item msgid="8465243227505412498">"अपने आप GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"अपने आप CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"EvDo के बिना CDMA"</item>
+    <item msgid="7278975240951052041">"सिर्फ़ EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"हर जगह लागू"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"सिर्फ़ TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/सिम"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"हर जगह लागू"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hi/strings.xml b/tests/CarDeveloperOptions/res/values-hi/strings.xml
index 9762a8b..b1c1375 100644
--- a/tests/CarDeveloperOptions/res/values-hi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hi/strings.xml
@@ -128,7 +128,7 @@
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"दूसरे डिवाइस से जोड़ने का अनुरोध किया गया है"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से युग्मित करने के लिए टैप करें."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"मिलने वाली फ़ाइलें"</string>
-    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"ब्लूटूथ के ज़रिए मिली फ़ाइलें"</string>
+    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"ब्लूटूथ से मिली फ़ाइलें"</string>
     <string name="device_picker" msgid="8345264486071697705">"ब्लूटूथ डिवाइस चुनें"</string>
     <string name="bluetooth_ask_enablement" msgid="8716802066127746062">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ को चालू करना चाहता है"</string>
     <string name="bluetooth_ask_disablement" msgid="7125319551097350783">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ को बंद करना चाहता है"</string>
@@ -222,7 +222,7 @@
     <string name="radio_info_call_redirect_label" msgid="2679891718182753061">"कॉल रीडयरेक्ट:"</string>
     <string name="radio_info_ppp_resets_label" msgid="2785162965440312941">"बूट के बाद से PPP रीसेट की संख्या:"</string>
     <string name="radio_info_current_network_label" msgid="5785805819312999094">"वर्तमान नेटवर्क:"</string>
-    <string name="radio_info_ppp_received_label" msgid="5217391494757374330">"डेटा प्राप्त हुआ:"</string>
+    <string name="radio_info_ppp_received_label" msgid="5217391494757374330">"डेटा पाया गया:"</string>
     <string name="radio_info_gsm_service_label" msgid="7488842563230281026">"वॉइस सेवा:"</string>
     <string name="radio_info_signal_strength_label" msgid="7773514616083573394">"सिग्नल की शक्ति:"</string>
     <string name="radio_info_call_status_label" msgid="8241020608714164780">"वॉइस कॉल स्थिति:"</string>
@@ -318,7 +318,7 @@
     <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको ज़्यादा रोमिंग शुल्क लगे!\n\nयह सेटिंग इस टैबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6999819541078827556">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको ज़्यादा रोमिंग शुल्क लगे!\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_reenable_title" msgid="6985082191178297921">"डेटा रोमिंग की अनुमति दें?"</string>
-    <string name="networks" msgid="3073876464102136771">"ऑपरेटर चयन"</string>
+    <string name="networks" msgid="3073876464102136771">"ऑपरेटर चुनें"</string>
     <string name="sum_carrier_select" msgid="8964744180598499121">"कोई नेटवर्क ऑपरेटर चुनें"</string>
     <string name="date_and_time_settings_title" msgid="7827088656940910631">"तारीख और समय"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1573030770187844365">"तारीख और समय सेट करें"</string>
@@ -372,8 +372,8 @@
     <string name="location_settings_master_switch_title" msgid="3108016866082816733">"जगह की जानकारी की सुविधा का इस्तेमाल करें"</string>
     <string name="location_settings_summary_location_off" msgid="5563530256978372978">"बंद करें"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="7893342914540884818">
-      <item quantity="one">चालू - <xliff:g id="COUNT_1">%1$d</xliff:g> ऐप्लिकेशन जगह की जानकारी एक्सेस कर सकते हैं</item>
-      <item quantity="other">चालू - <xliff:g id="COUNT_1">%1$d</xliff:g> ऐप्लिकेशन जगह की जानकारी एक्सेस कर सकते हैं</item>
+      <item quantity="one">चालू - <xliff:g id="COUNT_1">%1$d</xliff:g> ऐप्लिकेशन जगह की जानकारी ऐक्सेस कर सकते हैं</item>
+      <item quantity="other">चालू - <xliff:g id="COUNT_1">%1$d</xliff:g> ऐप्लिकेशन जगह की जानकारी ऐक्सेस कर सकते हैं</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="7818169326621327628">"लोड हो रहा है…"</string>
     <string name="account_settings_title" msgid="7870321267198486578">"खाते"</string>
@@ -425,7 +425,7 @@
     <string name="security_settings_face_settings_require_confirmation" msgid="7312024271060416438">"हमेशा पुष्टि करना ज़रूरी है"</string>
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"ऐप्लिकेशन में प्रमाणित करते समय हमेशा पुष्टि करना ज़रूरी है"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"चेहरे का डेटा हटाएं"</string>
-    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"आप अपने चेहरे के ज़रिए अपने डिवाइस को अनलॉक कर सकते हैं और ऐप्लिकेशन एक्सेस कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"आप अपने चेहरे के ज़रिए अपने डिवाइस को अनलॉक कर सकते हैं और ऐप्लिकेशन ऐक्सेस कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"चेहरे से जुड़ा डेटा मिटाएं?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"चेहरे की पहचान करके डिवाइस को अनलॉक करने की सुविधा के ज़रिए रिकॉर्ड किया गया डेटा हमेशा के लिए और सुरक्षित रूप से मिटा दिया जाएगा. मिटाने के बाद अपने फ़ोन को अनलॉक करने, ऐप्लिकेशन में साइन इन करने और भुगतान की पुष्टि करने के लिए आपको पिन, पैटर्न या पासवर्ड की ज़रूरत होगी."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"उंगली की छाप"</string>
@@ -474,15 +474,14 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="5862643337893923347">"जब आपको यह आइकॉन दिखाई दे, तब पहचान के लिए या खरीदारियों को मंज़ूरी देने के लिए अपना फ़िंगरप्रिंट इस्तेमाल करें"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="1473280156532146933">"इसे बाद में करें"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="2816424026528101690">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. अगर आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में करीब एक मिनट लगता है."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="8139299964344809780">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चुनाव किया है. अगर आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में करीब एक मिनट लगता है."</string>
     <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="1384438077720821127">"अपने टैबलेट को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको फ़िंगरप्रिंट सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="7207112623501771824">"अपने डिवाइस को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको फ़िंगरप्रिंट सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="7623975730623531606">"अपने फ़ोन को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको फ़िंगरप्रिंट सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"अपने टैबलेट को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"अपने डिवाइस को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"अपने फ़ोन को \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें ताकि इसके खोने या चोरी होने पर, कोई इसका इस्तेमाल न कर पाए. आपको चेहरे की पहचान सेट करने के लिए भी, \'स्क्रीन लॉक\' सुविधा की ज़रूरत है. \'रद्द करें\' पर टैप करें. इसके बाद, कोई पिन सेट करें या \'स्क्रीन लॉक\' का कोई दूसरा विकल्प चुनें."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"पिन सेटअप का विकल्प छोड़ें?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"पासवर्ड सेटअप विकल्प छोड़ें?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"पैटर्न सेटअप का विकल्प छोड़ें?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"स्‍क्रीन लॉक सेट करें"</string>
@@ -495,7 +494,7 @@
     <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"कोई और जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"आगे बढ़ें"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="5831834311961551423">"अपना फ़ोन अनलॉक करने के साथ-साथ, खरीदारी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" स्क्रीन लॉक विकल्प बंद है. ज़्यादा जानने के लिए, अपने संगठन के एडमिन से संपर्क करें. "<annotation id="admin_details">"ज़्यादा जानकारी{"</annotation>\n\n"आप खरीदारी और ऐप एक्सेस की अनुमति देने के लिए अब भी अपने फ़िंगरप्रिंट का इस्तेमाल कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7954742554236652690">" स्क्रीन लॉक विकल्प बंद है. ज़्यादा जानने के लिए, अपने संगठन के एडमिन से संपर्क करें. "<annotation id="admin_details">"ज़्यादा जानकारी{"</annotation>\n\n"आप खरीदारी और ऐप ऐक्सेस की अनुमति देने के लिए अब भी अपने फ़िंगरप्रिंट का इस्तेमाल कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1670703069782212223">"उंगली उठाएं और सेंसर को फिर छूएं"</string>
     <string name="fingerprint_add_max" msgid="2939393314646115661">"आप <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट तक जोड़ सकते हैं"</string>
     <string name="fingerprint_intro_error_max" msgid="3247720976621039437">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
@@ -710,7 +709,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"रद्द करें"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"आगे बढ़ें"</string>
     <string name="lock_setup" msgid="8710689848703935088">"सेटअप पूरा हुआ."</string>
-    <string name="manage_device_admin" msgid="322047441168191695">"डिवाइस के एडमिन ऐप्लिकेशन का एक्सेस"</string>
+    <string name="manage_device_admin" msgid="322047441168191695">"डिवाइस के एडमिन ऐप्लिकेशन का ऐक्सेस"</string>
     <string name="number_of_device_admins_none" msgid="8519193548630223132">"कोई भी सक्रिय ऐप्लिकेशन नहीं है"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="6445613288828151224">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप</item>
@@ -765,7 +764,7 @@
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"बेहतर सेटिंग"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"बेहतर ब्लूटूथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"ब्लूटूथ चालू होने पर, आपका डिवाइस आस-पास के दूसरे ब्लूटूथ डिवाइस से संपर्क कर सकता है."</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्लूटूथ चालू हाेने पर, आपका डिवाइस अास-पास के ब्लूटूथ डिवाइस से जुड़ सकता है. \n\nडिवाइस काे बेहतर तरीके से चलाने के लिए, ऐप्लिकेशन अाैर सेवाएं, ब्लूटूथ बंद हाेने के बावजूद किसी भी समय अास-पास के ब्लूटूथ डिवाइस काे स्कैन कर सकती हैं. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है. आप "<annotation id="link">"स्कैन करने की सेटिंग"</annotation>" में जाकर इसे बदल सकते हैं."</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्लूटूथ चालू हाेने पर, आपका डिवाइस आस-पास के ब्लूटूथ डिवाइस से जुड़ सकता है. \n\nडिवाइस काे बेहतर तरीके से चलाने के लिए, ऐप्लिकेशन आैर सेवाएं, ब्लूटूथ बंद हाेने के बावजूद किसी भी समय आस-पास के ब्लूटूथ डिवाइस काे स्कैन कर सकती हैं. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है. आप "<annotation id="link">"स्कैन करने की सेटिंग"</annotation>" में जाकर इसे बदल सकते हैं."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"जगह की सटीक जानकारी को बेहतर बनाने के लिए, सिस्‍टम ऐप्लिकेशन और सेवाएं अब भी ब्‍लूटूथ डिवाइसों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
     <string name="device_details_title" msgid="726517818032923222">"डिवाइस की जानकारी"</string>
@@ -809,8 +808,8 @@
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"भूलें"</string>
     <string name="wifi_display_options_done" msgid="5922060890309265817">"हो गया"</string>
     <string name="wifi_display_options_name" msgid="8477627781133827607">"नाम"</string>
-    <string name="wifi_band_24ghz" msgid="2973143764653628618">"2.4 GHz"</string>
-    <string name="wifi_band_5ghz" msgid="6469832209748522207">"5 GHz"</string>
+    <string name="wifi_band_24ghz" msgid="2973143764653628618">"2.4 गीगाहर्ट्ज़"</string>
+    <string name="wifi_band_5ghz" msgid="6469832209748522207">"5 गीगाहर्ट्ज़"</string>
     <string name="wifi_sign_in_button_text" msgid="7573695522292386360">"साइन इन करें"</string>
     <string name="wifi_tap_to_sign_in" msgid="1075925570550560453">"नेटवर्क में साइन इन करने के लिए टैप करें"</string>
     <string name="tx_link_speed" msgid="4557508597788146162">"<xliff:g id="TRANSMIT_LINK_SPEED">%1$d</xliff:g> एमबीपीएस"</string>
@@ -821,9 +820,9 @@
     <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"डीबग किए जा सकने वाले ऐप्लिकेशन के लिए, ART को बाइटकोड की पुष्टि करने की मंज़ूरी दें"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"आस-पास के डिवाइस से संपर्क (एनएफसी)"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"जब फ़ोन दूसरे डिवाइस को टच करे तो डेटा ट्रांसफर करने दें"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"जब फ़ोन दूसरे डिवाइस को टच करे, तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_disclaimer_title" msgid="4860231267351602970">"NFC चालू करें"</string>
-    <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC इस डिवाइस और आस-पास के अन्य डिवाइस या लक्ष्यों के बीच डेटा का लेन-देन करता है, जैसे कि भुगतान टर्मिनल, एक्सेस रीडर और सहभागी विज्ञापन या टैग."</string>
+    <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC इस डिवाइस और आस-पास के अन्य डिवाइस या लक्ष्यों के बीच डेटा का लेन-देन करता है, जैसे कि भुगतान टर्मिनल, ऐक्सेस रीडर और सहभागी विज्ञापन या टैग."</string>
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"NFC सुरक्षित करें"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"NFC भुगतान और ट्रांज़िट के इस्तेमाल की अनुमति तभी दें, जब स्क्रीन अनलॉक की गई हो"</string>
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android बीम"</string>
@@ -843,7 +842,7 @@
     <string name="wifi_starting" msgid="1299466156783469023">"वाई-फ़ाई  चालू हो रहा है…"</string>
     <string name="wifi_stopping" msgid="413711069039939520">"वाई-फ़ाई  बंद हो रहा है…"</string>
     <string name="wifi_error" msgid="5605801874484465557">"गड़बड़ी"</string>
-    <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 GHz बैंड इस देश में उपलब्‍ध नहीं है"</string>
+    <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 गीगाहर्ट्ज़ बैंड इस देश में उपलब्‍ध नहीं है"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"हवाई जहाज़ मोड में"</string>
     <string name="wifi_notify_open_networks" msgid="4782239203624619655">"ओपन नेटवर्क की सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"बढ़िया इंटरनेट देने वाला सार्वजनिक नेटवर्क मिलने पर बताएं"</string>
@@ -924,7 +923,7 @@
     <string name="wifi_show_password" msgid="7878398590772942202">"पासवर्ड दिखाएं"</string>
     <string name="wifi_ap_band_config" msgid="6565016368079288433">"AP बैंड चुनें"</string>
     <string name="wifi_ap_choose_auto" msgid="7927637960569365785">"अपने आप"</string>
-    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2.4 GHz बैंड"</string>
+    <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2.4 गीगाहर्ट्ज़ बैंड"</string>
     <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5.0 गीगाहर्ट्ज़ का बैंड"</string>
     <string name="wifi_ap_prefer_5G" msgid="8339172330471170142">"5.0 गीगाहर्ट्ज़ बैंड का इस्तेमाल करना बेहतर होगा"</string>
     <string name="wifi_ap_2G" msgid="5793110086517338494">"2.4 गीगाहर्ट्ज़"</string>
@@ -972,9 +971,9 @@
     <string name="wifi_use_system_certs" msgid="4794489370929885022">"सिस्टम प्रमाणपत्रों का उपयोग करें"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="4044301449482425250">"मुहैया न कराएं"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="1892537559682474878">"मान्‍य न करें"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="3895397996759837323">"कोई प्रमाणपत्र निर्दिष्‍ट नहीं है. आपका कनेक्‍शन निजी नहीं होगा."</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="3895397996759837323">"कोई प्रमाणपत्र मौजूद नहीं है. आपका कनेक्‍शन निजी नहीं होगा."</string>
     <string name="wifi_ssid_too_long" msgid="34911971389775920">"नेटवर्क का नाम बहुत लंबा है."</string>
-    <string name="wifi_no_domain_warning" msgid="735859919311067606">"डोमेन निर्दिष्ट करना आवश्यक है."</string>
+    <string name="wifi_no_domain_warning" msgid="735859919311067606">"डोमेन दर्ज करना आवश्यक है."</string>
     <string name="wifi_wps_available_first_item" msgid="3221671453930485243">"WPS उपलब्‍ध"</string>
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_carrier_connect" msgid="7202618367339982884">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी वाई-फ़ाई नेटवर्क"</string>
@@ -986,7 +985,7 @@
     <string name="wifi_hotspot_title" msgid="2631956539767069385">"कनेक्ट करने के लिए साइन इन करें?"</string>
     <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए नेटवर्क से कनेक्ट करने से पहले साइन करें."</string>
     <string name="wifi_hotspot_connect" msgid="409079339360849653">"कनेक्ट करें"</string>
-    <string name="no_internet_access_text" msgid="7093326244145734504">"इस नेटवर्क में कोई इंटरनेट एक्सेस नहीं है. जुड़े रहें?"</string>
+    <string name="no_internet_access_text" msgid="7093326244145734504">"इस नेटवर्क में कोई इंटरनेट ऐक्सेस नहीं है. जुड़े रहें?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"सीमित कनेक्टिविटी की वजह से हो सकता है कुछ ऐप्लिकेशन और सेवाएं न काम करें. फिर भी इस्तेमाल करें?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"इस नेटवर्क के लिए फिर से ना पूछें"</string>
     <string name="lost_internet_access_title" msgid="1061916948695946130">"वाई-फ़ाई इंटरनेट से नहीं जुड़ा है"</string>
@@ -1068,7 +1067,7 @@
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"एपी बैंड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"अपने दूसरे डिवाइस के लिए हॉटस्पॉट का इस्तेमाल करके वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन के ज़रिए इंटरनेट की सुविधा देता है. मोबाइल डेटा के लिए अतिरिक्त भुगतान करना पड़ सकता है."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री शेयर करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"हॉटस्पॉट अपने आप बंद करें"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"हॉटस्पॉट अपने-आप बंद हो जाए"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"कोई डिवाइस कनेक्ट नहीं होने पर, वाई-फ़ाई हॉटस्पॉट बंद हो जाएगा"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"वाई-फ़ाई"</item>
+    <item msgid="4421333712484542489">"मोबाइल"</item>
+    <item msgid="6007360612667098926">"केवल वाई-फ़ाई"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1519,8 +1521,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="4133133596316768033">"आपकी सामग्री <xliff:g id="NAME_0">^1</xliff:g> में ले जाई जा चुकी है. \n\nइस <xliff:g id="NAME_1">^2</xliff:g> को प्रबंधित करने के लिए, "<b>"सेटिंग &gt; मेमोरी में जाएं"</b>"."</string>
     <string name="battery_status_title" msgid="8731200319740671905">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="5207775387973771646">"बैटरी स्‍तर"</string>
-    <string name="apn_settings" msgid="8130776653826271664">"एक्सेस पॉइंट नाम"</string>
-    <string name="apn_edit" msgid="4350571070853305357">"एक्सेस पॉइंट में बदलाव करें"</string>
+    <string name="apn_settings" msgid="8130776653826271664">"ऐक्सेस पॉइंट नाम"</string>
+    <string name="apn_edit" msgid="4350571070853305357">"ऐक्सेस पॉइंट में बदलाव करें"</string>
     <string name="apn_not_set" msgid="5344235604466825691">"सेट नहीं है"</string>
     <string name="apn_name" msgid="8431432886706852226">"नाम"</string>
     <string name="apn_apn" msgid="190519449579357696">"APN"</string>
@@ -1644,10 +1646,10 @@
     <string name="location_app_level_permissions" msgid="1298041503927632960">"ऐप्लिकेशन की अनुमति"</string>
     <string name="location_app_permission_summary_location_off" msgid="541372845344796336">"जगह की जानकारी बंद है"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="7904821382328758218">
-      <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास असीमित एक्सेस है</item>
-      <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास असीमित एक्सेस है</item>
+      <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास असीमित ऐक्सेस है</item>
+      <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से <xliff:g id="BACKGROUND_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास असीमित ऐक्सेस है</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="286059523360285026">"हाल ही में एक्सेस की गई जगह की जानकारी"</string>
+    <string name="location_category_recent_location_access" msgid="286059523360285026">"हाल ही में ऐक्सेस की गई जगह की जानकारी"</string>
     <string name="location_recent_location_access_view_details" msgid="2051602261436245905">"जानकारी देखें"</string>
     <string name="location_no_recent_apps" msgid="77502059586413278">"किसी भी ऐप ने हाल में जगह का अनुरोध नहीं किया है"</string>
     <string name="location_no_recent_accesses" msgid="6289916310397279890">"किसी भी ऐप्लिकेशन ने हाल ही में जगह की जानकारी का इस्तेमाल नहीं किया"</string>
@@ -1665,12 +1667,12 @@
     <string name="location_gps" msgid="688049341158297763">"GPS उपग्रह"</string>
     <string name="location_street_level" product="tablet" msgid="4459804798444296650">"आपकी जगह का पता लगाने के लिए, ऐप को आपके टैबलेट पर जीपीएस का इस्तेमाल करने दें"</string>
     <string name="location_street_level" product="default" msgid="7407688345675450051">"आपकी जगह का पता लगाने के लिए, ऐप को आपके फ़ोन पर जीपीएस का इस्तेमाल करने दें"</string>
-    <string name="assisted_gps" msgid="5411780261117055175">"सहायता प्राप्त GPS का उपयोग करें"</string>
+    <string name="assisted_gps" msgid="5411780261117055175">"सहायता पाए हुए GPS का उपयोग करें"</string>
     <string name="assisted_gps_enabled" msgid="2561022181775725369">"GPS की सहायता के लिए सर्वर का उपयोग करें (नेटवर्क उपयोग कम करने के लिए अनचेक करें)"</string>
     <string name="assisted_gps_disabled" msgid="6448758788217415937">"GPS की सहायता के लिए सर्वर का उपयोग करें (GPS निष्‍पादन बेहतर बनाने के लिए अनचेक करें)"</string>
     <string name="use_location_title" msgid="7724788634359496634">"जगह और Google सर्च"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"सर्च नतीजों और अन्‍य सेवाओं में सुधार के लिए Google को आपकी जगह का इस्तेमाल करने दें"</string>
-    <string name="location_access_title" msgid="8587974819606800029">"मेरी जगह को एक्सेस करें"</string>
+    <string name="location_access_title" msgid="8587974819606800029">"मेरी जगह को ऐक्सेस करें"</string>
     <string name="location_access_summary" msgid="6919495149026354355">"जिन ऐप ने आपसे अनुमति मांगी है उन्हें अपने जगह की जानकारी का इस्तेमाल करने दें"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"स्‍थानीय स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"टैबलेट के बारे में"</string>
@@ -1688,7 +1690,7 @@
     <string name="terms_title" msgid="1804549588198223771">"नियम और शर्तें"</string>
     <string name="webview_license_title" msgid="8244960025549725051">"सिस्टम वेबव्यू लाइसेंस"</string>
     <string name="wallpaper_attributions" msgid="2941987966332943253">"वॉलपेपर"</string>
-    <string name="wallpaper_attributions_values" msgid="4461979853894606323">"उपग्रह इमेजरी प्रदाता:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="4461979853894606323">"उपग्रह इमेजरी प्रोवाइडर:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="7599911755054286789">"मैन्युअल"</string>
     <string name="settings_manual_activity_unavailable" msgid="4872502775018655343">"मैन्युअल को लोड करने में कोई समस्‍या है."</string>
     <string name="settings_license_activity_title" msgid="1099045216283677608">"तीसरे-पक्ष का लाइसेंस"</string>
@@ -1804,7 +1806,7 @@
       <item quantity="one">%d आइटम</item>
       <item quantity="other">%d आइटम</item>
     </plurals>
-    <string name="clear_uri_btn_text" msgid="3528618179883855727">"एक्सेस साफ़ करें"</string>
+    <string name="clear_uri_btn_text" msgid="3528618179883855727">"ऐक्सेस साफ़ करें"</string>
     <string name="controls_label" msgid="5609285071259457221">"नियंत्रण"</string>
     <string name="force_stop" msgid="9213858124674772386">"ज़बरदस्ती रोकें"</string>
     <string name="total_size_label" msgid="3929917501176594692">"सम्पूर्ण जगह"</string>
@@ -1813,7 +1815,7 @@
     <string name="data_size_label" msgid="7790201846922671662">"उपयोगकर्ता डेटा"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="8004991551882573479">"USB मेमोरी डेटा"</string>
     <string name="external_data_size_label" product="default" msgid="1097584278225902734">"SD कार्ड"</string>
-    <string name="uninstall_text" msgid="4859715815689705801">"इंस्टॉल किये हुए को हटायें"</string>
+    <string name="uninstall_text" msgid="4859715815689705801">"अनइंस्टॉल करें"</string>
     <string name="uninstall_all_users_text" msgid="2620518509352561416">"सभी उपयोगकर्ताओं के लिए अनइंस्टॉल करें"</string>
     <string name="install_text" msgid="2798092278891807849">"इंस्टॉल करें"</string>
     <string name="disable_text" msgid="5065834603951474397">"बंद करें"</string>
@@ -2060,7 +2062,7 @@
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"शॉर्टकट चालू होने पर, आप कोई सुलभता सेवा शुरू करने के लिए आवाज़ की दोनों कुंजियों को 3 सेकंड तक दबाए रख सकते हैं."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"ज़्यादा कंट्रास्ट वाला लेख"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"स्क्रीन को बड़ा करने की सुविधा को अपने आप अपडेट करें"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"एेप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"ऐप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"पावर बटन से कॉल काटना"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"बड़ा माउस सूचक"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"ऐनिमेशन हटाएं"</string>
@@ -2175,9 +2177,9 @@
     <string name="touch_filtered_warning" msgid="3072665526993043879">"क्यूंकि ऐप की वजह से अनुमति के अनुरोध को समझने में दिक्कत हो रही है, इसलिए सेटिंग से आपके जवाब की पुष्टि नहीं हो पा रही हैं."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"अगर आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा सुरक्षित करने के काम को बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
     <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"क्योंकि आपने सुलभता सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा सुरक्षित करने के बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
-    <string name="enable_service_pattern_reason" msgid="7415969807374459848">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
-    <string name="enable_service_pin_reason" msgid="2899057249007636608">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
-    <string name="enable_service_password_reason" msgid="5210815233227388083">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
+    <string name="enable_service_pattern_reason" msgid="7415969807374459848">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
+    <string name="enable_service_pin_reason" msgid="2899057249007636608">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
+    <string name="enable_service_password_reason" msgid="5210815233227388083">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा ऐन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
     <string name="accessibility_service_warning" msgid="345702253188068806">"<xliff:g id="SERVICE">%1$s</xliff:g> इस डिवाइस पर पूरा नियंत्रण मांग रहा है. यह सेवा, स्क्रीन पर दिख रही जानकारी पढ़ सकती है और सुलभता से जुड़ी ज़रूरतों वाले उपयोगकर्ताओं की तरफ़ से काम कर सकती है. नियंत्रण का यह लेवल ज़्यादातर ऐप्लिकेशन के लिए सही नहीं है."</string>
     <string name="disable_service_title" msgid="6234243399949005825">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
     <string name="disable_service_message" msgid="4250593674885651779">"\'ठीक है\' पर टैप करने से <xliff:g id="SERVICE">%1$s</xliff:g> सुविधा बंद हो जाएगी."</string>
@@ -2372,10 +2374,10 @@
     <string name="usage_type_phone" product="tablet" msgid="4279605085824633501">"टैबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="3901842461077646153">"फ़ोन"</string>
     <string name="usage_type_data_send" msgid="6339880867171142725">"मोबाइल पैकेट भेजे गए"</string>
-    <string name="usage_type_data_recv" msgid="2099757621601333453">"मोबाइल पैकेट प्राप्त हुए"</string>
+    <string name="usage_type_data_recv" msgid="2099757621601333453">"मोबाइल पैकेट मिले"</string>
     <string name="usage_type_radio_active" msgid="4123481281606636561">"मोबाइल रेडियो सक्रिय"</string>
     <string name="usage_type_data_wifi_send" msgid="4457097885099163617">"वाई-फ़ाई  पैकेट भेजे गए"</string>
-    <string name="usage_type_data_wifi_recv" msgid="6629526425662663926">"वाई-फ़ाई  पैकेट प्राप्त हुए"</string>
+    <string name="usage_type_data_wifi_recv" msgid="6629526425662663926">"वाई-फ़ाई  पैकेट मिले"</string>
     <string name="usage_type_audio" msgid="510459400845396879">"ऑडियो"</string>
     <string name="usage_type_video" msgid="8161701367674306793">"वीडियो"</string>
     <string name="usage_type_camera" msgid="2276450385733155264">"कैमरा"</string>
@@ -2501,7 +2503,7 @@
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"बोलकर फ़ोन को निर्देश सेवाएं"</string>
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"पूरा हॉटवर्ड और इंटरैक्शन"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"आसान वाक् से लेख"</string>
-    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"बोलकर फ़ोन को निर्देश देने की यह सेवा, आपकी ओर से हमेशा आवाज़ की निगरानी और ऐसी ऐप जिसमें आवाज़ का इस्तेमाल होता है, को नियंत्रित करने में मदद करेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> एेप से आता है. इस सेवा को चालू करें?"</string>
+    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"बोलकर फ़ोन को निर्देश देने की यह सेवा, आपकी ओर से हमेशा आवाज़ की निगरानी और ऐसी ऐप जिसमें आवाज़ का इस्तेमाल होता है, को नियंत्रित करने में मदद करेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ऐप से आता है. इस सेवा को चालू करें?"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"पसंदीदा इंजन"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"इंजन सेटिंग"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"बोलने की दर और पिच"</string>
@@ -2536,7 +2538,7 @@
     <string name="credentials_reset_hint" msgid="3484350477764088169">"सभी सामग्री हटाएं?"</string>
     <string name="credentials_erased" msgid="7287088033523869085">"प्रमाणिकता मेमोरी मिटा दिया गया है."</string>
     <string name="credentials_not_erased" msgid="9137227570738627637">"प्रमाणिकता मेमोरी मिटाया नहीं जा सका."</string>
-    <string name="usage_access_title" msgid="7981321142726540574">"उपयोग के एक्सेस वाले ऐप्लिकेशन"</string>
+    <string name="usage_access_title" msgid="7981321142726540574">"उपयोग के ऐक्सेस वाले ऐप्लिकेशन"</string>
     <string name="emergency_tone_title" msgid="130211364025984428">"आपातकालीन डायलिंग सिग्नल"</string>
     <string name="emergency_tone_summary" msgid="8035940153401622240">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings_title" msgid="3573891462732375772">"बैकअप लें"</string>
@@ -2566,7 +2568,7 @@
     <string name="no_device_admins" msgid="4129231900385977460">"कोई भी डिवाइस व्यवस्थापक ऐप्लिकेशन उपलब्ध नहीं है"</string>
     <string name="personal_device_admin_title" msgid="759440849188565661">"व्यक्तिगत"</string>
     <string name="managed_device_admin_title" msgid="8021522755492551726">"दफ़्तर"</string>
-    <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"मैसेज (एसएमएस) और कॉल लॉग एक्सेस प्रतिबंधित करें"</string>
+    <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"मैसेज (एसएमएस) और कॉल लॉग ऐक्सेस प्रतिबंधित करें"</string>
     <string name="sms_access_restriction_enabled_summary" msgid="9011946580977780063">"सिर्फ़ डिफ़ॉल्ट फ़ोन और मैसेज-सेवा देने वाले ऐप्लिकेशन के पास मैसेज (एसएमएस) और कॉल लॉग की अनुमतियां होती हैं"</string>
     <string name="no_trust_agents" msgid="5757792915019113084">"कोई ट्रस्ट एजेंट उपलब्ध नहीं"</string>
     <string name="add_device_admin_msg" msgid="3573765823476931173">"इस डिवाइस एडमिन ऐप्लिकेशन को चालू करें?"</string>
@@ -2596,7 +2598,7 @@
     <string name="work_mode_off_summary" msgid="1688885392211178315">"ऐप्लिकेशन और सूचनाएं बंद हैं"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"वर्क प्रोफ़ाइल निकालें"</string>
     <string name="background_data" msgid="8275750862371471171">"पृष्ठभूमि डेटा"</string>
-    <string name="background_data_summary" msgid="799640633948841990">"ऐप्लिकेशन किसी भी समय डेटा समन्वयित, भेज और प्राप्त कर सकते हैं"</string>
+    <string name="background_data_summary" msgid="799640633948841990">"ऐप्लिकेशन किसी भी समय डेटा सिंक करना, भेज, और पा सकते हैं"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"पृष्ठभू. डेटा अक्षम करें?"</string>
     <string name="background_data_dialog_message" msgid="8126774244911656527">"बैकग्राउंड डेटा को बंद करने से बैटरी ज़्यादा चलती है और डेटा कम खर्च होता है. हो सकता है कि कुछ ऐप अब भी बैकग्राउंड में डेटा इस्तेमाल कर रहे हों."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"ऐप डेटा अपने आप सिंक करें"</string>
@@ -2694,7 +2696,7 @@
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"बैकग्राउंड में मोबाइल डेटा का इस्तेमाल करना चालू करें"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने के लिए, पहले मो. डेटा सीमा सेट करें."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"यह सुविधा सिर्फ़ मोबाइल नेटवर्क उपलब्ध होने पर उस एेप को काम करने से रोक सकती है जो बैकग्राउंड डेटा पर निर्भर है.\n\nआप एेप में उपलब्ध सेटिंग में ज़्यादा उचित डेटा खर्च नियंत्रण पा सकते हैं."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"यह सुविधा सिर्फ़ मोबाइल नेटवर्क उपलब्ध होने पर उस ऐप को काम करने से रोक सकती है जो बैकग्राउंड डेटा पर निर्भर है.\n\nआप ऐप में उपलब्ध सेटिंग में ज़्यादा उचित डेटा खर्च नियंत्रण पा सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"बैकग्राउंड डेटा प्रतिबंधित करना तभी संभव है जब आपने कोई नेटवर्क डेटा सीमा सेट की हुई हो."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2342323408229702005">"अपने आप डेटा सिंक चालू करें?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="4935430284683238901">"आपने वेब पर अपने खातों में जो भी बदलाव किए हैं उनकी कॉपी आपके टैबलेट में अपने आप बन जाएगी.\n\nआपने जो भी बदलाव टैबलेट पर किए हैं, उन्हें कुछ खाते वेब पर भी कॉपी कर सकते हैं. Google खाता इसी तरह काम करता है."</string>
@@ -2717,7 +2719,7 @@
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"सीमा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"निकाले गए ऐप्लिकेशन"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"ऐप्लिकेशन  और उपयोगकर्ताओं को निकालें"</string>
-    <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> प्राप्त, <xliff:g id="SENT">%2$s</xliff:g> भेजा"</string>
+    <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> पाया, <xliff:g id="SENT">%2$s</xliff:g> भेजा"</string>
     <string name="data_usage_total_during_range" msgid="7307562900020512747">"<xliff:g id="RANGE">%2$s</xliff:g>: करीब <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टैबलेट के द्वारा मापे जाने के अनुसार, करीब <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="3504412681869806383">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके फ़ोन के द्वारा मापे जाने के अनुसार, करीब <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
@@ -2751,7 +2753,7 @@
     <string name="vpn_save_login" msgid="6215503139606646915">"खाते की जानकारी सेव करें"</string>
     <string name="vpn_not_used" msgid="2889520789132261454">"(उपयोग नहीं किया)"</string>
     <string name="vpn_no_ca_cert" msgid="486605757354800838">"(सर्वर सत्‍यापित न करें)"</string>
-    <string name="vpn_no_server_cert" msgid="679622228649855629">"(सर्वर से प्राप्त)"</string>
+    <string name="vpn_no_server_cert" msgid="679622228649855629">"(सर्वर से मिला)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="165810330614905489">"यह वीपीएन प्रकार हमेशा कनेक्ट नहीं रह सकता"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="3864424127328210700">"हमेशा-चालू VPN सिर्फ़ संख्या वाले सर्वर पतों का समर्थन करता है"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="3814114757059738225">"हमेशा-चालू VPN के लिए एक DNS सर्वर तय किया जाना चाहिए"</string>
@@ -2937,7 +2939,7 @@
     <string name="severe_threats_title" msgid="1987698359027211862">"गंभीर धमकियां"</string>
     <string name="severe_threats_summary" msgid="1148147804181873835">"जान और माल के गंभीर खतरों के लिए अलर्ट पाएं"</string>
     <string name="amber_alerts_title" msgid="8274651933750533271">"AMBER अलर्ट"</string>
-    <string name="amber_alerts_summary" msgid="7570943549000256418">"बाल अपहरणों के बारे में बुलेटिन प्राप्त करें"</string>
+    <string name="amber_alerts_summary" msgid="7570943549000256418">"बाल अपहरणों के बारे में बुलेटिन पाएं"</string>
     <string name="repeat_title" msgid="507090203366188931">"दोहराएं"</string>
     <string name="call_manager_enable_title" msgid="6345443572463650308">"कॉल प्रबंधक चालू करें"</string>
     <string name="call_manager_enable_summary" msgid="6998536841827752058">"इस सेवा को कॉल करने का आपका तरीका प्रबंधित करने दें."</string>
@@ -2946,7 +2948,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="5750066270993255966">"इमरजेंसी के समय सूचनाएं"</string>
     <string name="network_operators_settings" msgid="7822337582828465633">"नेटवर्क ऑपरेटर"</string>
-    <string name="access_point_names" msgid="7992382237358800596">"एक्सेस पॉइंट का नाम"</string>
+    <string name="access_point_names" msgid="7992382237358800596">"ऐक्सेस पॉइंट का नाम"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="1624079276378568594">"VoLTE"</string>
     <string name="enhanced_4g_lte_mode_title_advanced_calling" msgid="5155507161065290507">"बेहतर कॉलिंग"</string>
     <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="1262729135500839141">"4G कॉलिंग"</string>
@@ -3017,7 +3019,7 @@
     <string name="sim_notification_summary" msgid="6421556454979313850">"सेट करने के लिए टैप करें"</string>
     <string name="sim_pref_divider" msgid="4967718397875240190">"इसके लिए पसंदीदा सिम"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="8209265235625420102">"हर बार पूछें"</string>
-    <string name="sim_selection_required_pref" msgid="8738591348923992419">"चयन आवश्यक है"</string>
+    <string name="sim_selection_required_pref" msgid="8738591348923992419">"चुनना ज़रूरी है"</string>
     <string name="sim_selection_channel_title" msgid="5671915549529226023">"सिम का चुनाव"</string>
     <string name="dashboard_title" msgid="3343056553551876215">"सेटिंग"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="4475734332610696843">
@@ -3300,7 +3302,7 @@
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"स्थिति बार में बिना आवाज़ की सूचनाओं के आइकॉन छिपाएं"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"सूचना बिंदुओं की अनुमति दें"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"बबल"</string>
-    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ़्लोटिंग शॉर्टकट का इस्तेमाल करके ऐप्लिकेशन की सामग्री कहीं से भी फटाफट एक्सेस करें"</string>
+    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ़्लोटिंग शॉर्टकट का इस्तेमाल करके ऐप्लिकेशन की सामग्री कहीं से भी फटाफट ऐक्सेस करें"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"कुछ सूचनाएं और दूसरी सामग्री स्क्रीन पर बबल के रूप में दिखाई दे सकती हैं. बबल खोलने के लिए इस पर टैप करें. इसे खारिज करने के लिए इसे खींचकर स्क्रीन पर नीचे की ओर ले जाएं."</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"बबल"</string>
     <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"<xliff:g id="APP_NAME">%1$s</xliff:g> को कुछ सूचनाएं बबल के तौर पर दिखाने की अनुमति दें"</string>
@@ -3353,7 +3355,7 @@
     <string name="notifications_sent_daily" msgid="6874886521964822824">"करीब <xliff:g id="NUMBER">%1$s</xliff:g> सूचनाएं हर दिन"</string>
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"करीब <xliff:g id="NUMBER">%1$s</xliff:g> सूचनाएं हर हफ़्ते"</string>
     <string name="notifications_sent_never" msgid="237997329598144638">"कभी नहीं"</string>
-    <string name="manage_notification_access_title" msgid="5348743662189787547">"सूचना का एक्सेस"</string>
+    <string name="manage_notification_access_title" msgid="5348743662189787547">"सूचना का ऐक्सेस"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"वर्क प्रोफ़ाइल सूचना की पहुंच रोक दी गई है"</string>
     <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"ऐप सूचनाएं नहीं पढ़ सकते"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
@@ -3362,12 +3364,12 @@
     </plurals>
     <string name="notification_assistant_title" msgid="8216604031352764011">"सूचना सहायक"</string>
     <string name="no_notification_assistant" msgid="9140123568386413264">"किसी सहायक की सुविधा नहीं है"</string>
-    <string name="no_notification_listeners" msgid="1366386609506834717">"इंस्टॉल किए गए किसी भी ऐप ने सूचना के एक्सेस का अनुरोध नहीं किया है."</string>
-    <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए सूचना एक्सेस करने की अनुमति दें?"</string>
+    <string name="no_notification_listeners" msgid="1366386609506834717">"इंस्टॉल किए गए किसी भी ऐप ने सूचना के ऐक्सेस का अनुरोध नहीं किया है."</string>
+    <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए सूचना ऐक्सेस करने की अनुमति दें?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> आपकी हर सूचना पढ़ पाएगा. इसमें आपकी निजी जानकारी, जैसे कि संपर्कों के नाम और आपको आने वाले मैसेज में लिखी चीज़ें शामिल हैं. यह सूचनाओं में बदलाव करने, उन्हें खारिज करने या उनमें मौजूद कार्रवाई बटनों को ट्रिगर करने जैसे काम भी कर पाएगा. \n\nइससे यह ऐप्लिकेशन \'परेशान न करें\' सुविधा चालू या बंद कर पाएगा या इससे जुड़ी सेटिंग बदल पाएगा."</string>
-    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए सूचना को एक्सेस करने की अनुमति दें?"</string>
+    <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए सूचना को ऐक्सेस करने की अनुमति दें?"</string>
     <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> संपर्क नामों और आपको मिलने वाले मैसेज जैसी निजी जानकारी सहित, सभी सूचनाएं पढ़ सकता है. वह सूचना खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप \'परेशान न करें\' सुविधा को चालू या बंद कर सकता है और उससे जुड़ी सेटिंग को भी बदल सकता है"</string>
-    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"अगर आप <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचना का एक्सेस बंद करते हैं, तो \'परेशान न करें\' सेवा का एक्सेस भी बंद हो सकता है."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"अगर आप <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचना का ऐक्सेस बंद करते हैं, तो \'परेशान न करें\' सेवा का ऐक्सेस भी बंद हो सकता है."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"बंद करें"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"रद्द करें"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"VR सहायक सेवाएं"</string>
@@ -3383,7 +3385,7 @@
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"पिक्चर में पिक्चर"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"पिक्चर में पिक्चर बनाने की अनुमति दें"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"ऐप के खुले होने पर या आपके उसे छोड़ देने के बाद, उस ऐप को पिक्चर में पिक्चर बनाने की अनुमति दें (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए). यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</string>
-    <string name="manage_zen_access_title" msgid="3058206309728524196">"परेशान न करें सुविधा का एक्सेस"</string>
+    <string name="manage_zen_access_title" msgid="3058206309728524196">"परेशान न करें सुविधा का ऐक्सेस"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\'परेशान न करें\' सुविधा चालू करें"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"इंस्टॉल किए गए किसी भी ऐप ने परेशान ना करें सुविधा के इस्तेमाल का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="1978345231934072091">"ऐप्लिकेशन लोड हो रहे हैं..."</string>
@@ -3537,7 +3539,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"केवल <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> तक के लिए अलार्म को बदलें"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"हमेशा बाधित करें में बदलें"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"जब स्क्रीन चालू हो"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"परेशान न करें सुविधा के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन पर दिखाएं अाैर एक स्टेटस बार आइकॉन दिखाएं"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"परेशान न करें सुविधा के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन पर दिखाएं आैर एक स्टेटस बार आइकॉन दिखाएं"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"जब स्क्रीन बंद हो"</string>
     <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"\'परेशान न करें\' के ज़रिए म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें और लाइट चालू/बंद करने दें"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"\'परेशान न करें\' के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन चालू करने दें"</string>
@@ -3671,7 +3673,7 @@
     <string name="system_app" msgid="4111402206594443265">"(सिस्टम)"</string>
     <string name="system_default_app" msgid="1454719098589351197">"(सिस्टम डिफ़ॉल्ट)"</string>
     <string name="apps_storage" msgid="5658466038269046038">"ऐप्लिकेशन मेमोरी"</string>
-    <string name="usage_access" msgid="2023443456361489516">"इस्तेमाल का एक्‍सेस"</string>
+    <string name="usage_access" msgid="2023443456361489516">"इस्तेमाल का ऐक्‍सेस"</string>
     <string name="permit_usage_access" msgid="3321727608629752758">"\'डेटा खर्च\' देखने की इजाज़त दें"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"ऐप उपयोग की प्राथमिकताएं"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"स्क्रीन समय"</string>
@@ -3750,13 +3752,13 @@
     <string name="usb_summary_photo_transfers_power" msgid="4424106272137720464">"पीटीपी और पावर देना"</string>
     <string name="usb_summary_MIDI_power" msgid="7685597621357005180">"एमआईडीआई (मिडी) और पावर देना"</string>
     <string name="background_check_pref" msgid="664081406854758392">"बैकग्राउंड की जॉंच"</string>
-    <string name="background_check_title" msgid="4136736684290307970">"पूरे बैकग्राउंड की एक्सेस"</string>
+    <string name="background_check_title" msgid="4136736684290307970">"पूरे बैकग्राउंड की ऐक्सेस"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"स्क्रीन के लेख का उपयोग करना"</string>
-    <string name="assist_access_context_summary" msgid="5867997494395842785">"सहायक ऐप्लिकेशन को स्क्रीन पर मौजूद सामग्री को लेख के रूप में एक्सेस करने दें"</string>
+    <string name="assist_access_context_summary" msgid="5867997494395842785">"सहायक ऐप्लिकेशन को स्क्रीन पर मौजूद सामग्री को लेख के रूप में ऐक्सेस करने दें"</string>
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"स्क्रीनशॉट का उपयोग करना"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"सहायक ऐप्लिकेशन को स्क्रीन की इमेज तक पहुंचने दें"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"स्क्रीन फ़्लैश करें"</string>
-    <string name="assist_flash_summary" msgid="6697095786317559129">"जब सहायक ऐप्लिकेशन स्क्रीन पर मौजूद लेख या स्क्रीनशॉट को एक्सेस करे तो स्क्रीन के किनारों पर रोशनी चमकाएं"</string>
+    <string name="assist_flash_summary" msgid="6697095786317559129">"जब सहायक ऐप्लिकेशन स्क्रीन पर मौजूद लेख या स्क्रीनशॉट को ऐक्सेस करे तो स्क्रीन के किनारों पर रोशनी चमकाएं"</string>
     <string name="assist_footer" msgid="7030121180457472165">"आप जो स्क्रीन देख रहे हैं, उसकी जानकारी के आधार पर सहायक ऐप्लिकेशन आपकी मदद कर सकते हैं. कुछ ऐप्लिकेशन पर, आपकी पूरी मदद करने के लिए लॉन्चर और बोलकर फ़ोन को निर्देश देना, ये दोनों सेवाएं काम करती हैं."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"औसत मेमोरी उपयोग"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"अधिकतम मेमोरी उपयोग"</string>
@@ -3778,10 +3780,10 @@
     </plurals>
     <string name="running_frequency" msgid="7545170806968474449">"फ़्रीक्वेंसी"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"अधिकतम उपयोग"</string>
-    <string name="no_data_usage" msgid="903383745620135746">"किसी डेटा का उपयोग नहीं किया गया"</string>
+    <string name="no_data_usage" msgid="903383745620135746">"किसी भी तरह के डेटा का इस्तेमाल नहीं किया गया"</string>
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की ऐक्सेस की अनुमति दें?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"यह ऐप, परेशान न करें को चालू/बंद कर सकेगा और संबंधित सेटिंग में बदलाव कर सकेगा."</string>
-    <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"इसे चालू रखें क्योंकि सूचना का एक्सेस चालू है"</string>
+    <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"इसे चालू रखें क्योंकि सूचना का ऐक्सेस चालू है"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की पहुंच रद्द करें?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"इस ऐप के द्वारा, परेशान न करें के लिए बनाए गए सभी नियम निकाल दिए जाएंगे."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ऑप्‍टिमाइज़ ना करें"</string>
@@ -3790,7 +3792,7 @@
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"बेहतर बैटरी जीवनकाल के लिए सुझाया गया"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"<xliff:g id="APP">%s</xliff:g> को बैटरी ऑप्टिमाइज़ेशन को अनदेखा करने की अनुमति दें?"</string>
     <string name="app_list_preference_none" msgid="7100409177446935028">"कोई नहीं"</string>
-    <string name="work_profile_usage_access_warning" msgid="403208064382097510">"इस ऐप के इस्तेमाल का एक्सेस बंद करने के बाद भी आपका एडमिन आपकी वर्क प्रोफ़ाइल के ऐप का डेटा खर्च ट्रैक कर सकते हैं"</string>
+    <string name="work_profile_usage_access_warning" msgid="403208064382097510">"इस ऐप के इस्तेमाल का ऐक्सेस बंद करने के बाद भी आपका एडमिन आपकी वर्क प्रोफ़ाइल के ऐप का डेटा खर्च ट्रैक कर सकते हैं"</string>
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> वर्णों का उपयोग किया गया"</string>
     <string name="draw_overlay" msgid="2878665072530660668">"दूसरे ऐप के ऊपर दिखाएं"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"दूसरे ऐप के ऊपर दिखाएं"</string>
@@ -3809,7 +3811,7 @@
     <string name="write_settings" msgid="9009040811145552108">"सिस्‍टम सेटिंग बदलें"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"सिस्‍टम सेटिंग में बदलाव करें लिखें"</string>
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> ऐप्लिकेशन को सिस्टम सेटिंग बदलने की अनुमति दी गई"</string>
-    <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"वित्तीय ऐप्लिकेशन मैसेज (एसएमएस) एक्सेस"</string>
+    <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"वित्तीय ऐप्लिकेशन मैसेज (एसएमएस) ऐक्सेस"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"अन्य ऐप्लिकेशन इंस्टॉल कर सकते हैं"</string>
     <string name="filter_write_settings_apps" msgid="6864144615530081121">"सिस्टम सेटिंग को बदल सकते हैं"</string>
     <string name="write_settings_title" msgid="5852614614193830632">"सिस्टम सेटिंग को बदल सकते हैं"</string>
@@ -4045,7 +4047,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"डिसप्ले कटआउट, नॉच"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"डिवाइस की डिफ़ॉल्ट सेटिंग"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"ओवरले लागू नहीं किया जा सका"</string>
-    <string name="special_access" msgid="1453926335914696206">"ऐप्लिकेशन के लिए खास एक्सेस"</string>
+    <string name="special_access" msgid="1453926335914696206">"ऐप्लिकेशन के लिए खास ऐक्सेस"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का उपयोग कर सकते हैं</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का उपयोग कर सकते हैं</item>
@@ -4062,7 +4064,7 @@
     <string name="developer_smallest_width" msgid="2603134476228805075">"सबसे कम चौड़ाई की स्क्रीन सेट करें"</string>
     <string name="premium_sms_none" msgid="940723020871007898">"इंस्टॉल किए गए किसी भी ऐप ने प्रीमियम मैसेज (एसएमएस) की पहुंच का अनुरोध नहीं किया है"</string>
     <string name="premium_sms_warning" msgid="7604011651486294515">"प्रीमियम मैसेज (एसएमएस) के लिए आपको पैसे देने पड़ सकते हैं और इससे आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का बिल बढ़ जाएगा. अगर आप किसी ऐप के लिए अनुमति देते हैं, तो आप उस ऐप का इस्तेमाल करके प्रीमियम मैसेज (एसएमएस) भेज सकते हैं."</string>
-    <string name="premium_sms_access" msgid="4550027460595822851">"प्रीमियम मैसेज (एसएमएस) का एक्सेस"</string>
+    <string name="premium_sms_access" msgid="4550027460595822851">"प्रीमियम मैसेज (एसएमएस) का ऐक्सेस"</string>
     <string name="bluetooth_disabled" msgid="6588102116819268238">"बंद"</string>
     <string name="bluetooth_connected_summary" msgid="439920840053965217">"<xliff:g id="ID_1">%1$s</xliff:g> से कनेक्‍ट है"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="596205630653123250">"कई डिवाइस से कनेक्ट है"</string>
@@ -4079,7 +4081,7 @@
     <string name="managed_profile_contact_search_summary" msgid="7278267480246726951">"कॉल करने वालों (कॉलर) और संपर्कों की पहचान करने के लिए अपने संगठन को संपर्क खोजने दें"</string>
     <string name="cross_profile_calendar_title" msgid="2351605904015067145">"क्रॉस-प्रोफ़ाइल कैलेंडर"</string>
     <string name="cross_profile_calendar_summary" msgid="3196258680438896098">"निजी कैलेंडर पर काम से जुड़े इवेंट दिखाएं"</string>
-    <string name="cross_profile_calendar_restricted_summary" msgid="6892589892357409107">"आपका संगठन निजी ऐप्लिकेशन को आपके काम से जुड़े कैलेंडर का एक्सेस करने की अनुमति नहीं देता"</string>
+    <string name="cross_profile_calendar_restricted_summary" msgid="6892589892357409107">"आपका संगठन निजी ऐप्लिकेशन को आपके काम से जुड़े कैलेंडर का ऐक्सेस करने की अनुमति नहीं देता"</string>
     <plurals name="hours" formatted="false" msgid="135936773984899873">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
@@ -4145,7 +4147,7 @@
     <string name="web_action_enable_title" msgid="4462106633708675959">"झटपट ऐप्लिकेशन"</string>
     <string name="web_action_enable_summary" msgid="1729016644691793085">"सभी लिंक ऐप्लिकेशन में खोलें, भले ही वे इंस्टॉल न हों"</string>
     <string name="web_action_section_title" msgid="5563229447734734662">"झटपट ऐप्लिकेशन"</string>
-    <string name="instant_apps_settings" msgid="879003203555847537">"इंस्टेंट ऐप से जुड़ी पसंद की सेटिंग"</string>
+    <string name="instant_apps_settings" msgid="879003203555847537">"झटपट ऐप्लिकेशन से जुड़ी पसंद की सेटिंग"</string>
     <string name="domain_url_section_title" msgid="206403507921518321">"इंस्‍टॉल किए गए ऐप्‍लिकेशन"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> के खाते"</string>
@@ -4246,7 +4248,7 @@
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए बंद है)"</string>
     <string name="autofill_app" msgid="3990765434980280073">"अपने आप भरने की सेवा"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
-    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;पक्का करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें निर्धारित करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
+    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;पक्का करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें तय करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का इस्तेमाल करता है."</string>
     <string name="debug_autofill_category" msgid="6262526615416295645">"अपने आप भरने की सुविधा (ऑटो फ़िल)"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"लॉग की गई जानकारी का लेवल"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"हर सत्र में ज़्यादा से ज़्यादा इतने अनुरोध शामिल कर सकते हैं"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"इस सुविधा का इस्तेमाल करने पर आपका फ़ोन धीरे काम करेगा"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"जीएनएसएस माप को हर हाल में लागू करें"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"बिना ड्यूटी-साइक्लिंग के जीएनएसएस के सभी तारामंडल (कॉन्स्टलेशन) और फ़्रीक्वेंसी ट्रैक करें"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"उपयोगकर्ता बदलते समय डीबग करना"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"उपयोगकर्ता बदलते समय ज़्यादा जानकारी दिखाएं"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"बैकग्राउंड में गतिविधि शुरू होने की मंज़ूरी दें"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"इससे बैकग्राउंड में शुरू होने वाली सभी गतिविधि को मंज़ूरी मिल जाती है"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"क्रैश होने की सूचना हर बार दिखाएं"</string>
@@ -4376,7 +4380,7 @@
     <string name="carrier_settings_title" msgid="7989949967020825268">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी से जुड़ी सेटिंग"</string>
     <string name="cdma_lte_data_service" msgid="8996857851150069339">"डेटा सेवा सेट अप करें"</string>
     <string name="mobile_data_settings_title" msgid="3439626666647519547">"मोबाइल डेटा"</string>
-    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क का इस्तेमाल करके डेटा एक्सेस करें"</string>
+    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क का इस्तेमाल करके डेटा ऐक्सेस करें"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"नेटवर्क होने पर फ़ोन अपने आप इस कैरियर पर आ जाएगा"</string>
     <string name="calls_preference" msgid="2076353032705811243">"कॉल की प्राथमिकता"</string>
     <string name="sms_preference" msgid="8449270011976880">"मैसेज (एसएमएस) की प्राथमिकता"</string>
@@ -4434,7 +4438,7 @@
     <string name="roaming_check_price_warning" msgid="5883499714594419439">"कीमतों की जानकारी के लिए आपको नेटवर्क सेवा देने वाली कंपनी से संपर्क करें."</string>
     <string name="mobile_data_usage_title" msgid="2376358672434990037">"ऐप्लिकेशन का डेटा इस्तेमाल"</string>
     <string name="mobile_network_mode_error" msgid="6818434186286086554">"गलत नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. अनदेखा करें."</string>
-    <string name="mobile_network_apn_title" msgid="5628635067747404382">"एक्सेस पॉइंट नाम"</string>
+    <string name="mobile_network_apn_title" msgid="5628635067747404382">"ऐक्सेस पॉइंट नाम"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"<xliff:g id="CARRIER">%1$s</xliff:g> से कनेक्ट होने पर उपलब्ध नहीं है"</string>
     <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"चिकित्सा से जुड़ी जानकारी, आपातकालीन संपर्क"</string>
     <string name="see_more" msgid="7463940160389802632">"ज़्यादा देखें"</string>
@@ -4482,8 +4486,8 @@
     </plurals>
     <string name="accessibility_usage_title" msgid="3920601240120963611">"सुलभता सुविधाओं का इस्तेमाल"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="2604152087205501644">
-      <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> ऐप्लिकेशन के पास आपके डिवाइस का पूरा एक्सेस है</item>
-      <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> ऐप्लिकेशन के पास आपके डिवाइस का पूरा एक्सेस है</item>
+      <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> ऐप्लिकेशन के पास आपके डिवाइस का पूरा ऐक्सेस है</item>
+      <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> ऐप्लिकेशन के पास आपके डिवाइस का पूरा ऐक्सेस है</item>
     </plurals>
     <string name="manage_app_notification" msgid="9072118910762792295">"<xliff:g id="APP_NAME">%1$s</xliff:g> की सूचनाएं प्रबंधित करें"</string>
     <string name="no_suggested_app" msgid="509257628685025383">"कोई भी सुझाया गया ऐप्लिकेशन नहीं है"</string>
@@ -4500,7 +4504,7 @@
     <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"नहीं, धन्यवाद"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="5696194250838686019">"जगह"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"इस सेवा को उपलब्ध कराने के लिए मोबाइल नेटवर्क की सुविधा उपलब्ध कराने वाली कंपनी आपकी जगह की जानकारी इकट्ठा कर सकती है.\n\nकृपया कंपनी की निजता नीति को ध्यान से पढ़ें."</string>
-    <string name="forget_passpoint_dialog_message" msgid="3337626966248310367">"आप बचे हुए समय या डेटा का एक्सेस खो सकते हैं. हटाने से पहले अपनी सेवा देने वाली कंपनी से पुष्टि कर लें."</string>
+    <string name="forget_passpoint_dialog_message" msgid="3337626966248310367">"आप बचे हुए समय या डेटा का ऐक्सेस खो सकते हैं. हटाने से पहले अपनी सेवा देने वाली कंपनी से पुष्टि कर लें."</string>
     <string name="keywords_content_capture" msgid="5401877823529928976">"सामग्री कैप्चर, स्मार्ट सुझाव"</string>
     <string name="content_capture" msgid="1709538093513983279">"स्मार्ट सुझाव"</string>
     <string name="content_capture_summary" msgid="2675659095218714681">"Android को आपकी स्क्रीन पर दिखाई दे रही जानकारी, वीडियो या ऑडियो में सुनाई दे रही सामग्री सेव करने की अनुमति दें. Android आपके डिवाइस की गतिविधि के मुताबिक काम आने वाले सुझाव देता है."</string>
diff --git a/tests/CarDeveloperOptions/res/values-hr-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-hr-nokeys/strings.xml
new file mode 100644
index 0000000..aae8d26
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hr-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Upravljanje aplikacijama"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hr/arrays.xml b/tests/CarDeveloperOptions/res/values-hr/arrays.xml
new file mode 100644
index 0000000..66ab70c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hr/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Azija"</item>
+    <item msgid="6683489385344409742">"Australija"</item>
+    <item msgid="5194868215515664953">"Pacifički"</item>
+    <item msgid="7044520255415007865">"Sve"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekunda"</item>
+    <item msgid="772029947136115322">"30 sekundi"</item>
+    <item msgid="8743663928349474087">"1 minuta"</item>
+    <item msgid="1506508631223164814">"2 minute"</item>
+    <item msgid="8664703938127907662">"5 minuta"</item>
+    <item msgid="5827960506924849753">"10 minuta"</item>
+    <item msgid="6677424950124253938">"30 minuta"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikada"</item>
+    <item msgid="2517785806387977252">"15 sekundi"</item>
+    <item msgid="6347954399441173672">"30 sekundi"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minuta"</item>
+    <item msgid="8012672183888404961">"10 minuta"</item>
+    <item msgid="8271452751594598661">"30 minuta"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Odmah"</item>
+    <item msgid="2038544972632026612">"5 sekunda"</item>
+    <item msgid="5558060663472279597">"15 sekunda"</item>
+    <item msgid="45341168505452037">"30 sekundi"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minuta"</item>
+    <item msgid="811192536981678974">"10 minuta"</item>
+    <item msgid="7258394417241706272">"30 minuta"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Malen"</item>
+    <item msgid="591935967183159581">"Zadano"</item>
+    <item msgid="1714184661981538355">"Velik"</item>
+    <item msgid="6195563047686707484">"Najveće"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skeniranje..."</item>
+    <item msgid="5597394826455877834">"Povezivanje…"</item>
+    <item msgid="5848277343965362748">"Autentifikacija..."</item>
+    <item msgid="3391238031431440676">"Dohvaćanje IP adrese…"</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Obustavljeno"</item>
+    <item msgid="1228072488815999109">"Isključivanje…"</item>
+    <item msgid="7253087004422991731">"Niste povezani"</item>
+    <item msgid="4169850917304751227">"Neuspješno"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Privremeno izbjegavanje loše veze"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skeniranje..."</item>
+    <item msgid="8058143476674427024">"Povezivanje na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Autentifikacija s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Dohvaćanje IP adrese s mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Povezano s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Obustavljeno"</item>
+    <item msgid="4133290864821295785">"Isključivanje iz mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Niste povezani"</item>
+    <item msgid="2847316776634969068">"Neuspješno"</item>
+    <item msgid="4390990424746035383">"Blokirano"</item>
+    <item msgid="3618248791367063949">"Privremeno izbjegavanje loše veze"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Pritisnuti gumb"</item>
+    <item msgid="7401896200768713930">"PIN s paralelnog uređaja"</item>
+    <item msgid="4526848028011846710">"PIN s ovog uređaja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Povezano"</item>
+    <item msgid="983792611851499732">"Pozvan"</item>
+    <item msgid="5438273405428201793">"Neuspješno"</item>
+    <item msgid="4646663015449312554">"Dostupno"</item>
+    <item msgid="3230556734162006146">"Izvan dometa"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minute"</item>
+    <item msgid="2759776603549270587">"5 minuta"</item>
+    <item msgid="167772676068860015">"Jedan sat"</item>
+    <item msgid="5985477119043628504">"Nikada ne istječe"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Koristi zadane postavke sustava: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Loša"</item>
+    <item msgid="7882129634982603782">"Loša"</item>
+    <item msgid="6457357501905996224">"Solidna"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Izvrsna"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Posljednjih 30 dana"</item>
+    <item msgid="3211287705232736964">"Postavi ciklus uporabe..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Vrijeme upotrebe"</item>
+    <item msgid="2784401352592276015">"Posljednja upotreba"</item>
+    <item msgid="249854287216326349">"Naziv aplikacije"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ništa"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ništa"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ništa"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statično"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ništa"</item>
+    <item msgid="1464741437353223198">"Priručnik"</item>
+    <item msgid="5793600062487886090">"Autom. konfig. proxyja"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ništa"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ili CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nije navedeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1 x RTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ništa"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interno pohranjivanje na uređaj"</item>
+    <item msgid="3186681694079967527">"Prijenosna SD kartica"</item>
+    <item msgid="6902033473986647035">"Neka sustav odluči"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokacija"</item>
+    <item msgid="6842381562497597649">"Osobno"</item>
+    <item msgid="3966700236695683444">"Slanje poruka"</item>
+    <item msgid="8563996233342430477">"Mediji"</item>
+    <item msgid="5323851085993963783">"Uređaj"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"približna lokacija"</item>
+    <item msgid="1830619568689922920">"precizna lokacija"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibriranje"</item>
+    <item msgid="8632513128515114092">"čitanje kontakata"</item>
+    <item msgid="3741042113569620272">"izmjena kontakata"</item>
+    <item msgid="4204420969709009931">"čitanje zapisnika poziva"</item>
+    <item msgid="2260380357119423209">"izmjena zapisnika poziva"</item>
+    <item msgid="6550710385014530934">"čitanje kalendara"</item>
+    <item msgid="3575906174264853951">"izmjena kalendara"</item>
+    <item msgid="4319843242568057174">"skeniranje Wi-Fija"</item>
+    <item msgid="2981791890467303819">"obavijest"</item>
+    <item msgid="6617825156152476692">"skeniranje ćelije"</item>
+    <item msgid="8865260890611559753">"poziv na telefon"</item>
+    <item msgid="3254999273961542982">"čitanje SMS-a"</item>
+    <item msgid="7711446453028825171">"pisanje SMS-a"</item>
+    <item msgid="6123238544099198034">"primanje SMS-a"</item>
+    <item msgid="838342167431596036">"primanje SMS-a u nuždi"</item>
+    <item msgid="8554432731560956686">"primanje MMS-a"</item>
+    <item msgid="7464863464299515059">"primanje WAP obavijesti"</item>
+    <item msgid="310463075729606765">"slanje SMS-a"</item>
+    <item msgid="7338021933527689514">"čitanje ICC SMS-a"</item>
+    <item msgid="6130369335466613036">"pisanje ICC SMS-a"</item>
+    <item msgid="6536865581421670942">"izmjena postavki"</item>
+    <item msgid="4547203129183558973">"povlačenje na vrh"</item>
+    <item msgid="9080347512916542840">"pristup obavijestima"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"snimanje zvuka"</item>
+    <item msgid="9182794235292595296">"reprodukcija audiozapisa"</item>
+    <item msgid="8760743229597702019">"čitaj međuspremnik"</item>
+    <item msgid="2266923698240538544">"izmijeni međuspremnik"</item>
+    <item msgid="1801619438618539275">"medijski gumbi"</item>
+    <item msgid="31588119965784465">"audiofokus"</item>
+    <item msgid="7565226799008076833">"glavna glasnoća"</item>
+    <item msgid="5420704980305018295">"glasnoća glasa"</item>
+    <item msgid="5797363115508970204">"glasnoća zvona"</item>
+    <item msgid="8233154098550715999">"glasnoća medija"</item>
+    <item msgid="5196715605078153950">"glasnoća alarma"</item>
+    <item msgid="394030698764284577">"glasnoća obavijesti"</item>
+    <item msgid="8952898972491680178">"glasnoća Bluetootha"</item>
+    <item msgid="8506227454543690851">"zadrži u aktivnom stanju"</item>
+    <item msgid="1108160036049727420">"praćenje lokacije"</item>
+    <item msgid="1496205959751719491">"praćenje lokacije s visokom potrošnjom energije"</item>
+    <item msgid="3776296279910987380">"dohvaćanje statistike o upotrebi"</item>
+    <item msgid="8827100324471975602">"isključivanje/uključivanje mikrofona"</item>
+    <item msgid="6880736730520126864">"prikaz poruke"</item>
+    <item msgid="4933375960222609935">"projiciranje medija"</item>
+    <item msgid="8357907018938895462">"aktiviranje VPN-a"</item>
+    <item msgid="8143812849911310973">"pozadinska slika za pisanje"</item>
+    <item msgid="6266277260961066535">"pomoćna struktura"</item>
+    <item msgid="7715498149883482300">"pomoćna snimka zaslona"</item>
+    <item msgid="4046679376726313293">"čitanje stanja telefona"</item>
+    <item msgid="6329507266039719587">"dodavanje govorne pošte"</item>
+    <item msgid="7692440726415391408">"upotreba SIP-a"</item>
+    <item msgid="8572453398128326267">"obrada odlaznog poziva"</item>
+    <item msgid="7775674394089376306">"otisak prsta"</item>
+    <item msgid="3182815133441738779">"biometrijski senzori"</item>
+    <item msgid="2793100005496829513">"čitanje poruka mobilne mreže"</item>
+    <item msgid="2633626056029384366">"lažiranje lokacije"</item>
+    <item msgid="8356842191824684631">"čitanje pohrane"</item>
+    <item msgid="5671906070163291500">"pisanje u pohranu"</item>
+    <item msgid="2791955098549340418">"uključivanje zaslona"</item>
+    <item msgid="5599435119609178367">"dohvaćanje računa"</item>
+    <item msgid="1165623660533024666">"izvođenje u pozadini"</item>
+    <item msgid="6423861043647911030">"glasnoća pristupačnosti"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kratko"</item>
+    <item msgid="4816511817309094890">"Srednja"</item>
+    <item msgid="8305084671259331134">"Dugo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Zadano"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif zgusnuti"</item>
+    <item msgid="6529379119163117545">"Fiksna širina bez serifa"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Fiksna širina sa serifima"</item>
+    <item msgid="4448481989108928248">"Jednostavno"</item>
+    <item msgid="4627069151979553527">"Kurziv"</item>
+    <item msgid="6896773537705206194">"Mala slova"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Vrlo mali"</item>
+    <item msgid="5091603983404027034">"Mali"</item>
+    <item msgid="176844712416932112">"Uobičajeni"</item>
+    <item msgid="2784236342175159295">"Velik"</item>
+    <item msgid="218913203203160606">"Vrlo veliki"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Zadano"</item>
+    <item msgid="6488643537808152001">"Ništa"</item>
+    <item msgid="552332815156010137">"Obris"</item>
+    <item msgid="7187891159463789272">"Sjena"</item>
+    <item msgid="8019330250538856521">"Povišeno"</item>
+    <item msgid="8987385315647049787">"Utisnuto"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Uporaba zadanih postavki aplikacije"</item>
+    <item msgid="8611890312638868524">"Bijelo na crnom"</item>
+    <item msgid="5891360837786277638">"Crno na bijelom"</item>
+    <item msgid="2798457065945456853">"Žuto na crnom"</item>
+    <item msgid="5799049811524553967">"Žuto na plavom"</item>
+    <item msgid="3673930830658169860">"Prilagođeno"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN s unaprijed dijeljenim ključevima"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN s certifikatima"</item>
+    <item msgid="312397853907741968">"IPSec VPN s unaprijed dijeljenim ključevima i Xauth autentifikacijom"</item>
+    <item msgid="3319427315593649917">"IPSec VPN s certifikatima i Xauth autentifikacijom"</item>
+    <item msgid="8258927774145391041">"IPSec VPN s certifikatima i hibridnom autentifikacijom"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ništa"</item>
+    <item msgid="1157046369795346308">"Priručnik"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Niste povezani"</item>
+    <item msgid="8754480102834556765">"Pokreće se..."</item>
+    <item msgid="3351334355574270250">"Povezivanje…"</item>
+    <item msgid="8303882153995748352">"Povezano"</item>
+    <item msgid="9135049670787351881">"Privremeni prekid"</item>
+    <item msgid="2124868417182583926">"Neuspješno"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Postavi pitanje"</item>
+    <item msgid="7718817231348607934">"Ne dopuštaj nikada"</item>
+    <item msgid="8184570120217958741">"Dopusti uvijek"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Postojana"</item>
+    <item msgid="167418068739176448">"Glavna aktivnost"</item>
+    <item msgid="4760813290195199773">"Važna (u prvom planu)"</item>
+    <item msgid="2328684826817647595">"Važna (u pozadini)"</item>
+    <item msgid="7746406490652867365">"Sigurnosna kopija"</item>
+    <item msgid="5597404364389196754">"Teška"</item>
+    <item msgid="1290888779300174556">"Usluga (izvodi se)"</item>
+    <item msgid="7241098542073939046">"Usluga (ponovno pokretanje)"</item>
+    <item msgid="6610439017684111046">"Prijamnik"</item>
+    <item msgid="7367606086319921117">"Kuća"</item>
+    <item msgid="3344660712396741826">"Posljednja aktivnost"</item>
+    <item msgid="5006559348883303865">"Predmemorija (aktivnost)"</item>
+    <item msgid="8633480732468137525">"Predmemorija (klijent aktivnosti)"</item>
+    <item msgid="6248998242443333892">"Predmemorija (prazna)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Tirkiznoplava"</item>
+    <item msgid="3228505970082457852">"Plava"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Ljubičasta"</item>
+    <item msgid="5932337981182999919">"Ružičasta"</item>
+    <item msgid="5642914536624000094">"Crvena"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Starije od 30 dana"</item>
+    <item msgid="8699273238891265610">"Starije od 60 dana"</item>
+    <item msgid="8346279419423837266">"Starije od 90 dana"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Automatsko otkrivanje"</item>
+    <item msgid="773943026484148895">"Mreža s ograničenim prometom"</item>
+    <item msgid="1008268820118852416">"Mreža bez ograničenja prometa"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Koristi nasumično određen MAC (zadano)"</item>
+    <item msgid="214234417308375326">"Upotrijebite MAC uređaja"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ne"</item>
+    <item msgid="1930581185557754880">"Da"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tamno"</item>
+    <item msgid="5079453644557603349">"Svijetlo"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Isključeno"</item>
+    <item msgid="4072198137051566919">"Otklanjanje pogrešaka"</item>
+    <item msgid="2473005316958868509">"Opširno"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Samo matično"</item>
+    <item msgid="1161026694891024702">"Automatski"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Preporučeno: GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Samo GSM"</item>
+    <item msgid="8579197487913425819">"Samo WCDMA"</item>
+    <item msgid="8465243227505412498">"Automatski GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automatski CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA bez EvDo-a"</item>
+    <item msgid="7278975240951052041">"Samo EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalno"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Samo TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalno"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hr/strings.xml b/tests/CarDeveloperOptions/res/values-hr/strings.xml
index 9709c6f..a7eefb7 100644
--- a/tests/CarDeveloperOptions/res/values-hr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hr/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zaštitite tablet pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje autentifikacije lica. Dodirnite Odustani, a zatim postavite PIN ili odaberite neku drugu opciju zaključavanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zaštite uređaj pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje autentifikacije lica. Dodirnite Odustani, a zatim postavite PIN ili odaberite neku drugu opciju zaključavanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zaštitite telefon pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje autentifikacije lica. Dodirnite Odustani, a zatim postavite PIN ili odaberite neku drugu opciju zaključavanja zaslona."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiti postavljanje zaporke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiti postavljanje uzorka?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Postavi zaključavanje zaslona"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilni uređaj"</item>
+    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3870,8 +3872,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"Aplikacije s dopuštenjem za izmjenu postavki sustava: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Pristup SMS-ovima za financijske aplikacije"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Može instalirati druge aplikacije"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"S dopuštenjem za izmjenu postavki sustava"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"S dopuštenjem za izmjenu postavki sustava"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Mogu mijenjati postavke sustava"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Mogu mijenjati postavke sustava"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Izmjena postavki sustava"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Dopusti izmjenu postavki sustava"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>
@@ -3950,7 +3952,7 @@
     <string name="condition_battery_summary" msgid="1236078243905690620">"Značajke su ograničene"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"Mobilni su podaci isključeni"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"Internet je dostupan samo putem Wi‑Fija"</string>
-    <string name="condition_bg_data_title" msgid="184684435298857712">"Ušteda podataka"</string>
+    <string name="condition_bg_data_title" msgid="184684435298857712">"Štednja podat. prometa"</string>
     <string name="condition_bg_data_summary" msgid="5194942860807136682">"Značajke su ograničene"</string>
     <string name="condition_work_title" msgid="9046811302347490371">"Radni je profil isključen"</string>
     <string name="condition_work_summary" msgid="5586134491975748565">"Za aplikacije i obavijesti"</string>
@@ -4170,13 +4172,13 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Priručnik"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Oslobodi prostor odmah"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Pokreti"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Brzi pokreti za upravljanje telefonom"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Brzi pokreti za upravljanje tabletom"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Brzi pokreti za upravljanje uređajem"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Brze kretnje za upravljanje telefonom"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Brze kretnje za upravljanje tabletom"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Brze kretnje za upravljanje uređajem"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Otvaranje fotoaparata"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"Da biste brzo otvorili fotoaparat, dvaput pritisnite tipku za uključivanje/isključivanje. Funkcionira na svim zaslonima."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Brzo otvaranje fotoaparata"</string>
-    <string name="double_twist_for_camera_mode_title" msgid="2606032140297556018">"Prebacivanje fotoaparata"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="2606032140297556018">"Promjena fotoaparata"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="8979914206876018137"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="5932411386316771246">"Brže snimanje selfieja"</string>
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"Da biste promijenili aplikaciju, prijeđite prstom prema gore po gumbu početnog zaslona. Ponovo prijeđite prstom prema gore da biste vidjeli sve aplikacije. Funkcionira na svim zaslonima. Više nećete imati gumb Pregled u donjem desnom kutu zaslona."</string>
@@ -4348,6 +4350,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ovo će usporiti telefon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Primijeni potpuna mjerenja GNSS-a"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Prati sve konstelacije i frekvencije GNSS-a bez određivanja radnog omjera"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Otkloni pogreške s promjenom korisnika"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Prikaži detaljne informacije tijekom promjene korisnika"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Dopusti pokretanje pozadinskih aktivnosti"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Dopušta pokretanje svih pozadinskih aktivnosti"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Uvijek prikaži dijaloški okvir o rušenju"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hu-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-hu-nokeys/strings.xml
new file mode 100644
index 0000000..a10767c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hu-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Alkalmazások kezelése"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hu/arrays.xml b/tests/CarDeveloperOptions/res/values-hu/arrays.xml
new file mode 100644
index 0000000..c735ccf
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hu/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Európa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Ázsia"</item>
+    <item msgid="6683489385344409742">"Ausztrália"</item>
+    <item msgid="5194868215515664953">"Csendes-óceán"</item>
+    <item msgid="7044520255415007865">"Összes"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 másodperc"</item>
+    <item msgid="772029947136115322">"30 másodperc"</item>
+    <item msgid="8743663928349474087">"1 perc"</item>
+    <item msgid="1506508631223164814">"2 perc"</item>
+    <item msgid="8664703938127907662">"5 perc"</item>
+    <item msgid="5827960506924849753">"10 perc"</item>
+    <item msgid="6677424950124253938">"30 perc"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Soha"</item>
+    <item msgid="2517785806387977252">"15 másodperc"</item>
+    <item msgid="6347954399441173672">"30 másodperc"</item>
+    <item msgid="4858305253279921789">"1 perc"</item>
+    <item msgid="8109273437140044073">"2 perc"</item>
+    <item msgid="2788593551142462622">"5 perc"</item>
+    <item msgid="8012672183888404961">"10 perc"</item>
+    <item msgid="8271452751594598661">"30 perc"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Azonnal"</item>
+    <item msgid="2038544972632026612">"5 másodperc"</item>
+    <item msgid="5558060663472279597">"15 másodperc"</item>
+    <item msgid="45341168505452037">"30 másodperc"</item>
+    <item msgid="227647485917789272">"1 perc"</item>
+    <item msgid="3367011891231217504">"2 perc"</item>
+    <item msgid="4376575879222393045">"5 perc"</item>
+    <item msgid="811192536981678974">"10 perc"</item>
+    <item msgid="7258394417241706272">"30 perc"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Kicsi"</item>
+    <item msgid="591935967183159581">"Alapértelmezett"</item>
+    <item msgid="1714184661981538355">"Nagy"</item>
+    <item msgid="6195563047686707484">"A legnagyobb"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Keresés..."</item>
+    <item msgid="5597394826455877834">"Csatlakozás…"</item>
+    <item msgid="5848277343965362748">"Hitelesítés..."</item>
+    <item msgid="3391238031431440676">"IP-cím lekérése..."</item>
+    <item msgid="5257597310494000224">"Csatlakozva"</item>
+    <item msgid="8472497592913050396">"Felfüggesztve"</item>
+    <item msgid="1228072488815999109">"Szétkapcsolás..."</item>
+    <item msgid="7253087004422991731">"Szétkapcsolva"</item>
+    <item msgid="4169850917304751227">"Sikertelen"</item>
+    <item msgid="6266658166690831131">"Letiltva"</item>
+    <item msgid="4517230805854909775">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Keresés..."</item>
+    <item msgid="8058143476674427024">"Csatlakozás a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózathoz..."</item>
+    <item msgid="7547609081339573756">"Hitelesítés a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózaton..."</item>
+    <item msgid="5145158315060185414">"IP-cím lekérése a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózattól..."</item>
+    <item msgid="3283243151651124831">"Kapcsolódva a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózathoz"</item>
+    <item msgid="6600156231416890902">"Felfüggesztve"</item>
+    <item msgid="4133290864821295785">"Kapcsolat bontása <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózattal..."</item>
+    <item msgid="3980154971187953257">"Szétkapcsolva"</item>
+    <item msgid="2847316776634969068">"Sikertelen"</item>
+    <item msgid="4390990424746035383">"Letiltva"</item>
+    <item msgid="3618248791367063949">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Nyomógomb"</item>
+    <item msgid="7401896200768713930">"Partnereszköztől kapott PIN"</item>
+    <item msgid="4526848028011846710">"A készülék PIN-kódja"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Csatlakozva"</item>
+    <item msgid="983792611851499732">"Meghívott"</item>
+    <item msgid="5438273405428201793">"Sikertelen"</item>
+    <item msgid="4646663015449312554">"Rendelkezésre áll"</item>
+    <item msgid="3230556734162006146">"Tartományon kívül"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 perc"</item>
+    <item msgid="2759776603549270587">"5 perc"</item>
+    <item msgid="167772676068860015">"1 óra"</item>
+    <item msgid="5985477119043628504">"Soha ne legyen időtúllépés"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Alapértelmezett rendszerbeállítás használata: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Gyenge"</item>
+    <item msgid="7882129634982603782">"Gyenge"</item>
+    <item msgid="6457357501905996224">"Közepes"</item>
+    <item msgid="405271628162918841">"Jó"</item>
+    <item msgid="999948812884919584">"Kiváló"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Legutóbbi 30 nap"</item>
+    <item msgid="3211287705232736964">"Ciklus beállítása…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Használat ideje"</item>
+    <item msgid="2784401352592276015">"Utoljára használva"</item>
+    <item msgid="249854287216326349">"Alkalmazás neve"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Nincs"</item>
+    <item msgid="8655686691660180616">"MSCHAPv2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nincs"</item>
+    <item msgid="212906109313512425">"MSCHAPv2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Nincs"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPv2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statikus"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Nincs"</item>
+    <item msgid="1464741437353223198">"Útmutató"</item>
+    <item msgid="5793600062487886090">"Proxy auto. beállítása"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Nincs"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP vagy CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nem meghatározott"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nincs"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Belső tárhely"</item>
+    <item msgid="3186681694079967527">"Eltávolítható SD-kártya"</item>
+    <item msgid="6902033473986647035">"Döntse el a rendszer"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Tartózkodási hely"</item>
+    <item msgid="6842381562497597649">"Személyes"</item>
+    <item msgid="3966700236695683444">"Üzenetváltás"</item>
+    <item msgid="8563996233342430477">"Média"</item>
+    <item msgid="5323851085993963783">"Eszköz"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"hozzávetőleges helymeghatározás"</item>
+    <item msgid="1830619568689922920">"pontos helymeghatározás"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"rezgés"</item>
+    <item msgid="8632513128515114092">"névjegyek olvasása"</item>
+    <item msgid="3741042113569620272">"névjegyek módosítása"</item>
+    <item msgid="4204420969709009931">"hívásnapló olvasása"</item>
+    <item msgid="2260380357119423209">"hívásnapló módosítása"</item>
+    <item msgid="6550710385014530934">"naptár olvasása"</item>
+    <item msgid="3575906174264853951">"naptár módosítása"</item>
+    <item msgid="4319843242568057174">"Wi-Fi hálózat keresése"</item>
+    <item msgid="2981791890467303819">"értesítés"</item>
+    <item msgid="6617825156152476692">"hálózatkeresés"</item>
+    <item msgid="8865260890611559753">"telefonálás"</item>
+    <item msgid="3254999273961542982">"SMS olvasása"</item>
+    <item msgid="7711446453028825171">"SMS írása"</item>
+    <item msgid="6123238544099198034">"SMS fogadása"</item>
+    <item msgid="838342167431596036">"sürgősségi SMS fogadása"</item>
+    <item msgid="8554432731560956686">"MMS fogadása"</item>
+    <item msgid="7464863464299515059">"WAP push fogadása"</item>
+    <item msgid="310463075729606765">"SMS küldése"</item>
+    <item msgid="7338021933527689514">"ICC SMS olvasása"</item>
+    <item msgid="6130369335466613036">"ICC SMS írása"</item>
+    <item msgid="6536865581421670942">"beállítások módosítása"</item>
+    <item msgid="4547203129183558973">"megjelenítés felül"</item>
+    <item msgid="9080347512916542840">"Hozzáférési értesítések"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"hanganyag rögzítése"</item>
+    <item msgid="9182794235292595296">"hanganyag lejátszása"</item>
+    <item msgid="8760743229597702019">"vágólap olvasása"</item>
+    <item msgid="2266923698240538544">"vágólap módosítása"</item>
+    <item msgid="1801619438618539275">"médiagombok"</item>
+    <item msgid="31588119965784465">"audiofókusz"</item>
+    <item msgid="7565226799008076833">"hangerő-szabályozó"</item>
+    <item msgid="5420704980305018295">"beszéd hangereje"</item>
+    <item msgid="5797363115508970204">"csengés hangereje"</item>
+    <item msgid="8233154098550715999">"média hangereje"</item>
+    <item msgid="5196715605078153950">"ébresztés hangereje"</item>
+    <item msgid="394030698764284577">"értesítés hangereje"</item>
+    <item msgid="8952898972491680178">"bluetooth hangereje"</item>
+    <item msgid="8506227454543690851">"ébren tartás"</item>
+    <item msgid="1108160036049727420">"hely figyelése"</item>
+    <item msgid="1496205959751719491">"magas energiaszintű helyek figyelése"</item>
+    <item msgid="3776296279910987380">"használati statisztikák lekérése"</item>
+    <item msgid="8827100324471975602">"mikrofon némítása és a némítás feloldása"</item>
+    <item msgid="6880736730520126864">"üzenet megjelenítése"</item>
+    <item msgid="4933375960222609935">"médiatartalom kivetítése"</item>
+    <item msgid="8357907018938895462">"VPN aktiválása"</item>
+    <item msgid="8143812849911310973">"háttérkép írása"</item>
+    <item msgid="6266277260961066535">"segédlet a szerkezethez"</item>
+    <item msgid="7715498149883482300">"segédlet a képernyőképhez"</item>
+    <item msgid="4046679376726313293">"telefonállapot olvasása"</item>
+    <item msgid="6329507266039719587">"hangposta hozzáadása"</item>
+    <item msgid="7692440726415391408">"SIP használata"</item>
+    <item msgid="8572453398128326267">"kimenő hívás feldolgozása"</item>
+    <item msgid="7775674394089376306">"ujjlenyomat"</item>
+    <item msgid="3182815133441738779">"testérzékelők"</item>
+    <item msgid="2793100005496829513">"cellán belüli üzenetszórás olvasása"</item>
+    <item msgid="2633626056029384366">"helyimitálás"</item>
+    <item msgid="8356842191824684631">"tárhely olvasása"</item>
+    <item msgid="5671906070163291500">"tárhely írása"</item>
+    <item msgid="2791955098549340418">"képernyő bekapcsolása"</item>
+    <item msgid="5599435119609178367">"fiókok beszerzése"</item>
+    <item msgid="1165623660533024666">"futtatás a háttérben"</item>
+    <item msgid="6423861043647911030">"kisegítő lehetőségek – hangerő"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Rövid"</item>
+    <item msgid="4816511817309094890">"Közepes"</item>
+    <item msgid="8305084671259331134">"Hosszú"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Alapértelmezett"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif, sűrű betűköz"</item>
+    <item msgid="6529379119163117545">"Nem proporcionális sans-serif"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Nem proporcionális serif"</item>
+    <item msgid="4448481989108928248">"Általános"</item>
+    <item msgid="4627069151979553527">"Kurzív"</item>
+    <item msgid="6896773537705206194">"Kiskapitális"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Nagyon kicsi"</item>
+    <item msgid="5091603983404027034">"Kicsi"</item>
+    <item msgid="176844712416932112">"Normál"</item>
+    <item msgid="2784236342175159295">"Nagy"</item>
+    <item msgid="218913203203160606">"Nagyon nagy"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Alapértelmezett"</item>
+    <item msgid="6488643537808152001">"Nincs"</item>
+    <item msgid="552332815156010137">"Körvonal"</item>
+    <item msgid="7187891159463789272">"Árnyékolás"</item>
+    <item msgid="8019330250538856521">"Kiemelt"</item>
+    <item msgid="8987385315647049787">"Nyomott"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Alapbeállítások használata"</item>
+    <item msgid="8611890312638868524">"Fekete alapon fehér"</item>
+    <item msgid="5891360837786277638">"Fehér alapon fekete"</item>
+    <item msgid="2798457065945456853">"Fekete alapon sárga"</item>
+    <item msgid="5799049811524553967">"Kék alapon sárga"</item>
+    <item msgid="3673930830658169860">"Egyéni"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN megosztott kulcsokkal"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN-tanúsítványokkal"</item>
+    <item msgid="312397853907741968">"IPSec VPN előre megosztott kulcsokkal és Xauth azonosítás"</item>
+    <item msgid="3319427315593649917">"IPSec VPN-tanúsítványokkal és Xauth azonosítás"</item>
+    <item msgid="8258927774145391041">"IPSec VPN-tanúsítványokkal és hibrid azonosítás"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nincs"</item>
+    <item msgid="1157046369795346308">"Útmutató"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Szétkapcsolva"</item>
+    <item msgid="8754480102834556765">"Inicializálás..."</item>
+    <item msgid="3351334355574270250">"Csatlakozás…"</item>
+    <item msgid="8303882153995748352">"Csatlakozva"</item>
+    <item msgid="9135049670787351881">"Időtúllépés"</item>
+    <item msgid="2124868417182583926">"Sikertelen"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Kérdés"</item>
+    <item msgid="7718817231348607934">"Soha nem engedélyezem"</item>
+    <item msgid="8184570120217958741">"Engedélyezés mindig"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Állandó"</item>
+    <item msgid="167418068739176448">"Leggyakoribb tevékenység"</item>
+    <item msgid="4760813290195199773">"Fontos (előtérben)"</item>
+    <item msgid="2328684826817647595">"Fontos (háttérben)"</item>
+    <item msgid="7746406490652867365">"Biztonsági mentés"</item>
+    <item msgid="5597404364389196754">"Számottevő"</item>
+    <item msgid="1290888779300174556">"Szolgáltatás (fut)"</item>
+    <item msgid="7241098542073939046">"Szolgáltatás (újraindul)"</item>
+    <item msgid="6610439017684111046">"Fogadó"</item>
+    <item msgid="7367606086319921117">"Otthon"</item>
+    <item msgid="3344660712396741826">"Legutóbbi tevékenység"</item>
+    <item msgid="5006559348883303865">"Gyorsítótárazott (tevékenység)"</item>
+    <item msgid="8633480732468137525">"Gyorsítótárazott (tevékenységkliens)"</item>
+    <item msgid="6248998242443333892">"Gyorsítótárazott (üres)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Pávakék"</item>
+    <item msgid="3228505970082457852">"Kék"</item>
+    <item msgid="6590260735734795647">"Indigókék"</item>
+    <item msgid="3521763377357218577">"Lila"</item>
+    <item msgid="5932337981182999919">"Rózsaszín"</item>
+    <item msgid="5642914536624000094">"Piros"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Több mint 30 napos"</item>
+    <item msgid="8699273238891265610">"Több mint 60 napos"</item>
+    <item msgid="8346279419423837266">"Több mint 90 napos"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Automatikus észlelés"</item>
+    <item msgid="773943026484148895">"Kezelje forgalomkorlátosként"</item>
+    <item msgid="1008268820118852416">"Kezelje nem forgalomkorlátosként"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Véletlenszerű MAC-cím használata (alapértelmezett)"</item>
+    <item msgid="214234417308375326">"Az eszköz MAC-címének használata"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nem"</item>
+    <item msgid="1930581185557754880">"Igen"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Sötét"</item>
+    <item msgid="5079453644557603349">"Világos"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Ki"</item>
+    <item msgid="4072198137051566919">"Hibakeresés"</item>
+    <item msgid="2473005316958868509">"Részletes"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Csak otthoni"</item>
+    <item msgid="1161026694891024702">"Automatikus"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA a preferált"</item>
+    <item msgid="7581481130337402578">"Csak GSM"</item>
+    <item msgid="8579197487913425819">"Csak WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA – automatikus"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo – automatikus"</item>
+    <item msgid="4219607161971472471">"CDMA EvDo nélkül"</item>
+    <item msgid="7278975240951052041">"Csak EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globális"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Csak TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globális"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hu/strings.xml b/tests/CarDeveloperOptions/res/values-hu/strings.xml
index cd36ce2..2e2b8de 100644
--- a/tests/CarDeveloperOptions/res/values-hu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hu/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Védje meg táblagépét képernyőzár beállításával, hogy senki más ne használhassa, amennyiben elveszne, illetve ellopnák. Az arcfelismerés beállításához rendelkeznie kell képernyőzár-beállítással is. Koppintson a Mégse lehetőségre, majd állítson be PIN-kódot, vagy válasszon ki egy másik képernyőzár-beállítást."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Védje meg eszközét képernyőzár beállításával, hogy senki más ne használhassa, amennyiben elveszne, illetve ellopnák. Az arcfelismerés beállításához rendelkeznie kell képernyőzár-beállítással is. Koppintson a Mégse lehetőségre, majd állítson be PIN-kódot, vagy válasszon ki egy másik képernyőzár-beállítást."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Védje meg telefonját képernyőzár beállításával, hogy senki más ne használhassa, amennyiben elveszne, illetve ellopnák. Az arcfelismerés beállításához rendelkeznie kell képernyőzár-beállítással is. Koppintson a Mégse lehetőségre, majd állítson be PIN-kódot, vagy válasszon ki egy másik képernyőzár-beállítást."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN-beállítás átugrása?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Átugorja a jelszó beállítását?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Átugorja a minta beállítását?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Képernyőzár beállítása"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Csak Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1194,7 +1196,7 @@
     <string name="auto_brightness_very_high_title" msgid="6649896560889239565">"Nagyon magas"</string>
     <string name="auto_brightness_subtitle" msgid="8516999348793100665">"Előnyben részesített fényerőszint"</string>
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"Ne módosuljon a rendelkezésre álló fény alapján"</string>
-    <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"Megnövekedett akkumulátorhasználat"</string>
+    <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"Növeli az akkumulátorhasználatot"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"A fényerőt a rendelkezésre álló fényhez optimalizálja. Átmenetileg továbbra is módosíthatja a fényerőt, ha be van kapcsolva a funkció."</string>
     <string name="auto_brightness_description" msgid="8209140379089535411">"A képernyő fényerőssége automatikusan alkalmazkodik a környezethez és az adott tevékenységhez. A csúszka manuális mozgatásával segít az alkalmazkodó fényerő funkciónak az Ön személyes preferenciáinak megtanulásában."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"Kijelző fehéregyensúlya"</string>
@@ -1257,7 +1259,7 @@
     <string name="doze_title" msgid="235269029233857546">"Új értesítések"</string>
     <string name="doze_summary" msgid="6762274282827831706">"Képernyő felébresztése értesítés érkezésekor"</string>
     <string name="doze_always_on_title" msgid="8555184965031789941">"Mindig bekapcsolva"</string>
-    <string name="doze_always_on_summary" msgid="7654436900436328950">"Az idő, az értesítési ikonok és egyéb információk megjelenítése. Megnövekedett akkumulátorhasználat."</string>
+    <string name="doze_always_on_summary" msgid="7654436900436328950">"Az idő, az értesítési ikonok és egyéb információk megjelenítése. Növeli az akkumulátorhasználatot."</string>
     <string name="title_font_size" msgid="5021464556860010851">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"Szöveg nagyítása és kicsinyítése"</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"SIM-kártya lezárási beállításai"</string>
@@ -2043,7 +2045,7 @@
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"Elsődlegesen vakok és gyengénlátók számára készült képernyőolvasó"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Koppintson a képernyőn látható elemekre, ha szeretné őket felolvasva hallani"</string>
-    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Képaláírások"</string>
+    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Feliratok"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Nagyítás"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Nagyítás három koppintással"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Nagyítás gombbal"</string>
@@ -2907,7 +2909,7 @@
     <string name="application_restrictions" msgid="6871981013736536763">"Alkalmazások és tartalmak engedélyezése"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Alkalmazások korlátozásokkal"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"Alkalmazásbeállítás megnyitása"</string>
-    <string name="nfc_payment_settings_title" msgid="5070077706735415291">"Érintéssel való fizetés"</string>
+    <string name="nfc_payment_settings_title" msgid="5070077706735415291">"Érintéses fizetés"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"Hogyan működik?"</string>
     <string name="nfc_payment_no_apps" msgid="8844440783395420860">"Fizessen telefonjával a boltokban"</string>
     <string name="nfc_payment_default" msgid="7869273092463612271">"Fizetéskor alapértelmezett"</string>
@@ -4124,7 +4126,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Az idő, az értesítések és egyéb információk megtekintéséhez vegye kezébe telefonját."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Az idő, az értesítések és egyéb információk megtekintéséhez vegye a kezébe táblagépét."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Az idő, az értesítések és egyéb információk megtekintéséhez vegye kezébe eszközét."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Koppintson a telefon megtekintéséhez"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Koppintás a telefon megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Koppintson a táblagép megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Koppintson az eszköz megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson a képernyőre."</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Használata lelassítaná a telefont."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Teljes GNSS-mérés indítása"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Az összes GNSS-műhold és -frekvencia nyomon követése aktívciklus-szabályozás nélkül"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Hibaelhárítási információk felhasználóváltáskor"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Részletes adatok megjelenítése felhasználóváltáskor"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Háttér-tevékenységek megkezdésének engedélyezése"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Minden háttér-tevékenység megkezdését engedélyezi"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Összeomlási párbeszédablak megjelenítése minden alkalommal"</string>
diff --git a/tests/CarDeveloperOptions/res/values-hy-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-hy-nokeys/strings.xml
new file mode 100644
index 0000000..339d877
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hy-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Կառավարել ծրագրերը"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hy/arrays.xml b/tests/CarDeveloperOptions/res/values-hy/arrays.xml
new file mode 100644
index 0000000..74d88a3
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-hy/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Ամերիկա"</item>
+    <item msgid="4791956477275129121">"Եվրոպա"</item>
+    <item msgid="3812126832016254559">"Աֆրիկա"</item>
+    <item msgid="2765816300353408280">"Ասիա"</item>
+    <item msgid="6683489385344409742">"Ավստրալիա"</item>
+    <item msgid="5194868215515664953">"Խաղաղօվկիանոսյան"</item>
+    <item msgid="7044520255415007865">"Բոլորը"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 վայրկյան"</item>
+    <item msgid="772029947136115322">"30 վայրկյան"</item>
+    <item msgid="8743663928349474087">"1 րոպե"</item>
+    <item msgid="1506508631223164814">"2 րոպե"</item>
+    <item msgid="8664703938127907662">"5 րոպե"</item>
+    <item msgid="5827960506924849753">"10 րոպե"</item>
+    <item msgid="6677424950124253938">"30 րոպե"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Երբեք"</item>
+    <item msgid="2517785806387977252">"15 վայրկյան"</item>
+    <item msgid="6347954399441173672">"30 վայրկյան"</item>
+    <item msgid="4858305253279921789">"1 րոպե"</item>
+    <item msgid="8109273437140044073">"2 րոպե"</item>
+    <item msgid="2788593551142462622">"5 րոպե"</item>
+    <item msgid="8012672183888404961">"10 րոպե"</item>
+    <item msgid="8271452751594598661">"30 րոպե"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Անմիջապես"</item>
+    <item msgid="2038544972632026612">"5 վայրկյան"</item>
+    <item msgid="5558060663472279597">"15 վայրկյան"</item>
+    <item msgid="45341168505452037">"30 վայրկյան"</item>
+    <item msgid="227647485917789272">"1 րոպե"</item>
+    <item msgid="3367011891231217504">"2 րոպե"</item>
+    <item msgid="4376575879222393045">"5 րոպե"</item>
+    <item msgid="811192536981678974">"10 րոպե"</item>
+    <item msgid="7258394417241706272">"30 րոպե"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Փոքր"</item>
+    <item msgid="591935967183159581">"Կանխադրված"</item>
+    <item msgid="1714184661981538355">"Մեծ"</item>
+    <item msgid="6195563047686707484">"Ամենամեծ"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Սկանավորում…"</item>
+    <item msgid="5597394826455877834">"Միանում է..."</item>
+    <item msgid="5848277343965362748">"Նույնականացում…"</item>
+    <item msgid="3391238031431440676">"IP հասցեի ստացում…"</item>
+    <item msgid="5257597310494000224">"Միացած է"</item>
+    <item msgid="8472497592913050396">"Անջատված"</item>
+    <item msgid="1228072488815999109">"Անջատվում է..."</item>
+    <item msgid="7253087004422991731">"Անջատված է"</item>
+    <item msgid="4169850917304751227">"Անհաջող"</item>
+    <item msgid="6266658166690831131">"Արգելափակված է"</item>
+    <item msgid="4517230805854909775">"Ժամանակավորապես խուսափելով թույլ կապից"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Սկանավորում…"</item>
+    <item msgid="8058143476674427024">"Միանում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ին…"</item>
+    <item msgid="7547609081339573756">"Նույնականացում <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ի հետ…"</item>
+    <item msgid="5145158315060185414">"IP հասցեի ստացում <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>
+    <item msgid="3283243151651124831">"Միացված է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ին"</item>
+    <item msgid="6600156231416890902">"Անջատված"</item>
+    <item msgid="4133290864821295785">"Անջատվում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>
+    <item msgid="3980154971187953257">"Անջատված է"</item>
+    <item msgid="2847316776634969068">"Անհաջող"</item>
+    <item msgid="4390990424746035383">"Արգելափակված է"</item>
+    <item msgid="3618248791367063949">"Վատ ցանցից ժամանակավոր խուսափում"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Սեղմման կոճակ"</item>
+    <item msgid="7401896200768713930">"Հավասարազոր սարքի PIN-ը"</item>
+    <item msgid="4526848028011846710">"PIN-ը այս սարքից"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Միացած է"</item>
+    <item msgid="983792611851499732">"Հրավիրված է"</item>
+    <item msgid="5438273405428201793">"Անհաջող"</item>
+    <item msgid="4646663015449312554">"Առկա է"</item>
+    <item msgid="3230556734162006146">"Ընդգրկույթից դուրս"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 րոպե"</item>
+    <item msgid="2759776603549270587">"5 րոպե"</item>
+    <item msgid="167772676068860015">"1 ժամ"</item>
+    <item msgid="5985477119043628504">"Ժամանակի սպառումը բացառել"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Օգտագործել համակարգի կանխադրված կարգավորումը` <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Թույլ"</item>
+    <item msgid="7882129634982603782">"Թույլ"</item>
+    <item msgid="6457357501905996224">"Բավարար"</item>
+    <item msgid="405271628162918841">"Լավ"</item>
+    <item msgid="999948812884919584">"Գերազանց"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Վերջին 30 օրում"</item>
+    <item msgid="3211287705232736964">"Սահմանել օգտագործման ցիկլը..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Օգտագործման ժամանակը"</item>
+    <item msgid="2784401352592276015">"Վերջին օգտագործումը"</item>
+    <item msgid="249854287216326349">"Ծրագրի անունը"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ոչ մեկը"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Չկա"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM քարտ"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ոչ մեկը"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Ստատիկ"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ոչ մեկը"</item>
+    <item msgid="1464741437353223198">"Ձեռքով"</item>
+    <item msgid="5793600062487886090">"Պրոքսիի ինքնակարգավորում"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ոչ մեկը"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP կամ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Տարբերակված չէ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ոչ մեկը"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Սարքի ներքին պահոց"</item>
+    <item msgid="3186681694079967527">"Շարժական SD քարտ"</item>
+    <item msgid="6902033473986647035">"Թույլատրել համակարգը որոշի"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Տեղադրություն"</item>
+    <item msgid="6842381562497597649">"Անձնական"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Մեդիա"</item>
+    <item msgid="5323851085993963783">"Սարք"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"հենակետային տեղանք"</item>
+    <item msgid="1830619568689922920">"ճշգրիտ տեղադրություն"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"թրթռոց"</item>
+    <item msgid="8632513128515114092">"տեսնել կոնտակտների ցանկը"</item>
+    <item msgid="3741042113569620272">"փոփոխել կոնտակտների ցանկը"</item>
+    <item msgid="4204420969709009931">"տեսնել զանգերի մատյանը"</item>
+    <item msgid="2260380357119423209">"փոփոխել զանգերի մատյանը"</item>
+    <item msgid="6550710385014530934">"կարդալ օրացույցը"</item>
+    <item msgid="3575906174264853951">"փոփոխել օրացույցը"</item>
+    <item msgid="4319843242568057174">"wi-fi սկանավորում"</item>
+    <item msgid="2981791890467303819">"ծանուցում"</item>
+    <item msgid="6617825156152476692">"բջջային սկանավորում"</item>
+    <item msgid="8865260890611559753">"Հեռախոսահամար"</item>
+    <item msgid="3254999273961542982">"կարդալ SMS-ը"</item>
+    <item msgid="7711446453028825171">"գրել SMS"</item>
+    <item msgid="6123238544099198034">"ստանալ SMS"</item>
+    <item msgid="838342167431596036">"ստանալ արտակարգ իրավիճակների SMS-ներ"</item>
+    <item msgid="8554432731560956686">"ստանալ MMS"</item>
+    <item msgid="7464863464299515059">"ստանալ WAP սեղմում"</item>
+    <item msgid="310463075729606765">"ուղարկել SMS"</item>
+    <item msgid="7338021933527689514">"կարդալ ICC SMS"</item>
+    <item msgid="6130369335466613036">"գրել ICC SMS"</item>
+    <item msgid="6536865581421670942">"փոփոխել կարգավորումները"</item>
+    <item msgid="4547203129183558973">"պատկերել վերին մասում"</item>
+    <item msgid="9080347512916542840">"մուտք գործել ծանուցումներ"</item>
+    <item msgid="5332718516635907742">"ֆոտոխցիկ"</item>
+    <item msgid="6098422447246167852">"ձայնագրել աուդիո ֆայլ"</item>
+    <item msgid="9182794235292595296">"նվագարկել ձայնանյութը"</item>
+    <item msgid="8760743229597702019">"կարդալ սեղմատախտակը"</item>
+    <item msgid="2266923698240538544">"փոփոխել սեղմատախտակը"</item>
+    <item msgid="1801619438618539275">"մեդիա կոճակներ"</item>
+    <item msgid="31588119965784465">"աուդիո ֆոկուս"</item>
+    <item msgid="7565226799008076833">"ձայնի հիմնական բարձրություն"</item>
+    <item msgid="5420704980305018295">"ձայնի բարձրություն"</item>
+    <item msgid="5797363115508970204">"զանգի բարձրություն"</item>
+    <item msgid="8233154098550715999">"մեդիանյութերի ձայնի բարձրություն"</item>
+    <item msgid="5196715605078153950">"զարթուցիչի ձայնի բարձրություն"</item>
+    <item msgid="394030698764284577">"ծանուցման ձայնի բարձրություն"</item>
+    <item msgid="8952898972491680178">"bluetooth-ի ձայնի բարձրություն"</item>
+    <item msgid="8506227454543690851">"արթուն պահել"</item>
+    <item msgid="1108160036049727420">"վերահսկել տեղադրությունը"</item>
+    <item msgid="1496205959751719491">"մշտադիտարկել էներգատար տեղանքները"</item>
+    <item msgid="3776296279910987380">"ստանալ օգտագործման վիճակագրությունը"</item>
+    <item msgid="8827100324471975602">"խոսափողն անջատել/միացնել"</item>
+    <item msgid="6880736730520126864">"ցույց տալ ծանուցումը"</item>
+    <item msgid="4933375960222609935">"տեսարձակել մեդիան"</item>
+    <item msgid="8357907018938895462">"ակտիվացնել VPN-ը"</item>
+    <item msgid="8143812849911310973">"պաստառների պահում"</item>
+    <item msgid="6266277260961066535">"օժանդակ կառույց"</item>
+    <item msgid="7715498149883482300">"օժանդակ սքրինշոթ"</item>
+    <item msgid="4046679376726313293">"կարդալ հեռախոսի վիճակի տվյալները"</item>
+    <item msgid="6329507266039719587">"ավելացնել ձայնային փոստ"</item>
+    <item msgid="7692440726415391408">"օգտագործել sip-ը"</item>
+    <item msgid="8572453398128326267">"մշակել ելքային զանգը"</item>
+    <item msgid="7775674394089376306">"մատնահետք"</item>
+    <item msgid="3182815133441738779">"մարմնի տվիչներ"</item>
+    <item msgid="2793100005496829513">"կարդալ բջջային հեռարձակումները"</item>
+    <item msgid="2633626056029384366">"կեղծել տեղադրությունը"</item>
+    <item msgid="8356842191824684631">"կարդալ կրիչի բովանդակությունը"</item>
+    <item msgid="5671906070163291500">"փոփոխել կրիչի բովանդակությունը"</item>
+    <item msgid="2791955098549340418">"միացնել էկրանը"</item>
+    <item msgid="5599435119609178367">"ստանալ հաշիվները"</item>
+    <item msgid="1165623660533024666">"աշխատել ֆոնային ռեժիմում"</item>
+    <item msgid="6423861043647911030">"մատչելիության ծավալ"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Կարճ"</item>
+    <item msgid="4816511817309094890">"Միջին"</item>
+    <item msgid="8305084671259331134">"Երկար"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Կանխադրված"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif խտացրած"</item>
+    <item msgid="6529379119163117545">"Sans-serif միալայնք"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif միալայնք"</item>
+    <item msgid="4448481989108928248">"Առօրյա"</item>
+    <item msgid="4627069151979553527">"Ձեռագիր"</item>
+    <item msgid="6896773537705206194">"Փոքր մեծատառեր"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Շատ փոքր"</item>
+    <item msgid="5091603983404027034">"Փոքր"</item>
+    <item msgid="176844712416932112">"Սովորական"</item>
+    <item msgid="2784236342175159295">"Մեծ"</item>
+    <item msgid="218913203203160606">"Շատ մեծ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Կանխադրված"</item>
+    <item msgid="6488643537808152001">"Ոչ մեկը"</item>
+    <item msgid="552332815156010137">"Ուրվագիծ"</item>
+    <item msgid="7187891159463789272">"Ստվերով"</item>
+    <item msgid="8019330250538856521">"Ուռուցիկ"</item>
+    <item msgid="8987385315647049787">"Ճնշված"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Օգտագործել կանխադրվածները"</item>
+    <item msgid="8611890312638868524">"Սպիտակը սևի վրա"</item>
+    <item msgid="5891360837786277638">"Սևը սպիտակի վրա"</item>
+    <item msgid="2798457065945456853">"Դեղինը սևի վրա"</item>
+    <item msgid="5799049811524553967">"Դեղինը կապույտի վրա"</item>
+    <item msgid="3673930830658169860">"Այլ ձայներ"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN նախորոշված ստեղներով"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN վկայագրերով"</item>
+    <item msgid="312397853907741968">"IPSec VPN նախորոշված ստեղներով և Xauth նույնականացմամբ"</item>
+    <item msgid="3319427315593649917">"IPSec VPN վկայականներով և Xauth նույնականացմամբ"</item>
+    <item msgid="8258927774145391041">"IPSec VPN վկայագրերով և խառնածին նույնականացմամբ"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ոչ մեկը"</item>
+    <item msgid="1157046369795346308">"Ձեռքով"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Անջատված է"</item>
+    <item msgid="8754480102834556765">"Նախապատրաստվում է..."</item>
+    <item msgid="3351334355574270250">"Միանում է..."</item>
+    <item msgid="8303882153995748352">"Միացած է"</item>
+    <item msgid="9135049670787351881">"Ժամանակի սպառում"</item>
+    <item msgid="2124868417182583926">"Անհաջող"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Հարցնել"</item>
+    <item msgid="7718817231348607934">"Երբեք չթույլատրել"</item>
+    <item msgid="8184570120217958741">"Միշտ թույլատրել"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Կայուն"</item>
+    <item msgid="167418068739176448">"Առավել հաճախակի կատարվող գործողությունը"</item>
+    <item msgid="4760813290195199773">"Կարևոր (ակտիվ ռեժիմ)"</item>
+    <item msgid="2328684826817647595">"Կարևոր (ֆոնային ռեժիմ)"</item>
+    <item msgid="7746406490652867365">"Պահուստավորում"</item>
+    <item msgid="5597404364389196754">"Խիստ ծանրաբեռնվածություն"</item>
+    <item msgid="1290888779300174556">"Ծառայություն (ակտիվ է)"</item>
+    <item msgid="7241098542073939046">"Ծառայություն (վերագործարկվում է)"</item>
+    <item msgid="6610439017684111046">"Ստացող"</item>
+    <item msgid="7367606086319921117">"Հիմնական"</item>
+    <item msgid="3344660712396741826">"Վերջին գործողությունը"</item>
+    <item msgid="5006559348883303865">"Քեշավորված (գործողությունը)"</item>
+    <item msgid="8633480732468137525">"Քեշավորված (սպասառուի գործողությունը)"</item>
+    <item msgid="6248998242443333892">"Քեշավորված (դատարկ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Փիրուզագույն"</item>
+    <item msgid="3228505970082457852">"Կապույտ"</item>
+    <item msgid="6590260735734795647">"Ինդիգո"</item>
+    <item msgid="3521763377357218577">"Մանուշակագույն"</item>
+    <item msgid="5932337981182999919">"Վարդագույն"</item>
+    <item msgid="5642914536624000094">"Կարմիր"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 օրից հին"</item>
+    <item msgid="8699273238891265610">"60 օրից հին"</item>
+    <item msgid="8346279419423837266">"90 օրից հին"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Ավտոմատ հայտնաբերում"</item>
+    <item msgid="773943026484148895">"Սահմանափակ"</item>
+    <item msgid="1008268820118852416">"Անսահմանափակ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Օգտագործել պատահական MAC հասցե (կանխադրված)"</item>
+    <item msgid="214234417308375326">"Օգտագործել սարքի MAC հասցեն"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ոչ"</item>
+    <item msgid="1930581185557754880">"Այո"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Մուգ"</item>
+    <item msgid="5079453644557603349">"Բաց"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Անջատված է"</item>
+    <item msgid="4072198137051566919">"Վրիպազերծում"</item>
+    <item msgid="2473005316958868509">"Մանրամասն"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Միայն տնային ցանցերը"</item>
+    <item msgid="1161026694891024702">"Ավտոմատ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA (նախընտրելի ռեժիմ)"</item>
+    <item msgid="7581481130337402578">"Միայն GSM"</item>
+    <item msgid="8579197487913425819">"Միայն WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ավտոմատ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ավտոմատ"</item>
+    <item msgid="4219607161971472471">"CDMA առանց EvDo"</item>
+    <item msgid="7278975240951052041">"Միայն EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA+LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Համաշխարհային"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Միայն TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Համաշխարհային"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-hy/strings.xml b/tests/CarDeveloperOptions/res/values-hy/strings.xml
index 97158d9..cb33ff1 100644
--- a/tests/CarDeveloperOptions/res/values-hy/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hy/strings.xml
@@ -56,7 +56,7 @@
     <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"IMS-ի գրանցում՝ <xliff:g id="STATUS">%1$s</xliff:g>\nVoice over LTE՝ <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nVoice over WiFi՝ <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nՏեսազանգ՝ <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT միջերես՝ <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"Շահագործման մեջ է"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"Չի շահագործվում"</string>
-    <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Միայն արտակարգ իրավիճակների զանգեր"</string>
+    <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Միայն շտապ կանչեր"</string>
     <string name="radioInfo_service_off" msgid="1873939869994136791">"Ռադիոն անջատված է"</string>
     <string name="radioInfo_roaming_in" msgid="7059350234710947417">"Ռոումինգ"</string>
     <string name="radioInfo_roaming_not" msgid="7733269160603599835">"Ռոումինգում չէ"</string>
@@ -370,7 +370,7 @@
     <string name="Accounts_settings_title" msgid="7901374987121953746">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="2707201457572301030">"Տեղադրություն"</string>
     <string name="location_settings_master_switch_title" msgid="3108016866082816733">"Օգտագործել տեղորոշումը"</string>
-    <string name="location_settings_summary_location_off" msgid="5563530256978372978">"Անջատած է"</string>
+    <string name="location_settings_summary_location_off" msgid="5563530256978372978">"Անջատված է"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="7893342914540884818">
       <item quantity="one">Միացված է: Տեղադրության տվյալները հասանելի են <xliff:g id="COUNT_1">%1$d</xliff:g> հավելվածի:</item>
       <item quantity="other">Միացված է: Տեղադրության տվյալները հասանելի են <xliff:g id="COUNT_1">%1$d</xliff:g> հավելվածի:</item>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք պլանշետը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք սարքը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե կորցնեք հեռախոսը կամ այն գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքի ճանաչումը կարգավորելու համար։ Հպեք «Չեղարկել» կոճակին, ապա ավելացրեք PIN կոդ կամ ընտրեք էկրանի կողպման այլ տարբերակ։"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Բաց թողնե՞լ PIN-ի կարգավորումը"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Չավելացնե՞լ գաղտնաբառ"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Բաց թողնե՞լ նախշի կարգավորումը"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Էկրանի կողպում"</string>
@@ -528,7 +527,7 @@
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="8049188590821796173">"Սպասեք մինչև ձեր հեռախոսը գաղտնագրվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="9168213181845231795">"Գրասալիկն ապակողպելու համար անջատեք, ապա նորից միացրեք այն:"</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1182690469082263666">"Հեռախոսն ապակողպելու համար անջատեք, ապա նորից միացրեք այն:"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"Զգուշացում. Եթե ևս <xliff:g id="COUNT">^1</xliff:g> անգամ չկարողանաք ճիշտ ապակողպել, ձեր սարքի ողջ տվյալները կմաքրվեն:"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"Զգուշացում. Եթե ևս <xliff:g id="COUNT">^1</xliff:g> անգամ չկարողանաք ճիշտ ապակողպել, ձեր սարքի ողջ տվյալները կջնջվեն:"</string>
     <string name="crypt_keeper_enter_password" msgid="726933635335219421">"Մուտքագրեք ձեր գաղտնաբառը"</string>
     <string name="crypt_keeper_failed_title" msgid="1906382607060855782">"Գաղտնագրումը անհաջող էր"</string>
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Գաղտնագրումը դադարեցվեց, և այն հնարավոր չէ ավարտել: Արդյունքում ձեր պլանշետի տվյալները այլևս մատչելի չեն: \n\n Շարունակելու համար օգտագործել ձեր պլանշետը` դուք պետք է կատարեք գործարանային վերականգնում: Ձեր պլանշետի վերականգնումից և կարգավորումից հետո դուք հնարավորություն կունենանք վերականգնել ցանկացած տվյալ, որը պահուստավորվել էր ձեր Google հաշվում:"</string>
@@ -561,7 +560,7 @@
     <string name="unlock_set_unlock_launch_picker_title" msgid="2731152716948003853">"Էկրանի կողպում"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5596186270725220642">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Անմիջապես քնից հետո"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="3861167251234952373">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> քնից հետո"</string>
-    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7976345264630422921">"Աշխատանքային պրոֆիլի փական"</string>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7976345264630422921">"Աշխ․ պրոֆիլի կողպում"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="32310692507029407">"Փոխել էկրանի կողպումը"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2072792784866320522">"Փոխել կամ կասեցնել նախշը, PIN-ը կամ գաղտնաբառի անվտանգությունը"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="9070847611379078795">"Ընտրել էկրանի կողպման եղանակը"</string>
@@ -828,7 +827,7 @@
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"Թույլատրել NFC-ի միջոցով վճարումներն ու տվյալների փոխանցումը միայն, երբ էկրանն ապակողպված է"</string>
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="8068287225180474199">"Տվյալների փոխանակում NFC-ով"</string>
-    <string name="android_beam_off_summary" msgid="7365818039159364600">"Անջատած է"</string>
+    <string name="android_beam_off_summary" msgid="7365818039159364600">"Անջատված է"</string>
     <string name="nfc_disabled_summary" msgid="2181777971122724361">"Անհասանելի է, քանի որ NFC-ն անջատված է"</string>
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
     <string name="android_beam_explained" msgid="4501176353247859329">"Այս գործառույթը թույլ է տալիս մեկ սարքից մյուսին փոխանցել տարբեր տեսակի բովանդակություն (այդ թվում կոնտակտներ, վեբ էջեր և տեսանյութեր)՝ սարքերը միմյանց մոտ պահելով:\n\nՊարզապես մոտեցրեք սարքերը միմյանց (հիմնականում հետևի մասերով իրար) և հպեք ձեր էկրանին: Հավելվածը կորոշի, թե ինչ տվյալներ փոխանցել։"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Բջջային"</item>
+    <item msgid="6007360612667098926">"Միայն Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1168,7 +1170,7 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"Բնական"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"Պայծառ"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"Հագեցած"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Հարմարողական"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Հարմարվող"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"Օգտագործեք միայն ճշգրիտ վերարտադրվող գույներ"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"Կարգավորեք գույների պայծառությունն ու ճշգրտությունը"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"Ավտոմատ փոխել դիրքավորումը պլանշետը պտտելիս"</string>
@@ -1178,7 +1180,7 @@
     <string name="brightness" msgid="7309120144111305275">"Պայծառության մակարդակ"</string>
     <string name="brightness_title" msgid="5660190946911149690">"Պայծառություն"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"Կարգաբերել էկրանի պայծառությունը"</string>
-    <string name="auto_brightness_title" msgid="908511534369820426">"Հարմարողական պայծառություն"</string>
+    <string name="auto_brightness_title" msgid="908511534369820426">"Հարմարվող պայծառություն"</string>
     <string name="auto_brightness_summary_on" msgid="121488862610275737">"Միացված է"</string>
     <string name="auto_brightness_summary_off" msgid="8569141123211510256">"Անջատված է"</string>
     <string name="auto_brightness_summary_very_low" msgid="7625647285740629347">"Նախընտրելի է շատ ցածր պայծառությունը"</string>
@@ -1196,12 +1198,12 @@
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"Չկարգավորել առկա լույսի համար"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"Մարտկոցի ավելի երկար օգտագործում"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"Լույսի պայծառության մակարդակի օպտիմալացում: Նույնիսկ երբ այս գործառույթը միացված է, դուք կարող եք ժամանակավորապես կարգավորել պայծառությունը:"</string>
-    <string name="auto_brightness_description" msgid="8209140379089535411">"Էկրանի պայծառությունն ավտոմատ կկարգավորվի՝ կախված միջավայրի պայմաններից և ձեր գործողություններից։ Դուք կարող եք տեղաշարժել սահիչը՝ թույլ տալով հարմարողական պայծառությանը հիշել ձեր կարգավորումները։"</string>
+    <string name="auto_brightness_description" msgid="8209140379089535411">"Էկրանի պայծառությունն ավտոմատ կկարգավորվի՝ կախված միջավայրի պայմաններից և ձեր գործողություններից։ Դուք կարող եք տեղաշարժել սահիչը՝ թույլ տալով հարմարվող պայծառությանը հիշել ձեր կարգավորումները։"</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"Էկրանի սպիտակի բալանս"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Ադապտիվ քնած ռեժիմ"</string>
-    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Միացված է – Երբ դուք նայում եք էկրանին, այն չի անջատվի։"</string>
+    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Միացված է – Եթե նայում եք էկրանին, այն չի անջատվի։"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Անջատված է"</string>
-    <string name="adaptive_sleep_description" msgid="812673735459170009">"Երբ դուք նայում եք էկրանին, այն չի անջատվի։"</string>
+    <string name="adaptive_sleep_description" msgid="812673735459170009">"Եթե նայում եք էկրանին, այն չի անջատվի։"</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Ադապտիվ քնած ռեժիմում սարքն օգտագործում է առջևի տեսախցիկը, որպեսզի հետևի՝ արդյոք ինչ-որ մեկը նայում է էկրանին։ Այս գործառույթն աշխատում է միայն ձեր սարքում, իսկ պատկերները չեն պահվում և չեն ուղարկվում Google-ին։"</string>
     <string name="night_display_title" msgid="1305002424893349814">"Գիշերային ռեժիմ"</string>
     <string name="night_display_text" msgid="5330502493684652527">"Գիշերային ռեժիմը դեղնավուն երանգ է հաղորդում էկրանին: Դա թույլ է տալիս հանել աչքերի լարվածությունը և օգնում է ավելի արագ քնել։"</string>
@@ -1213,7 +1215,7 @@
     <string name="night_display_end_time_title" msgid="2760793157124245911">"Ավարտ"</string>
     <string name="night_display_status_title" msgid="1727020934735770319">"Կարգավիճակ"</string>
     <string name="night_display_temperature_title" msgid="8375126629902616296">"Ինտենսիվություն"</string>
-    <string name="night_display_summary_off" msgid="8850539785332228069">"Անջատած է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off" msgid="8850539785332228069">"Անջատված է / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"Ավտոմատ չի միանա"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"Ավտոմատ կմիանա <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"Ավտոմատ կմիանա մայրամուտին"</string>
@@ -1303,7 +1305,7 @@
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"Համակարգի թարմացումներ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
     <string name="firmware_version" msgid="547095584029938749">"Android-ի տարբերակը"</string>
-    <string name="security_patch" msgid="483709031051932208">"Android-ի խոցելիության շտկման մակարդակը"</string>
+    <string name="security_patch" msgid="483709031051932208">"Անվտանգության համակարգի վերջին թարմացումը"</string>
     <string name="model_info" msgid="1729765474260797594">"Մոդելը"</string>
     <string name="model_summary" msgid="8781425868254352168">"Մոդել՝ %1$s"</string>
     <string name="hardware_info" msgid="174270144950621815">"Մոդելը և սարքակազմը"</string>
@@ -1383,7 +1385,7 @@
     <string name="sd_format" product="default" msgid="1346245995138883960">"Ջնջել SD քարտը"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"Ջնջել USB կրիչի բոլոր տվյալները, ինչպիսիք են երաժշտությունը և լուսանկարները"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"SD քարտից ջնջում է ողջ տեղեկատվությունը, ինչպիսիք են երաժշտությունն ու լուսանկարները"</string>
-    <string name="memory_clear_cache_title" msgid="4306793268129306684">"Մաքրե՞լ քեշավորված տվյալները:"</string>
+    <string name="memory_clear_cache_title" msgid="4306793268129306684">"Ջնջե՞լ քեշավորված տվյալները:"</string>
     <string name="memory_clear_cache_message" msgid="6723120398411410031">"Սա կմաքրի բոլոր ծրագրերի քեշավորված տվյալները:"</string>
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP կամ PTP գործառույթը ակտիվ է"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"Անջատե՞լ USB կրիչը:"</string>
@@ -1459,7 +1461,7 @@
     <string name="storage_wizard_init_internal_title" msgid="8750856962785644870">"Օգտագործել որպես ներքին հիշողություն"</string>
     <string name="storage_wizard_init_internal_summary" msgid="4510546464921608029">"Հավելվածները, լուսանկարները և այլ բաներ միայն այս սարքի վրա պահեստավորելու համար: Հարկավոր է ձևաչափում, որի արդյունքում այն չի աշխատի այլ սարքերի վրա:"</string>
     <string name="storage_wizard_format_confirm_title" msgid="7785358616068633439">"Ձևաչափել որպես ներքին պահեստ"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"<xliff:g id="NAME_0">^1</xliff:g>-ի անվտանգությունը ապահովելու համար այն պետք է ձևաչափել: \n\nՈրից հետո այս <xliff:g id="NAME_1">^1</xliff:g>-ը կաշխատի միայն այս սարքի վրա: \n\n"<b>"Ձևաչափումից հետո <xliff:g id="NAME_2">^1</xliff:g>-ի վրա պահեստավորված բոլոր տվյալները կջնջվեն:"</b>" Տվյալները չկորցնելու համար չմոռանաք նախ պահուստավորել դրանք:"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4107762933332992624">"<xliff:g id="NAME_0">^1</xliff:g>-ի անվտանգությունը ապահովելու համար այն պետք է ձևաչափել: \n\nԴրանից հետո այս <xliff:g id="NAME_1">^1</xliff:g>-ը կաշխատի միայն այս սարքի վրա: \n\n"<b>"Ձևաչափումից հետո <xliff:g id="NAME_2">^1</xliff:g>-ի վրա պահեստավորված բոլոր տվյալները կջնջվեն:"</b>" Տվյալները չկորցնելու համար չմոռանաք նախ պահուստավորել դրանք:"</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="5866830103788091426">"Ձևաչափել որպես կրիչ"</string>
     <string name="storage_wizard_format_confirm_public_body" msgid="1451308701654703353">"Հարկավոր է ձևաչափել <xliff:g id="NAME_0">^1</xliff:g>-ը: \n\n"<b>"Ձևաչափման արդյունքում <xliff:g id="NAME_1">^1</xliff:g>-ի վրա պահեստավորած բոլոր տվյալները կջնջվեն:"</b>" Եթե չեք ցանկանում կորցնել տվյալները, նախապես պահուստավորեք դրանք:"</string>
     <string name="storage_wizard_format_confirm_next" msgid="236947984802247625">"Ջնջել և ձևաչափել"</string>
@@ -1558,7 +1560,7 @@
     <string name="error_mcc_not3" msgid="1333037488064427164">"MCC դաշտը պետք է 3 նիշ ունենա:"</string>
     <string name="error_mnc_not23" msgid="6738398924368729180">"MNC դաշտը պետք է լինի առնվազն 2 կամ 3 թվանշան:"</string>
     <string name="error_adding_apn_type" msgid="671634520340569678">"Օպերատորը չի թույլատրում ավելացնել %s տեսակի APN-ներ:"</string>
-    <string name="restore_default_apn" msgid="7195266404077471007">"Լռելյայն APN կարգավորումների վերականգնում:"</string>
+    <string name="restore_default_apn" msgid="7195266404077471007">"Կանխադրված APN կարգավորումների վերականգնում:"</string>
     <string name="menu_restore" msgid="3799288817317293115">"Վերականգնել կանխադրվածները"</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"Զրոյացման ընտրանքներ"</string>
@@ -1976,7 +1978,7 @@
     <string name="keyboard_layout_dialog_title" msgid="4762706917037085797">"Ընտրել ստեղնաշարի դասավորությունը"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="771293535107618283">"Կարգավորել ստեղնաշարի դասավորությունը"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="138516114253502182">"Փոխարկելու համար սեղմեք Control-Բացակ"</string>
-    <string name="keyboard_layout_default_label" msgid="8368579311667189793">"Լռելյայն"</string>
+    <string name="keyboard_layout_default_label" msgid="8368579311667189793">"Կանխադրված"</string>
     <string name="keyboard_layout_picker_title" msgid="6958831599253031987">"Ստեղնաշարի դասավորություն"</string>
     <string name="user_dict_settings_title" msgid="1415462066249818756">"Անձնական բառարան"</string>
     <string name="user_dict_settings_for_work_title" msgid="3995828731001225748">"Անձնական բառարան աշխատանքի համար"</string>
@@ -2103,7 +2105,7 @@
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> պահված լսողական ապարատներ</item>
     </plurals>
     <string name="accessibility_summary_state_enabled" msgid="7357731696603247963">"Միացված է"</string>
-    <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"Անջատած է"</string>
+    <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"Անջատված է"</string>
     <string name="accessibility_summary_state_stopped" msgid="3170264683616172746">"Չի աշխատում: Տեղեկությունների համար հպեք:"</string>
     <string name="accessibility_description_state_stopped" msgid="7666178628053039493">"Այս ծառայությունը նորմալ չի աշխատում:"</string>
     <string name="enable_quick_setting" msgid="1580451877998661255">"Ցույց տալ Արագ կարգավորումներում"</string>
@@ -2157,7 +2159,7 @@
     <string name="captioning_typeface" msgid="7893208796949341767">"Տառատեսակի ընտանիքը"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Ենթագրերն այսպիսին կլինեն"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
-    <string name="locale_default" msgid="910074908458214054">"Լռելյայն"</string>
+    <string name="locale_default" msgid="910074908458214054">"Կանխադրված"</string>
     <string name="color_title" msgid="132875486061816584">"Գույն"</string>
     <string name="color_unspecified" msgid="2081242275041140693">"Կանխադրված"</string>
     <string name="color_none" msgid="6073562573637028315">"Ոչինչ"</string>
@@ -2329,7 +2331,7 @@
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"Օգտագործել մարտկոցի կառավարիչը"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Հայտնաբերել հավելվածները, որոնք արագ սպառում են մարտկոցի լիցքը"</string>
     <string name="battery_manager_on" msgid="5626982529932239656">"Միացված է – Մարտկոցի լիցքն արագ սպառող հավելվածների հայտնաբերում"</string>
-    <string name="battery_manager_off" msgid="9114027524232450371">"Անջատած է"</string>
+    <string name="battery_manager_off" msgid="9114027524232450371">"Անջատված է"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
       <item quantity="one">Սահմանափակված է %1$d հավելված</item>
       <item quantity="other">Սահմանափակված է %1$d հավելված</item>
@@ -2459,7 +2461,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"Երբեք"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"մատկոցի <xliff:g id="PERCENT">%1$s</xliff:g> լիցքի դեպքում"</string>
     <string name="battery_percentage" msgid="7782252476471033843">"Մարտկոցի լիցքը"</string>
-    <string name="battery_percentage_description" msgid="9219875229166700610">"Ցուցադրել մարտկոցի լիցքի տոկոսը կարգավիճակի գոտում"</string>
+    <string name="battery_percentage_description" msgid="9219875229166700610">"Մարտկոցի տոկոսը ցուցադրել կարգավիճակի գոտում"</string>
     <string name="process_stats_summary_title" msgid="9189588417488537954">"Գործընթացի վիճակագրություն"</string>
     <string name="process_stats_summary" msgid="8077998499161221885">"Ընթացիկ գործընթացների տեխնիկական վիճակագրություն"</string>
     <string name="app_memory_use" msgid="5126237308545653706">"Օգտագործվող հիշողություն"</string>
@@ -2621,9 +2623,9 @@
     <string name="header_account_settings" msgid="8586173964125512219">"Հաշվի կարգավորումները"</string>
     <string name="remove_account_label" msgid="5885425720323823387">"Հեռացնել հաշիվը"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Ավելացնել հաշիվ"</string>
-    <string name="really_remove_account_title" msgid="4166512362915154319">"Հեռացնե՞լ հաշիվը:"</string>
+    <string name="really_remove_account_title" msgid="4166512362915154319">"Հեռացնե՞լ հաշիվը"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Այս հաշիվը հեռացնելիս պլանշետից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալները:"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Այս հաշվի հեռացումից հեռախոսից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալները:"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Հաշիվը հեռացնելու դեպքում հեռախոսից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալներ։"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Այս հաշիվը հեռացնելու դեպքում սարքից կջնջվեն նաև հաշվի բոլոր հաղորդագրությունները, կոնտակտներն ու մյուս տվյալները:"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Ձեր ադմինիստրատորը չի թույլատրում այս փոփոխությունը"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Հնարավոր չէ ձեռքով համաժամացնել"</string>
@@ -3234,7 +3236,7 @@
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Միայն կարևորները"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>։ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"Միացված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Անջատած է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Անջատված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="2800265178411749309">"Անջատված է"</string>
     <string name="zen_mode_sound_summary_on" msgid="6964666541479146310">"Միացված է"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7642321938427056823">"Հարցնել ամեն անգամ (եթե ավտոմատ չմիանա)"</string>
@@ -3382,7 +3384,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"նկարը նկարի մեջ, նկար, ննմ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Թույլատրել «Նկար նկարի մեջ» ռեժիմը"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Թույլատրել հավելվածին ստեղծել նկար նկարի մեջ պատուհան, երբ հավելվածը բաց է կամ այն օգտագործելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Թույլատրել հավելվածին ստեղծել նկար նկարի մեջ պատուհան, երբ հավելվածը բաց է կամ այն օգտագործելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վրայից:"</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"«Չանհանգստացնել» գործառույթի հասանելիությունը"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"Թույլատրել «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
@@ -3400,8 +3402,8 @@
     <string name="app_settings_link" msgid="8465287765715790984">"Հավելվածի լրացուցիչ կարգավորումները"</string>
     <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"Միացված է բոլոր հավելվածների համար"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
-      <item quantity="one">Անջատած է <xliff:g id="COUNT_1">%d</xliff:g> հավելվածի համար</item>
-      <item quantity="other">Անջատած է <xliff:g id="COUNT_1">%d</xliff:g> հավելվածի համար</item>
+      <item quantity="one">Անջատված է <xliff:g id="COUNT_1">%d</xliff:g> հավելվածի համար</item>
+      <item quantity="other">Անջատված է <xliff:g id="COUNT_1">%d</xliff:g> հավելվածի համար</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="7741359084299446208">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
@@ -3799,7 +3801,7 @@
     <string name="permit_draw_overlay" msgid="9039092257052422344">"Ցուցադրել մյուս հավելվածների վրայից"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Թույլ տալ այս հավելվածի ցուցադրումը ձեր օգտագործած այլ հավելվածների վրայից: Դա կարող է խանգարել այդ հավելվածների ձեր կողմից օգտագործմանը կամ փոխել դրանք ցուցադրման կամ աշխատանքի եղանակը:"</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr վիրտուալ իրականություն ունկնդրիչ ստերեո օգնության ծառայություն"</string>
-    <string name="keywords_system_alert_window" msgid="3936658600272194599">"համակարգի զգուշացում պատուհան երկխոսություն ցուցադրել այլ հավելվածների վերևում"</string>
+    <string name="keywords_system_alert_window" msgid="3936658600272194599">"համակարգի զգուշացում պատուհան երկխոսություն ցուցադրել այլ հավելվածների վրայից"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Ցուցադրում այլ հավելվածների վրայից"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"<xliff:g id="COUNT_1">%2$d</xliff:g>-ից <xliff:g id="COUNT_0">%1$d</xliff:g> հավելվածներ կարող են ցուցադրվել այլ հավելվածների վրա"</string>
     <string name="filter_overlay_apps" msgid="6336897660213304743">"Թույլտվություն ունեցող հավելվածներ"</string>
@@ -3996,7 +3998,7 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="1916547587832484196">"Ապակողպում այլ մատով"</string>
     <string name="battery_saver_on_summary" msgid="6841062406467435672">"Միացված է"</string>
     <string name="battery_saver_off_scheduled_summary" msgid="3740414764069188669">"Միանում է լիցքի <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>-ի դեպքում"</string>
-    <string name="battery_saver_off_summary" msgid="8736555723004299721">"Անջատած է"</string>
+    <string name="battery_saver_off_summary" msgid="8736555723004299721">"Անջատված է"</string>
     <string name="battery_saver_button_turn_on" msgid="3748696527267573793">"Միացնել հիմա"</string>
     <string name="battery_saver_button_turn_off" msgid="2912950982503267828">"Անջատել հիմա"</string>
     <string name="not_battery_optimizing" msgid="2616044774307734160">"Մարտկոցի օպտիմալացումը չի օգտագործվում"</string>
@@ -4068,7 +4070,7 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="596205630653123250">"Կապակցված է բազմակի շարժական սարքերի"</string>
     <string name="demo_mode" msgid="3831081808592541104">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
     <string name="dark_ui_mode" msgid="703844190192599217">"Թեմա"</string>
-    <string name="dark_ui_mode_title" msgid="8774932716427742413">"Ընտրել թեման"</string>
+    <string name="dark_ui_mode_title" msgid="8774932716427742413">"Ընտրել թեմա"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Այս կարգավորումը կիրառվում է նաև հավելվածների համար"</string>
     <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Աջակցվող հավելվածները ևս կանցնեն մուգ թեմային"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Մշակողի արագ կարգավորման սալիկներ"</string>
@@ -4236,7 +4238,7 @@
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
     <string name="storage_percent_full" msgid="6924662861545958442">"զբաղված է"</string>
-    <string name="clear_instant_app_data" msgid="3673669086522890405">"Մաքրել հավելվածի տվյալները"</string>
+    <string name="clear_instant_app_data" msgid="3673669086522890405">"Հեռացնել սարքից"</string>
     <string name="clear_instant_app_confirmation" msgid="1778553115373698061">"Հեռացնե՞լ այս ակնթարթային հավելվածը։"</string>
     <string name="launch_instant_app" msgid="5251693061228352333">"Բացել"</string>
     <string name="game_storage_settings" msgid="6856911551799175914">"Խաղեր"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Հեռախոսի աշխատանքը կդանդաղի"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GNSS-ի չափումների ամբողջական բեռնում"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Հետագծել GNSS-ի բոլոր սխեմաներն ու հաճախականությունները՝ առանց աշխատաշրջանի"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Լրացուցիչ տեղեկություններ օգտատիրոջ հերթապահության մասին"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Ցույց տալ մանրամասն տեղեկություններ օգտատիրոջ հերթապահության ժամանակ"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Թույլատրել աշխատանքը ֆոնային ռեժիմում"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Թույլ է տալիս աշխատանքը ֆոնային ռեժիմում"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Միշտ ցույց տալ խափանման մասին ծանուցումը"</string>
@@ -4329,7 +4333,7 @@
     <string name="homepage_all_settings" msgid="3201220879559136116">"Բոլոր կարգավորումները"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"Հուշումներ"</string>
     <string name="choose_network_title" msgid="3213314359630522396">"Ընտրել ցանց"</string>
-    <string name="network_disconnected" msgid="8677203031237141594">"Անջատած է"</string>
+    <string name="network_disconnected" msgid="8677203031237141594">"Անջատված է"</string>
     <string name="network_connected" msgid="8197627827976712053">"Միացած է"</string>
     <string name="network_connecting" msgid="8798611458457547110">"Միացում…"</string>
     <string name="network_could_not_connect" msgid="552874922030763713">"Չհաջողվեց միանալ"</string>
@@ -4444,7 +4448,7 @@
     <string name="network_connection_timeout_dialog_ok" msgid="5156496438627748361">"Նորից փորձել"</string>
     <string name="network_connection_errorstate_dialog_message" msgid="1599445930536043943">"Սխալ առաջացավ: Հավելվածը չեղարկել է սարք ընտրելու հայտը:"</string>
     <string name="network_connection_connect_successful" msgid="888912275986965748">"Կապը հաստատվեց"</string>
-    <string name="network_connection_request_dialog_showall" msgid="396928496030183071">"Ցուցադրել բոլորը"</string>
+    <string name="network_connection_request_dialog_showall" msgid="396928496030183071">"Ցույց տալ բոլորը"</string>
     <plurals name="show_bluetooth_devices" formatted="false" msgid="7451733907387872891">
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> միացված սարք</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> միացված սարք</item>
diff --git a/tests/CarDeveloperOptions/res/values-in-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-in-nokeys/strings.xml
new file mode 100644
index 0000000..6f78115
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-in-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Kelola aplikasi"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-in/arrays.xml b/tests/CarDeveloperOptions/res/values-in/arrays.xml
new file mode 100644
index 0000000..1ef5224
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-in/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Eropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pasifik"</item>
+    <item msgid="7044520255415007865">"Semua"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 detik"</item>
+    <item msgid="772029947136115322">"30 detik"</item>
+    <item msgid="8743663928349474087">"1 menit"</item>
+    <item msgid="1506508631223164814">"2 menit"</item>
+    <item msgid="8664703938127907662">"5 menit"</item>
+    <item msgid="5827960506924849753">"10 menit"</item>
+    <item msgid="6677424950124253938">"30 menit"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Tidak pernah"</item>
+    <item msgid="2517785806387977252">"15 detik"</item>
+    <item msgid="6347954399441173672">"30 detik"</item>
+    <item msgid="4858305253279921789">"1 menit"</item>
+    <item msgid="8109273437140044073">"2 menit"</item>
+    <item msgid="2788593551142462622">"5 menit"</item>
+    <item msgid="8012672183888404961">"10 menit"</item>
+    <item msgid="8271452751594598661">"30 menit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Segera"</item>
+    <item msgid="2038544972632026612">"5 detik"</item>
+    <item msgid="5558060663472279597">"15 detik"</item>
+    <item msgid="45341168505452037">"30 detik"</item>
+    <item msgid="227647485917789272">"1 menit"</item>
+    <item msgid="3367011891231217504">"2 menit"</item>
+    <item msgid="4376575879222393045">"5 menit"</item>
+    <item msgid="811192536981678974">"10 menit"</item>
+    <item msgid="7258394417241706272">"30 menit"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Kecil"</item>
+    <item msgid="591935967183159581">"Default"</item>
+    <item msgid="1714184661981538355">"Besar"</item>
+    <item msgid="6195563047686707484">"Terbesar"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Memindai..."</item>
+    <item msgid="5597394826455877834">"Menyambung..."</item>
+    <item msgid="5848277343965362748">"Mengautentikasi..."</item>
+    <item msgid="3391238031431440676">"Mendapatkan alamat IP…"</item>
+    <item msgid="5257597310494000224">"Terhubung"</item>
+    <item msgid="8472497592913050396">"Ditangguhkan"</item>
+    <item msgid="1228072488815999109">"Memutus sambungan..."</item>
+    <item msgid="7253087004422991731">"Sambungan terputus"</item>
+    <item msgid="4169850917304751227">"Gagal"</item>
+    <item msgid="6266658166690831131">"Diblokir"</item>
+    <item msgid="4517230805854909775">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Memindai..."</item>
+    <item msgid="8058143476674427024">"Menyambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Mengautentikasi dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Mendapatkan alamat IP dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Tersambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Ditangguhkan"</item>
+    <item msgid="4133290864821295785">"Diputus dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Sambungan terputus"</item>
+    <item msgid="2847316776634969068">"Gagal"</item>
+    <item msgid="4390990424746035383">"Diblokir"</item>
+    <item msgid="3618248791367063949">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Tekan tombol"</item>
+    <item msgid="7401896200768713930">"PIN dari perangkat rekan"</item>
+    <item msgid="4526848028011846710">"PIN dari perangkat ini"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Terhubung"</item>
+    <item msgid="983792611851499732">"Diundang"</item>
+    <item msgid="5438273405428201793">"Gagal"</item>
+    <item msgid="4646663015449312554">"Tersedia"</item>
+    <item msgid="3230556734162006146">"Di luar jangkauan"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 menit"</item>
+    <item msgid="2759776603549270587">"5 menit"</item>
+    <item msgid="167772676068860015">"1 jam"</item>
+    <item msgid="5985477119043628504">"Tanpa waktu tunggu"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gunakan Default Sistem: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Buruk"</item>
+    <item msgid="7882129634982603782">"Buruk"</item>
+    <item msgid="6457357501905996224">"Sedang"</item>
+    <item msgid="405271628162918841">"Baik"</item>
+    <item msgid="999948812884919584">"Luar biasa"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 hari terakhir"</item>
+    <item msgid="3211287705232736964">"Setel alur penggunaan..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Waktu penggunaan"</item>
+    <item msgid="2784401352592276015">"Terakhir kali digunakan"</item>
+    <item msgid="249854287216326349">"Nama apl"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Tidak ada"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Tidak ada"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Tidak ada"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statis"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Tidak ada"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Konfig. Otomatis Proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Tidak ada"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP atau CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Tidak ditentukan"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Tidak ada"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Penyimpanan perangkat internal"</item>
+    <item msgid="3186681694079967527">"Kartu SD yang dapat dicopot"</item>
+    <item msgid="6902033473986647035">"Biarkan sistem menentukan"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokasi"</item>
+    <item msgid="6842381562497597649">"Pribadi"</item>
+    <item msgid="3966700236695683444">"Pesan"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Perangkat"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"lokasi sementara"</item>
+    <item msgid="1830619568689922920">"lokasi terperinci"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"getar"</item>
+    <item msgid="8632513128515114092">"membaca kontak"</item>
+    <item msgid="3741042113569620272">"ubah kontak"</item>
+    <item msgid="4204420969709009931">"baca log panggilan"</item>
+    <item msgid="2260380357119423209">"ubah log panggilan"</item>
+    <item msgid="6550710385014530934">"membaca kalender"</item>
+    <item msgid="3575906174264853951">"ubah kalender"</item>
+    <item msgid="4319843242568057174">"pemindaian Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notifikasi"</item>
+    <item msgid="6617825156152476692">"pemindaian seluler"</item>
+    <item msgid="8865260890611559753">"telepon"</item>
+    <item msgid="3254999273961542982">"baca SMS"</item>
+    <item msgid="7711446453028825171">"tulis SMS"</item>
+    <item msgid="6123238544099198034">"terima SMS"</item>
+    <item msgid="838342167431596036">"terima SMS darurat"</item>
+    <item msgid="8554432731560956686">"terima MMS"</item>
+    <item msgid="7464863464299515059">"terima WAP push"</item>
+    <item msgid="310463075729606765">"kirim SMS"</item>
+    <item msgid="7338021933527689514">"baca ICC SMS"</item>
+    <item msgid="6130369335466613036">"tulis ICC SMS"</item>
+    <item msgid="6536865581421670942">"ubah setelan"</item>
+    <item msgid="4547203129183558973">"gambar di atas"</item>
+    <item msgid="9080347512916542840">"akses notifikasi"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"rekam audio"</item>
+    <item msgid="9182794235292595296">"putar audio"</item>
+    <item msgid="8760743229597702019">"baca papan klip"</item>
+    <item msgid="2266923698240538544">"ubah papan klip"</item>
+    <item msgid="1801619438618539275">"tombol media"</item>
+    <item msgid="31588119965784465">"fokus audio"</item>
+    <item msgid="7565226799008076833">"volume master"</item>
+    <item msgid="5420704980305018295">"volume suara"</item>
+    <item msgid="5797363115508970204">"volume dering"</item>
+    <item msgid="8233154098550715999">"volume media"</item>
+    <item msgid="5196715605078153950">"volume alarm"</item>
+    <item msgid="394030698764284577">"volume notifikasi"</item>
+    <item msgid="8952898972491680178">"volume bluetooth"</item>
+    <item msgid="8506227454543690851">"tetap aktif"</item>
+    <item msgid="1108160036049727420">"monitor lokasi"</item>
+    <item msgid="1496205959751719491">"memantau lokasi berdaya tinggi"</item>
+    <item msgid="3776296279910987380">"dapatkan statistik penggunaan"</item>
+    <item msgid="8827100324471975602">"bisukan/suarakan mikrofon"</item>
+    <item msgid="6880736730520126864">"tampilkan seranta"</item>
+    <item msgid="4933375960222609935">"media proyek"</item>
+    <item msgid="8357907018938895462">"aktifkan VPN"</item>
+    <item msgid="8143812849911310973">"tulis wallpaper"</item>
+    <item msgid="6266277260961066535">"bantu struktur"</item>
+    <item msgid="7715498149883482300">"bantu screenshot"</item>
+    <item msgid="4046679376726313293">"baca status telepon"</item>
+    <item msgid="6329507266039719587">"tambahkan pesan suara"</item>
+    <item msgid="7692440726415391408">"gunakan sip"</item>
+    <item msgid="8572453398128326267">"proses panggilan keluar"</item>
+    <item msgid="7775674394089376306">"sidik jari"</item>
+    <item msgid="3182815133441738779">"sensor tubuh"</item>
+    <item msgid="2793100005496829513">"baca siaran sel"</item>
+    <item msgid="2633626056029384366">"lokasi palsu"</item>
+    <item msgid="8356842191824684631">"baca penyimpanan"</item>
+    <item msgid="5671906070163291500">"tulis penyimpanan"</item>
+    <item msgid="2791955098549340418">"aktifkan layar"</item>
+    <item msgid="5599435119609178367">"dapatkan akun"</item>
+    <item msgid="1165623660533024666">"jalankan di latar belakang"</item>
+    <item msgid="6423861043647911030">"volume aksesibilitas"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Singkat"</item>
+    <item msgid="4816511817309094890">"Sedang"</item>
+    <item msgid="8305084671259331134">"Lama"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Default"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif spasi tunggal"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif spasi tunggal"</item>
+    <item msgid="4448481989108928248">"Santai"</item>
+    <item msgid="4627069151979553527">"Kursif"</item>
+    <item msgid="6896773537705206194">"Kapital kecil"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Sangat kecil"</item>
+    <item msgid="5091603983404027034">"Kecil"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Besar"</item>
+    <item msgid="218913203203160606">"Sangat besar"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Default"</item>
+    <item msgid="6488643537808152001">"Tidak ada"</item>
+    <item msgid="552332815156010137">"Garis batas"</item>
+    <item msgid="7187891159463789272">"Drop shadow"</item>
+    <item msgid="8019330250538856521">"Dinaikkan"</item>
+    <item msgid="8987385315647049787">"Diturunkan"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Gunakan setelan default aplikasi"</item>
+    <item msgid="8611890312638868524">"Putih berlatar hitam"</item>
+    <item msgid="5891360837786277638">"Hitam berlatar putih"</item>
+    <item msgid="2798457065945456853">"Kuning berlatar hitam"</item>
+    <item msgid="5799049811524553967">"Kuning berlatar biru"</item>
+    <item msgid="3673930830658169860">"Khusus"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN dengan kunci pra-bagi"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN dengan sertifikat"</item>
+    <item msgid="312397853907741968">"IPSec VPN dengan kunci pra-bagi dan autentikasi Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN dengan sertifikat dan autentikasi Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN dengan sertifikat dan autentikasi hibrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Tidak ada"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Sambungan terputus"</item>
+    <item msgid="8754480102834556765">"Memulai..."</item>
+    <item msgid="3351334355574270250">"Menyambung..."</item>
+    <item msgid="8303882153995748352">"Terhubung"</item>
+    <item msgid="9135049670787351881">"Waktu habis"</item>
+    <item msgid="2124868417182583926">"Gagal"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Tanya"</item>
+    <item msgid="7718817231348607934">"Jangan pernah izinkan"</item>
+    <item msgid="8184570120217958741">"Selalu izinkan"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Tetap"</item>
+    <item msgid="167418068739176448">"Aktivitas teratas"</item>
+    <item msgid="4760813290195199773">"Penting (latar depan)"</item>
+    <item msgid="2328684826817647595">"Penting (latar belakang)"</item>
+    <item msgid="7746406490652867365">"Pencadangan"</item>
+    <item msgid="5597404364389196754">"Beban berat"</item>
+    <item msgid="1290888779300174556">"Layanan (berjalan)"</item>
+    <item msgid="7241098542073939046">"Layanan (memulai ulang)"</item>
+    <item msgid="6610439017684111046">"Penerima"</item>
+    <item msgid="7367606086319921117">"Beranda"</item>
+    <item msgid="3344660712396741826">"Aktivitas terakhir"</item>
+    <item msgid="5006559348883303865">"Disimpan dalam cache (aktivitas)"</item>
+    <item msgid="8633480732468137525">"Disimpan dalam cache (klien aktivitas)"</item>
+    <item msgid="6248998242443333892">"Disimpan dalam cache (kosong)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Hijau kebiruan"</item>
+    <item msgid="3228505970082457852">"Biru"</item>
+    <item msgid="6590260735734795647">"Nila"</item>
+    <item msgid="3521763377357218577">"Ungu"</item>
+    <item msgid="5932337981182999919">"Merah Muda"</item>
+    <item msgid="5642914536624000094">"Merah"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Lebih dari 30 hari"</item>
+    <item msgid="8699273238891265610">"Lebih dari 60 hari"</item>
+    <item msgid="8346279419423837266">"Lebih dari 90 hari"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Deteksi otomatis"</item>
+    <item msgid="773943026484148895">"Perlakukan sebagai berbayar"</item>
+    <item msgid="1008268820118852416">"Perlakukan sebagai tidak berbayar"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Gunakan MAC acak (default)"</item>
+    <item msgid="214234417308375326">"Gunakan MAC perangkat"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Tidak"</item>
+    <item msgid="1930581185557754880">"Ya"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Gelap"</item>
+    <item msgid="5079453644557603349">"Cerah"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Nonaktif"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Panjang"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Hanya Layar utama"</item>
+    <item msgid="1161026694891024702">"Otomatis"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA dipilih"</item>
+    <item msgid="7581481130337402578">"Hanya GSM"</item>
+    <item msgid="8579197487913425819">"Hanya WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA otomatis"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo otomatis"</item>
+    <item msgid="4219607161971472471">"CDMA tanpa EvDo"</item>
+    <item msgid="7278975240951052041">"Hanya EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Hanya TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-in/strings.xml b/tests/CarDeveloperOptions/res/values-in/strings.xml
index 36b5633..d5638a0 100644
--- a/tests/CarDeveloperOptions/res/values-in/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-in/strings.xml
@@ -340,7 +340,7 @@
     <string name="zone_info_exemplar_location_and_offset" msgid="7264956350119098020">"<xliff:g id="EXEMPLAR_LOCATION">%1$s</xliff:g> (<xliff:g id="OFFSET">%2$s</xliff:g>)"</string>
     <string name="zone_info_offset_and_name" msgid="6043432339008569441">"<xliff:g id="TIME_TYPE">%2$s</xliff:g> (<xliff:g id="OFFSET">%1$s</xliff:g>)"</string>
     <string name="zone_info_footer" msgid="1959594483423380962">"Menggunakan <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. <xliff:g id="DST_TIME_TYPE">%2$s</xliff:g> dimulai pada <xliff:g id="TRANSITION_DATE">%3$s</xliff:g>."</string>
-    <string name="zone_info_footer_no_dst" msgid="7853616006981555000">"Menggunakan <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Tidak ada waktu musim panas."</string>
+    <string name="zone_info_footer_no_dst" msgid="7853616006981555000">"Menggunakan <xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g>. Tidak ada waktu daylight saving."</string>
     <string name="zone_time_type_dst" msgid="7812605402646684853">"Waktu musim panas"</string>
     <string name="zone_time_type_standard" msgid="4093967611947328688">"Waktu standar"</string>
     <string name="zone_menu_by_region" msgid="8211384017117296924">"Pilih menurut wilayah"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Lindungi tablet Anda dengan opsi kunci layar agar tidak ada orang yang dapat menggunakannya jika tablet Anda hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan autentikasi wajah. Ketuk Batal, lalu setel PIN atau pilih opsi kunci layar yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Lindungi perangkat Anda dengan opsi kunci layar agar tidak ada orang yang dapat menggunakannya jika perangkat Anda hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan autentikasi wajah. Ketuk Batal, lalu setel PIN atau pilih opsi kunci layar yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Lindungi ponsel Anda dengan opsi kunci layar agar tidak ada orang yang dapat menggunakannya jika ponsel Anda hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan autentikasi wajah. Ketuk Batal, lalu setel PIN atau pilih opsi kunci layar yang lain."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Lewati Penyiapan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Lewati Penyiapan Sandi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Lewati Penyiapan Pola?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Siapkan kunci layar"</string>
@@ -531,11 +530,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="700814581500057050">"Peringatan: Perangkat Anda akan dihapus setelah <xliff:g id="COUNT">^1</xliff:g> percobaan gagal lagi dalam pembukaan kunci!"</string>
     <string name="crypt_keeper_enter_password" msgid="726933635335219421">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="1906382607060855782">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="7844833877734529625">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="2895589681839090312">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="6561535293845985713">"Dekripsi gagal"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah disetel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah setel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah di-backup ke Akun Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="7018748502706237323">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah disetel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="5798580588985326937">"Sandi yang Anda masukkan benar, namun sayangnya data rusak. \n\nUntuk melanjutkan dengan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Jika Anda menyiapkan ponsel setelah setel ulang, akan ada kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4744137470890459582">"Beralih metode masukan"</string>
     <string name="suggested_lock_settings_title" msgid="1518155558803371661">"Amankan ponsel Anda"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="1861066918594412519">"Setel kunci layar untuk melindungi tablet"</string>
@@ -555,7 +554,7 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="1344567476145156885">"Pilih metode kunci layar cadangan"</string>
-    <string name="lock_settings_picker_face_message" msgid="6413145626861812959">"Pilih metode kunci layar backup"</string>
+    <string name="lock_settings_picker_face_message" msgid="6413145626861812959">"Pilih metode kunci layar cadangan"</string>
     <string name="setup_lock_settings_options_button_label" msgid="4197315143877977385">"Opsi kunci layar"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="5241946349173768827">"Opsi kunci layar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2731152716948003853">"Kunci layar"</string>
@@ -586,7 +585,7 @@
     <string name="face_unlock_set_unlock_pin" msgid="3320824093518497476">"Autentikasi wajah + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8962344604388383659">"Autentikasi wajah + Sandi"</string>
     <string name="face_unlock_skip_face" msgid="7173197040501143880">"Lanjutkan tanpa autentikasi wajah"</string>
-    <string name="face_unlock_title" msgid="1298031162909236127">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar backup."</string>
+    <string name="face_unlock_title" msgid="1298031162909236127">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="1713159782896140817">"Dinonaktifkan oleh admin, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="2950701212659081973">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="3441605629077912292">"Geser"</string>
@@ -747,7 +746,7 @@
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Menelusuri..."</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Setelan perangkat"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Perangkat yang disandingkan"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Sambungan internet"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Koneksi internet"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Keyboard"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Kontak dan histori panggilan"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Sandingkan dengan perangkat ini?"</string>
@@ -780,8 +779,8 @@
     <string name="bluetooth_disconnect_headset_profile" msgid="8384028101155317339">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="6964226087090465662">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari perangkat masukan."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"Akses Internet melalui <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8145126793699232403">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi sambungan internet tablet ini."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6040826983120279685">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi sambungan internet ponsel ini."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8145126793699232403">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi koneksi internet tablet ini."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6040826983120279685">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputus dari berbagi koneksi internet ponsel ini."</string>
     <string name="bluetooth_device_advanced_title" msgid="5752155558126694036">"Perangkat Bluetooth yang disandingkan"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="7665622268007450665">"Sambungkan"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="4180673788239241086">"Sambungkan ke perangkat Bluetooth"</string>
@@ -789,7 +788,7 @@
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"Ganti nama"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"Izinkan transfer file masuk"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"Terhubung ke perangkat untuk akses internet"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Berbagi sambungan internet lokal dengan perangkat"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Berbagi koneksi internet lokal dengan perangkat"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"Setelan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="4444650787249778130">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="6043070852100434218">"Sebagai pengeras suara telepon"</string>
@@ -821,7 +820,7 @@
     <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"Izinkan ART memverifikasi bytecode untuk aplikasi yang dapat di-debug"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"Mungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
     <string name="nfc_disclaimer_title" msgid="4860231267351602970">"Aktifkan NFC"</string>
     <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC mempertukarkan data antara perangkat ini dan perangkat atau target lain di sekitar, seperti terminal pembayaran, pembaca akses, dan iklan atau tag interaktif."</string>
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"Amankan NFC"</string>
@@ -854,7 +853,7 @@
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"Untuk menggunakan, pilih penyedia rating jaringan"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"Hindari sambungan buruk"</string>
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Jangan gunakan jaringan Wi-Fi, kecuali sambungan internetnya kuat"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Hanya gunakan jaringan yang memiliki sambungan internet kuat"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Hanya gunakan jaringan yang memiliki koneksi internet kuat"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Sambungkan ke jaringan terbuka"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Otomatis sambungkan ke jaringan publik berkualitas tinggi"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Untuk menggunakan, pilih penyedia rating jaringan"</string>
@@ -1056,17 +1055,17 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="3752679335020392154">"Apakah Anda ingin membatalkan undangan untuk tersambung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="3206660449067701089">"Lupakan grup ini?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="12062341344410520">"Hotspot Wi‑Fi"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Tidak berbagi sambungan internet atau konten dengan perangkat lain"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"Berbagi sambungan internet tablet ini melalui hotspot"</string>
-    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"Berbagi sambungan internet ponsel ini melalui hotspot"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"Aplikasi membagikan konten. Untuk membagikan sambungan internet, nonaktifkan hotspot lalu aktifkan kembali"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="6177054857136221058">"Tidak berbagi koneksi internet atau konten dengan perangkat lain"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="71421730039785897">"Berbagi koneksi internet tablet ini melalui hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="8914285514605049879">"Berbagi koneksi internet ponsel ini melalui hotspot"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="7415381343846704553">"Aplikasi membagikan konten. Untuk membagikan koneksi internet, nonaktifkan hotspot lalu aktifkan kembali"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="5400500962974373706">"Sandi tidak disetel"</string>
     <string name="wifi_hotspot_name_title" msgid="6572202165400226127">"Nama hotspot"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="5176787959408511889">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"Perangkat lainnya dapat terhubung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"Sandi hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"AP Band"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Gunakan hotspot untuk membuat jaringan Wi‑Fi bagi perangkat Anda yang lain. Hotspot menyediakan sambungan internet menggunakan koneksi data seluler Anda. Biaya data seluler tambahan mungkin berlaku."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Gunakan hotspot untuk membuat jaringan Wi‑Fi bagi perangkat Anda yang lain. Hotspot menyediakan koneksi internet menggunakan koneksi data seluler Anda. Biaya data seluler tambahan mungkin berlaku."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Aplikasi dapat membuat hotspot untuk berbagi konten dengan perangkat di sekitar."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Nonaktifkan hotspot secara otomatis"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Hotspot Wi-Fi akan dinonaktifkan jika tidak ada perangkat yang terhubung"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Ponsel"</item>
+    <item msgid="6007360612667098926">"Khusus Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1199,7 +1201,7 @@
     <string name="auto_brightness_description" msgid="8209140379089535411">"Kecerahan layar akan disesuaikan otomatis dengan lingkungan dan aktivitas Anda. Anda dapat memindahkan penggeser secara manual untuk membantu kecerahan adaptif belajar dari preferensi Anda."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"White balance layar"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Screen aware"</string>
-    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Aktif/Layar tidak akan mati jika Anda sedang melihatnya"</string>
+    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Aktif / Layar tidak akan mati jika Anda sedang melihatnya"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Nonaktif"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"Mencegah layar mati jika Anda sedang melihatnya."</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Screen aware menggunakan kamera depan untuk mengetahui apakah seseorang sedang melihat layar. Fitur ini berjalan di perangkat, dan gambar tidak pernah disimpan atau dikirimkan ke Google."</string>
@@ -1437,7 +1439,7 @@
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"<xliff:g id="NAME_0">^1</xliff:g> ini dikeluarkan dengan aman, tetapi masih ada. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini, Anda harus memasangnya terlebih dahulu."</string>
     <string name="storage_dialog_unmountable" msgid="7082856306456936054">"<xliff:g id="NAME_0">^1</xliff:g> ini rusak. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini, Anda harus menyiapkannya terlebih dahulu."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"Perangkat ini tidak mendukung <xliff:g id="NAME_0">^1</xliff:g> ini. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini dengan perangkat ini, Anda harus menyiapkannya terlebih dahulu."</string>
-    <string name="storage_internal_format_details" msgid="2780806013122012384">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk melakukan backup terlebih dahulu. \n\n"<b>"Backup foto &amp; media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Backup aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan di-uninstal dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
+    <string name="storage_internal_format_details" msgid="2780806013122012384">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk melakukan pencadangan terlebih dahulu. \n\n"<b>"Cadangkan foto &amp; media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Cadangkan aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan di-uninstal dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
     <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"Saat Anda mengeluarkan <xliff:g id="NAME_0">^1</xliff:g> ini, aplikasi yang tersimpan di situ tidak akan berfungsi lagi, dan file media yang tersimpan di situ baru dapat tersedia jika dicolokkan kembali."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ini diformat untuk berfungsi hanya di perangkat ini dan tidak akan berfungsi di perangkat lain."</string>
     <string name="storage_internal_forget_details" msgid="5655856574682184453">"Untuk menggunakan aplikasi, foto, atau data dalam <xliff:g id="NAME">^1</xliff:g> ini, colokkan kembali. \n\nAtau, Anda dapat memilih untuk melupakan penyimpanan ini jika perangkat tidak tersedia. \n\nJika Anda memilih untuk melupakan, semua data dalam perangkat ini akan hilang selamanya. \n\nNanti Anda dapat memasang ulang aplikasi, tetapi datanya yang disimpan di perangkat ini akan hilang."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"Lupakan <xliff:g id="NAME">^1</xliff:g>?"</string>
@@ -1497,7 +1499,7 @@
     <string name="storage_wizard_init_v2_external_action" msgid="4649591913020218098">"Penyimpanan portabel"</string>
     <string name="storage_wizard_init_v2_later" msgid="2605006907172213466">"Siapkan nanti"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="1884699177320256159">"Format <xliff:g id="NAME">^1</xliff:g> ini?"</string>
-    <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"<xliff:g id="NAME_0">^1</xliff:g> perlu diformat untuk menyimpan aplikasi, file, dan media. \n\nMemformat akan menghapus konten yang ada di <xliff:g id="NAME_1">^2</xliff:g>. Agar konten tidak hilang, backup ke <xliff:g id="NAME_2">^3</xliff:g> atau perangkat lain."</string>
+    <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"<xliff:g id="NAME_0">^1</xliff:g> perlu diformat untuk menyimpan aplikasi, file, dan media. \n\nMemformat akan menghapus konten yang ada di <xliff:g id="NAME_1">^2</xliff:g>. Agar konten tidak hilang, cadangkan ke <xliff:g id="NAME_2">^3</xliff:g> atau perangkat lain."</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="5576917958786300415">"Format <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="6728034411587320249">"Pindahkan konten ke <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="6943007011251294950">"Anda dapat memindahkan file, media, dan aplikasi tertentu ke <xliff:g id="NAME">^1</xliff:g> ini. \n\nPemindahan ini akan mengosongkan <xliff:g id="SIZE">^2</xliff:g> dari penyimpanan tablet dan memerlukan waktu sekitar <xliff:g id="DURATION">^3</xliff:g>."</string>
@@ -1614,15 +1616,15 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="3682544845899910726">"Tidak dapat tethering atau menggunakan hotspot portabel saat Penghemat Kuota Internet aktif"</string>
     <string name="usb_title" msgid="7480927657535578688">"USB"</string>
     <string name="usb_tethering_button_text" msgid="6242228383142012332">"Tethering USB"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="1573513260339548671">"Bagikan sambungan internet ponsel melalui USB"</string>
-    <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"Bagikan sambungan internet tablet melalui USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="1573513260339548671">"Bagikan koneksi internet ponsel melalui USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"Bagikan koneksi internet tablet melalui USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"Tethering bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"Bagikan sambungan internet tablet melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Bagikan sambungan internet ponsel melalui Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Berbagi sambungan internet <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ini melalui Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"Bagikan koneksi internet tablet melalui Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Bagikan koneksi internet ponsel melalui Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Berbagi koneksi internet <xliff:g id="DEVICE_NAME">%1$d</xliff:g> ini melalui Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"Tidak dapat menambatkan ke lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> perangkat."</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
-    <string name="tethering_footer_info" msgid="8019555174339154124">"Gunakan hotspot dan tethering untuk menyediakan sambungan internet bagi perangkat lain melalui koneksi kuota seluler Anda. Aplikasi juga dapat membuat hotspot untuk berbagi konten dengan perangkat sekitar."</string>
+    <string name="tethering_footer_info" msgid="8019555174339154124">"Gunakan hotspot dan tethering untuk menyediakan koneksi internet bagi perangkat lain melalui koneksi kuota seluler Anda. Aplikasi juga dapat membuat hotspot untuk berbagi konten dengan perangkat sekitar."</string>
     <string name="tethering_help_button_text" msgid="7653022000284543996">"Bantuan"</string>
     <string name="network_settings_title" msgid="8516526011407061679">"Jaringan seluler"</string>
     <string name="manage_mobile_plan_title" msgid="3312016665522553062">"Paket seluler"</string>
@@ -1633,8 +1635,8 @@
     <string name="network_scorer_picker_title" msgid="1691073966560952916">"Penyedia rating jaringan"</string>
     <string name="network_scorer_picker_none_preference" msgid="6448280557733231737">"Tidak ada"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="4274159562371475090">"Ubah Wi-Fi Assistant?"</string>
-    <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> sebagai ganti <xliff:g id="CURRENT_APP">%2$s</xliff:g> untuk mengelola sambungan jaringan?"</string>
-    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="6394483538843474495">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> untuk mengelola sambungan jaringan?"</string>
+    <string name="network_scorer_change_active_dialog_text" msgid="4264089809189760730">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> sebagai ganti <xliff:g id="CURRENT_APP">%2$s</xliff:g> untuk mengelola koneksi jaringan?"</string>
+    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="6394483538843474495">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> untuk mengelola koneksi jaringan?"</string>
     <string name="mobile_unknown_sim_operator" msgid="872589370085135817">"Operator SIM tidak dikenal"</string>
     <string name="mobile_no_provisioning_url" msgid="3216517414902166131">"<xliff:g id="OPERATOR">%1$s</xliff:g> tidak punya situs web penyediaanyang dikenal"</string>
     <string name="mobile_insert_sim_card" msgid="7594550403454243732">"Masukkan kartu SIM dan mulai ulang"</string>
@@ -2061,7 +2063,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Teks kontras tinggi"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Perbarui otomatis pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"Perbarui pembesaran layar di transisi aplikasi"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Tombol daya - tutup telepon"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Tombol daya untuk tutup telepon"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"Penunjuk mouse besar"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"Hapus animasi"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="899550848196702565">"Audio mono"</string>
@@ -2081,7 +2083,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Jeda sentuh lama"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"Inversi warna"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"Mungkin memengaruhi performa"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"Lama singgah"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"Klik otomatis setelah diam"</string>
     <string name="accessibility_autoclick_description" msgid="5492414927846407499">"Jika menggunakan mouse, Anda dapat menyetel kursor untuk mengambil tindakan secara otomatis saat kursor berhenti bergerak selama waktu tertentu."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="8303022510942147049">"Keterlambatan sebelum klik"</string>
     <string name="accessibility_vibration_settings_title" msgid="1902649657883159406">"Getaran"</string>
@@ -2328,7 +2330,7 @@
     <string name="restricted_app_detail_footer" msgid="482460517275754465">"Aplikasi ini telah menggunakan daya baterai di background. Aplikasi yang dibatasi mungkin tidak berfungsi dengan baik dan notifikasi dapat tertunda."</string>
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"Gunakan Pengelola Baterai"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Mendeteksi jika aplikasi menghabiskan baterai"</string>
-    <string name="battery_manager_on" msgid="5626982529932239656">"Aktif/Mendeteksi jika aplikasi menghabiskan baterai"</string>
+    <string name="battery_manager_on" msgid="5626982529932239656">"Aktif / Mendeteksi jika aplikasi menghabiskan baterai"</string>
     <string name="battery_manager_off" msgid="9114027524232450371">"Nonaktif"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
       <item quantity="other">%1$d aplikasi dibatasi</item>
@@ -2539,19 +2541,19 @@
     <string name="usage_access_title" msgid="7981321142726540574">"Apl dengan akses penggunaan"</string>
     <string name="emergency_tone_title" msgid="130211364025984428">"Sinyal panggilan darurat"</string>
     <string name="emergency_tone_summary" msgid="8035940153401622240">"Setel perilaku ketika panggilan darurat dilakukan"</string>
-    <string name="privacy_settings_title" msgid="3573891462732375772">"Backup"</string>
+    <string name="privacy_settings_title" msgid="3573891462732375772">"Pencadangan"</string>
     <string name="backup_summary_state_on" msgid="1725597360282574647">"Aktif"</string>
     <string name="backup_summary_state_off" msgid="7138020503288730492">"Nonaktif"</string>
-    <string name="backup_section_title" msgid="8177209731777904656">"Mencadangkan &amp; memulihkan"</string>
+    <string name="backup_section_title" msgid="8177209731777904656">"Pencadangan &amp; pemulihan"</string>
     <string name="personal_data_section_title" msgid="9161854418510071558">"Data pribadi"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Cadangkan data saya"</string>
     <string name="backup_data_summary" msgid="555459891017933746">"Mencadangkan data aplikasi, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
-    <string name="backup_configure_account_title" msgid="1534734650559070294">"Akun backup"</string>
-    <string name="backup_data_management_title" msgid="6299288795610243508">"Kelola akun backup"</string>
+    <string name="backup_configure_account_title" msgid="1534734650559070294">"Akun cadangan"</string>
+    <string name="backup_data_management_title" msgid="6299288795610243508">"Kelola akun cadangan"</string>
     <string name="include_app_data_title" msgid="6117211611131913293">"Sertakan data aplikasi"</string>
     <string name="auto_restore_title" msgid="8367486774010915221">"Pemulihan otomatis"</string>
-    <string name="auto_restore_summary" msgid="1941047568966428377">"Pulihkan backup setelan dan data saat menginstal ulang aplikasi"</string>
-    <string name="backup_inactive_title" msgid="5513496915638307750">"Layanan backup tidak aktif"</string>
+    <string name="auto_restore_summary" msgid="1941047568966428377">"Pulihkan cadangan setelan dan data saat menginstal ulang aplikasi"</string>
+    <string name="backup_inactive_title" msgid="5513496915638307750">"Layanan pencadangan tidak aktif"</string>
     <string name="backup_configure_account_default_summary" msgid="5718298066335006412">"Saat ini, tidak ada akun yang menyimpan data cadangan"</string>
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
     <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Berhenti mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data aplikasi, serta menghapus semua salinan di server Google?"</string>
@@ -2642,7 +2644,7 @@
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="452240217913675728">"Pilih semua"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"Penggunaan kuota"</string>
-    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Kuota &amp; Wi‑Fi"</string>
+    <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Data seluler &amp; Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
     <string name="data_usage_app" msgid="4995297799363021198">"Penggunaan aplikasi"</string>
     <string name="data_usage_app_info_label" msgid="5358288895158910477">"INFO APLIKASI"</string>
@@ -2771,8 +2773,8 @@
     <string name="vpn_forget_long" msgid="8457511440635534478">"Lupakan VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="8517436922021598103">"Ganti VPN yang sudah ada?"</string>
     <string name="vpn_set_vpn_title" msgid="6483554732067951052">"Setel VPN selalu aktif?"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="7050017738816963855">"Jika setelan ini diaktifkan, sambungan internet hanya akan tersedia setelah VPN berhasil terhubung"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="4149931501300203205">"VPN yang sudah ada akan digantikan, dan sambungan internet hanya akan tersedia setelah VPN berhasil terhubung"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="7050017738816963855">"Jika setelan ini diaktifkan, koneksi internet hanya akan tersedia setelah VPN berhasil terhubung"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="4149931501300203205">"VPN yang sudah ada akan digantikan, dan koneksi internet hanya akan tersedia setelah VPN berhasil terhubung"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="4924947523200883088">"Anda sudah terhubung ke VPN selalu aktif. Jika Anda terhubung ke VPN yang berbeda, VPN yang sudah ada akan digantikan, dan mode selalu aktif akan dinonaktifkan."</string>
     <string name="vpn_replace_vpn_message" msgid="8009433728523145393">"Anda sudah terhubung ke VPN. Jika Anda terhubung ke VPN yang berbeda, VPN yang sudah ada akan digantikan."</string>
     <string name="vpn_turn_on" msgid="2334736319093953055">"Aktifkan"</string>
@@ -2792,7 +2794,7 @@
     <string name="vpn_lockdown_summary" msgid="6770030025737770861">"Pilih profil VPN untuk tetap tersambung. Lalu lintas jaringan hanya akan diperbolehkan jika tersambung ke VPN ini."</string>
     <string name="vpn_lockdown_none" msgid="3789288793603394679">"Tidak ada"</string>
     <string name="vpn_lockdown_config_error" msgid="8761770968704589885">"VPN selalu aktif membutuhkan alamat IP baik untuk server serta DNS."</string>
-    <string name="vpn_no_network" msgid="8313250136194588023">"Tidak ada sambungan jaringan. Coba lagi nanti."</string>
+    <string name="vpn_no_network" msgid="8313250136194588023">"Tidak ada koneksi jaringan. Coba lagi nanti."</string>
     <string name="vpn_disconnected" msgid="4597953053220332539">"Terputus dari VPN"</string>
     <string name="vpn_disconnected_summary" msgid="3784118965271376808">"Tidak ada"</string>
     <string name="vpn_missing_cert" msgid="2713254242731992902">"Sertifikat tidak ditemukan. Coba edit profil."</string>
@@ -3039,9 +3041,9 @@
     <string name="account_dashboard_title" msgid="4734300939532555885">"Akun"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"Tidak ada akun yang ditambahkan"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"Aplikasi default"</string>
-    <string name="system_dashboard_summary" msgid="6582464466735779394">"Bahasa, gestur, waktu, backup"</string>
+    <string name="system_dashboard_summary" msgid="6582464466735779394">"Bahasa, gestur, waktu, pencadangan"</string>
     <string name="search_results_title" msgid="4160717656435503940">"Setelan"</string>
-    <string name="keywords_wifi" msgid="8477688080895466846">"wifi, wi-fi, sambungan jaringan, internet, nirkabel, data, wi fi"</string>
+    <string name="keywords_wifi" msgid="8477688080895466846">"wifi, wi-fi, koneksi jaringan, internet, nirkabel, data, wi fi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"Notifikasi Wi‑Fi, notifikasi wi‑fi"</string>
     <string name="keywords_auto_brightness" msgid="5007188989783072428">"Kecerahan otomatis"</string>
     <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"Hentikan getaran, ketukan, keyboard"</string>
@@ -3088,7 +3090,7 @@
     <string name="keywords_profile_challenge" msgid="8653718001253979611">"tantangan kerja, kerja, profil"</string>
     <string name="keywords_unification" msgid="2020759909366983593">"profil kerja, profil yang dikelola, menyatukan, penyatuan, kerja, profil"</string>
     <string name="keywords_gesture" msgid="5031323247529869644">"gestur"</string>
-    <string name="keywords_payment_settings" msgid="4745023716567666052">"bayar, tap, pembayaran"</string>
+    <string name="keywords_payment_settings" msgid="4745023716567666052">"bayar, ketuk, pembayaran"</string>
     <string name="keywords_backup" msgid="7433356270034921627">"backup, back up"</string>
     <string name="keywords_assist_gesture_launch" msgid="2711433664837843513">"gestur"</string>
     <string name="keywords_face_unlock" msgid="651615819291927262">"wajah, buka kunci, autentikasi, login"</string>
@@ -3233,8 +3235,8 @@
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Lihat setelan kustom"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Hanya untuk prioritas"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"Aktif/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Nonaktif/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Nonaktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off" msgid="2800265178411749309">"Nonaktif"</string>
     <string name="zen_mode_sound_summary_on" msgid="6964666541479146310">"Aktif"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7642321938427056823">"Selalu tanya (kecuali diaktifkan otomatis)"</string>
@@ -3248,7 +3250,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadwal dapat aktif otomatis</item>
       <item quantity="one">1 jadwal dapat aktif otomatis</item>
     </plurals>
-    <string name="zen_category_behavior" msgid="7695750848671443532">"Matikan suara perangkat, namun izinkan pengecualian"</string>
+    <string name="zen_category_behavior" msgid="7695750848671443532">"Nonaktifkan suara perangkat, namun izinkan pengecualian"</string>
     <string name="zen_category_exceptions" msgid="2139670640033601899">"Pengecualian"</string>
     <string name="zen_category_schedule" msgid="989629666210114164">"Jadwal"</string>
     <string name="zen_sound_title" msgid="3429086967245473870">"Lihat semua pengecualian"</string>
@@ -3760,7 +3762,7 @@
     <string name="assist_footer" msgid="7030121180457472165">"Aplikasi bantuan dapat membantu Anda berdasarkan informasi dari layar yang sedang Anda lihat. Beberapa aplikasi mendukung peluncur dan layanan masukan suara untuk memberikan bantuan terintegrasi."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"Rata-rata penggunaan memori"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"Penggunaan memori maksimum"</string>
-    <string name="memory_usage" msgid="7963253555330830906">"Pemakaian memori"</string>
+    <string name="memory_usage" msgid="7963253555330830906">"Penggunaan memori"</string>
     <string name="app_list_memory_use" msgid="356095943215944031">"Penggunaan aplikasi"</string>
     <string name="memory_details" msgid="5165105904103664110">"Detail"</string>
     <string name="memory_use_summary" msgid="7676311343819965850">"<xliff:g id="SIZE">%1$s</xliff:g> rata-rata memori yang digunakan dalam 3 jam terakhir"</string>
@@ -3861,7 +3863,7 @@
     <string name="memory_summary" msgid="9121871336058042600">"Rata-rata <xliff:g id="USED_MEMORY">%1$s</xliff:g> dari <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memori digunakan"</string>
     <string name="users_summary" msgid="6693338169439092387">"Login sebagai <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="1381646849276543242">"<xliff:g id="APP_NAME">%1$s</xliff:g> default"</string>
-    <string name="backup_disabled" msgid="6941165814784765643">"Backup dinonaktifkan"</string>
+    <string name="backup_disabled" msgid="6941165814784765643">"Pencadangan dinonaktifkan"</string>
     <string name="android_version_summary" msgid="2192751442789395445">"Diupdate ke Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="android_version_pending_update_summary" msgid="3554543810520655076">"Ada update"</string>
     <string name="disabled_by_policy_title" msgid="1238318274952958846">"Tindakan tidak diizinkan"</string>
@@ -4104,7 +4106,7 @@
     <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Isyarat cepat untuk mengontrol ponsel"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Isyarat cepat untuk mengontrol tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Isyarat cepat untuk mengontrol perangkat"</string>
-    <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Beralih ke kamera"</string>
+    <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Buka kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"Untuk membuka kamera dengan cepat, tekan tombol power 2 kali. Berfungsi di layar mana pun."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Buka kamera dengan cepat"</string>
     <string name="double_twist_for_camera_mode_title" msgid="2606032140297556018">"Balik kamera"</string>
@@ -4250,7 +4252,7 @@
     <string name="debug_autofill_category" msgid="6262526615416295645">"IsiOtomatis"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"Level logging"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"Permintaan maks per sesi"</string>
-    <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"Jumlah dataset maks yang terlihat"</string>
+    <string name="autofill_max_visible_datasets" msgid="2791081640248423492">"Jumlah set data maks yang terlihat"</string>
     <string name="autofill_reset_developer_options" msgid="7208417230269613101">"Setel ulang ke nilai default"</string>
     <string name="autofill_reset_developer_options_complete" msgid="5686061993002179524">"Opsi developer IsiOtomatis telah direset"</string>
     <string name="device_theme" msgid="8992291311481135893">"Tema perangkat"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Fitur ini akan memperlambat ponsel Anda"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Paksa ukuran GNSS penuh"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Lacak semua konstelasi dan frekuensi GNSS tanpa siklus tugas"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Debug peralihan pengguna"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Tampilkan informasi mendetail saat peralihan pengguna"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Izinkan aktivitas background dimulai"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Mengizinkan semua aktivitas background dimulai"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Selalu tampilkan dialog error"</string>
@@ -4454,7 +4458,7 @@
     <string name="bluetooth_right_name" msgid="8356091262762973801">"Kanan"</string>
     <string name="bluetooth_middle_name" msgid="1489185200445352103">"Casing"</string>
     <string name="settings_panel_title" msgid="8181989386118232534">"Panel Setelan"</string>
-    <string name="internet_connectivity_panel_title" msgid="341712994620215750">"Sambungan Internet"</string>
+    <string name="internet_connectivity_panel_title" msgid="341712994620215750">"Koneksi Internet"</string>
     <string name="volume_connectivity_panel_title" msgid="4998755371496690971">"Volume"</string>
     <string name="mobile_data_ap_mode_disabled" msgid="2452716524753472885">"Tidak tersedia selama mode pesawat"</string>
     <string name="force_desktop_mode" msgid="6973100177551040740">"Paksa mode desktop"</string>
diff --git a/tests/CarDeveloperOptions/res/values-is-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-is-nokeys/strings.xml
new file mode 100644
index 0000000..9a2aee9
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-is-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Stjórna forritum"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-is/arrays.xml b/tests/CarDeveloperOptions/res/values-is/arrays.xml
new file mode 100644
index 0000000..1cec986
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-is/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Ameríka"</item>
+    <item msgid="4791956477275129121">"Evrópa"</item>
+    <item msgid="3812126832016254559">"Afríka"</item>
+    <item msgid="2765816300353408280">"Asía"</item>
+    <item msgid="6683489385344409742">"Ástralía"</item>
+    <item msgid="5194868215515664953">"Kyrrahaf"</item>
+    <item msgid="7044520255415007865">"Allar"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekúndur"</item>
+    <item msgid="772029947136115322">"30 sekúndur"</item>
+    <item msgid="8743663928349474087">"1 mínúta"</item>
+    <item msgid="1506508631223164814">"2 mínútur"</item>
+    <item msgid="8664703938127907662">"5 mínútur"</item>
+    <item msgid="5827960506924849753">"10 mínútur"</item>
+    <item msgid="6677424950124253938">"30 mínútur"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Strax"</item>
+    <item msgid="2038544972632026612">"5 sekúndur"</item>
+    <item msgid="5558060663472279597">"15 sekúndur"</item>
+    <item msgid="45341168505452037">"30 sekúndur"</item>
+    <item msgid="227647485917789272">"1 mínúta"</item>
+    <item msgid="3367011891231217504">"2 mínútur"</item>
+    <item msgid="4376575879222393045">"5 mínútur"</item>
+    <item msgid="811192536981678974">"10 mínútur"</item>
+    <item msgid="7258394417241706272">"30 mínútur"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Tengt"</item>
+    <item msgid="983792611851499732">"Boðið"</item>
+    <item msgid="5438273405428201793">"Mistókst"</item>
+    <item msgid="4646663015449312554">"Í boði"</item>
+    <item msgid="3230556734162006146">"Ekkert samband"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 mínútur"</item>
+    <item msgid="2759776603549270587">"5 mínútur"</item>
+    <item msgid="167772676068860015">"1 klukkustund"</item>
+    <item msgid="5985477119043628504">"Renna aldrei út á tíma"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Nota sjálfgefna stillingu kerfis: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Síðustu 30 dagar"</item>
+    <item msgid="3211287705232736964">"Velja notkunartímabil..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Notkunartími"</item>
+    <item msgid="2784401352592276015">"Síðast notað"</item>
+    <item msgid="249854287216326349">"Heiti forrits"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ekkert"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ekkert"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ekkert"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ekkert"</item>
+    <item msgid="1464741437353223198">"Handbók"</item>
+    <item msgid="5793600062487886090">"Sjálfstilling proxy-þjóns"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ekkert"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP eða CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ótilgreint"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ekkert"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Innbyggð geymsla tækis"</item>
+    <item msgid="3186681694079967527">"Laust SD-kort"</item>
+    <item msgid="6902033473986647035">"Leyfa kerfinu að ráða"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Staðsetning"</item>
+    <item msgid="6842381562497597649">"Persónulegt"</item>
+    <item msgid="3966700236695683444">"Skilaboð"</item>
+    <item msgid="8563996233342430477">"Margmiðlun"</item>
+    <item msgid="5323851085993963783">"Tæki"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"gróflega áætluð staðsetning"</item>
+    <item msgid="1830619568689922920">"nákvæm staðsetning"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"titringur"</item>
+    <item msgid="8632513128515114092">"lesa tengiliði"</item>
+    <item msgid="3741042113569620272">"breyta tengiliðum"</item>
+    <item msgid="4204420969709009931">"lesa símtalaskrá"</item>
+    <item msgid="2260380357119423209">"breyta símtalaskrá"</item>
+    <item msgid="6550710385014530934">"lesa dagatal"</item>
+    <item msgid="3575906174264853951">"breyta dagatali"</item>
+    <item msgid="4319843242568057174">"wi-fi leit"</item>
+    <item msgid="2981791890467303819">"tilkynning"</item>
+    <item msgid="6617825156152476692">"leit að símasambandi"</item>
+    <item msgid="8865260890611559753">"hringja í síma"</item>
+    <item msgid="3254999273961542982">"lesa SMS"</item>
+    <item msgid="7711446453028825171">"skrifa SMS"</item>
+    <item msgid="6123238544099198034">"taka á móti SMS"</item>
+    <item msgid="838342167431596036">"fá neyðartextaskilaboð"</item>
+    <item msgid="8554432731560956686">"taka á móti MMS"</item>
+    <item msgid="7464863464299515059">"fá WAP-sendingar"</item>
+    <item msgid="310463075729606765">"senda SMS"</item>
+    <item msgid="7338021933527689514">"lesa ICC SMS"</item>
+    <item msgid="6130369335466613036">"skrifa ICC SMS"</item>
+    <item msgid="6536865581421670942">"breyta stillingum"</item>
+    <item msgid="4547203129183558973">"teikna yfir"</item>
+    <item msgid="9080347512916542840">"aðgangstilkynningar"</item>
+    <item msgid="5332718516635907742">"myndavél"</item>
+    <item msgid="6098422447246167852">"taka upp hljóð"</item>
+    <item msgid="9182794235292595296">"spila hljóð"</item>
+    <item msgid="8760743229597702019">"lesa klippiborð"</item>
+    <item msgid="2266923698240538544">"breyta klippiborði"</item>
+    <item msgid="1801619438618539275">"margmiðlunarhnappar"</item>
+    <item msgid="31588119965784465">"fókus hljóðs"</item>
+    <item msgid="7565226799008076833">"meginhljóðstyrkur"</item>
+    <item msgid="5420704980305018295">"hljóðstyrkur raddar"</item>
+    <item msgid="5797363115508970204">"hljóðstyrkur hringingar"</item>
+    <item msgid="8233154098550715999">"hljóðstyrkur margmiðlunarefnis"</item>
+    <item msgid="5196715605078153950">"hljóðstyrkur vekjara"</item>
+    <item msgid="394030698764284577">"hljóðstyrkur tilkynninga"</item>
+    <item msgid="8952898972491680178">"hljóðstyrkur bluetooth"</item>
+    <item msgid="8506227454543690851">"ekki fara í biðstöðu"</item>
+    <item msgid="1108160036049727420">"fylgjast með staðsetningu"</item>
+    <item msgid="1496205959751719491">"fylgjast með staðsetningum með miklum styrk"</item>
+    <item msgid="3776296279910987380">"fá talnagögn um notkun"</item>
+    <item msgid="8827100324471975602">"kveikja/slökkva á hljóðnema"</item>
+    <item msgid="6880736730520126864">"sýna tilkynningu"</item>
+    <item msgid="4933375960222609935">"margmiðlunarefni verkefnis"</item>
+    <item msgid="8357907018938895462">"virkja VPN"</item>
+    <item msgid="8143812849911310973">"skrifa veggfóður"</item>
+    <item msgid="6266277260961066535">"aðstoða við uppbyggingu"</item>
+    <item msgid="7715498149883482300">"aðstoða við skjámynd"</item>
+    <item msgid="4046679376726313293">"lesa stöðu síma"</item>
+    <item msgid="6329507266039719587">"bæta við talhólfi"</item>
+    <item msgid="7692440726415391408">"nota SIP"</item>
+    <item msgid="8572453398128326267">"vinna úr hringdu símtali"</item>
+    <item msgid="7775674394089376306">"fingrafar"</item>
+    <item msgid="3182815133441738779">"líkamsskynjarar"</item>
+    <item msgid="2793100005496829513">"lesa skilaboð frá endurvarpa"</item>
+    <item msgid="2633626056029384366">"gervistaðsetning"</item>
+    <item msgid="8356842191824684631">"lesa geymslu"</item>
+    <item msgid="5671906070163291500">"skrifa í geymslu"</item>
+    <item msgid="2791955098549340418">"kveikja á skjánum"</item>
+    <item msgid="5599435119609178367">"fá reikninga"</item>
+    <item msgid="1165623660533024666">"keyra í bakgrunni"</item>
+    <item msgid="6423861043647911030">"hljóðstyrkur aðgengis"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Stutt"</item>
+    <item msgid="4816511817309094890">"Í meðallagi"</item>
+    <item msgid="8305084671259331134">"Langt"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Sjálfgefið"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Þjappað sans-serif"</item>
+    <item msgid="6529379119163117545">"Sans-serif jafnbreitt"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif jafnbreitt"</item>
+    <item msgid="4448481989108928248">"Óformlegt"</item>
+    <item msgid="4627069151979553527">"Tengt"</item>
+    <item msgid="6896773537705206194">"Litlir hástafir"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Sjálfgefið"</item>
+    <item msgid="6488643537808152001">"Ekkert"</item>
+    <item msgid="552332815156010137">"Útlína"</item>
+    <item msgid="7187891159463789272">"Skuggi"</item>
+    <item msgid="8019330250538856521">"Lyft"</item>
+    <item msgid="8987385315647049787">"Lækkað"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN með lyklum sem hefur verið deilt"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN með vottorðum"</item>
+    <item msgid="312397853907741968">"IPSec VPN með með lyklum sem hefur verið deilt og Xauth-staðfestingu"</item>
+    <item msgid="3319427315593649917">"IPSec VPN með vottorðum og Xauth-staðfestingu"</item>
+    <item msgid="8258927774145391041">"IPSec VPN með vottorðum og blandaðri staðfestingu"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ekkert"</item>
+    <item msgid="1157046369795346308">"Handbók"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Spyrja"</item>
+    <item msgid="7718817231348607934">"Leyfa aldrei"</item>
+    <item msgid="8184570120217958741">"Leyfa alltaf"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Viðvarandi"</item>
+    <item msgid="167418068739176448">"Mesta virkni"</item>
+    <item msgid="4760813290195199773">"Mikilvægt (forgrunnur)"</item>
+    <item msgid="2328684826817647595">"Mikilvægt (bakgrunnur)"</item>
+    <item msgid="7746406490652867365">"Öryggisafrit"</item>
+    <item msgid="5597404364389196754">"Þung vinnsla"</item>
+    <item msgid="1290888779300174556">"Þjónusta (í gangi)"</item>
+    <item msgid="7241098542073939046">"Þjónusta (endurræsist)"</item>
+    <item msgid="6610439017684111046">"Móttakari"</item>
+    <item msgid="7367606086319921117">"Heim"</item>
+    <item msgid="3344660712396741826">"Síðasta virkni"</item>
+    <item msgid="5006559348883303865">"Í skyndiminni (virkni)"</item>
+    <item msgid="8633480732468137525">"Í skyndiminni (virknibiðlari)"</item>
+    <item msgid="6248998242443333892">"Í skyndiminni (autt)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Blágrænn"</item>
+    <item msgid="3228505970082457852">"Blár"</item>
+    <item msgid="6590260735734795647">"Dimmfjólublár"</item>
+    <item msgid="3521763377357218577">"Fjólublár"</item>
+    <item msgid="5932337981182999919">"Bleikur"</item>
+    <item msgid="5642914536624000094">"Rauður"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Eldri en 30 daga"</item>
+    <item msgid="8699273238891265610">"Eldri en 60 daga"</item>
+    <item msgid="8346279419423837266">"Eldri en 90 daga"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Greina sjálfkrafa"</item>
+    <item msgid="773943026484148895">"Meðhöndla sem mælt"</item>
+    <item msgid="1008268820118852416">"Meðhöndla sem ótakmarkað"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Nota MAC-vistfang af handahófi (sjálfgefið)"</item>
+    <item msgid="214234417308375326">"Nota MAC-vistfang tækis"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nei"</item>
+    <item msgid="1930581185557754880">"Já"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Dökkt"</item>
+    <item msgid="5079453644557603349">"Ljóst"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Slökkt"</item>
+    <item msgid="4072198137051566919">"Kemba"</item>
+    <item msgid="2473005316958868509">"Ítarleg"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Aðeins heimakerfi"</item>
+    <item msgid="1161026694891024702">"Sjálfvirkt"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA fyrsta val"</item>
+    <item msgid="7581481130337402578">"GSM eingöngu"</item>
+    <item msgid="8579197487913425819">"WCDMA eingöngu"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA sjálfvirkt"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo sjálfvirkt"</item>
+    <item msgid="4219607161971472471">"CDMA án EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo eingöngu"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Alþjóðlegt"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Aðeins TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Alþjóðlegt"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-is/strings.xml b/tests/CarDeveloperOptions/res/values-is/strings.xml
index 2a59b31..5abef77 100644
--- a/tests/CarDeveloperOptions/res/values-is/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-is/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Verndaðu spjaldtölvuna þína með því að velja skjálás svo enginn geti notað hana ef hún týnist eða ef henni er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsgreiningu. Ýttu á „Hætta við“, stilltu síðan PIN-númer eða veldu annars konar skjálás."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Verndaðu tækið þitt með því að velja skjálás svo enginn geti notað það ef það týnist eða ef því er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsgreiningu. Ýttu á „Hætta við“, stilltu síðan PIN-númer eða veldu annars konar skjálás."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Verndaðu símann þinn með því að velja skjálás svo enginn geti notað hann ef hann týnist eða ef honum er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsgreiningu. Ýttu á „Hætta við“, stilltu síðan PIN-númer eða veldu annars konar skjálás."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Sleppa uppsetningu PIN-númers?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Sleppa uppsetn. aðgangsorðs?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Sleppa uppsetningu mynsturs?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Setja upp skjálás"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Farsímakerfi"</item>
+    <item msgid="6007360612667098926">"Wi-Fi eingöngu"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Hann hægir á símanum"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Full GNSS-mæling"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Rekja öll GNSS söfn og tíðnir með engum vinnulotum"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Kemba notandaskipti"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Sýna ítarlegar upplýsingar við notandaskipti"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Leyfa aðgerðir í bakgrunninum"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Leyfir allar aðgerðir í bakgrunninum"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Sýna alltaf hrunglugga"</string>
diff --git a/tests/CarDeveloperOptions/res/values-it-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-it-nokeys/strings.xml
new file mode 100644
index 0000000..4546e65
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-it-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gestisci applicazioni"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-it/arrays.xml b/tests/CarDeveloperOptions/res/values-it/arrays.xml
new file mode 100644
index 0000000..22a26a0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-it/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacifico"</item>
+    <item msgid="7044520255415007865">"Tutte"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 secondi"</item>
+    <item msgid="772029947136115322">"30 secondi"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minuti"</item>
+    <item msgid="8664703938127907662">"5 minuti"</item>
+    <item msgid="5827960506924849753">"10 minuti"</item>
+    <item msgid="6677424950124253938">"30 minuti"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Mai"</item>
+    <item msgid="2517785806387977252">"15 secondi"</item>
+    <item msgid="6347954399441173672">"30 secondi"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minuti"</item>
+    <item msgid="2788593551142462622">"5 minuti"</item>
+    <item msgid="8012672183888404961">"10 minuti"</item>
+    <item msgid="8271452751594598661">"30 minuti"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Immediatamente"</item>
+    <item msgid="2038544972632026612">"5 secondi"</item>
+    <item msgid="5558060663472279597">"15 secondi"</item>
+    <item msgid="45341168505452037">"30 secondi"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minuti"</item>
+    <item msgid="4376575879222393045">"5 minuti"</item>
+    <item msgid="811192536981678974">"10 minuti"</item>
+    <item msgid="7258394417241706272">"30 minuti"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Piccole"</item>
+    <item msgid="591935967183159581">"Predefinito"</item>
+    <item msgid="1714184661981538355">"Grandi"</item>
+    <item msgid="6195563047686707484">"Più grandi"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scansione in corso..."</item>
+    <item msgid="5597394826455877834">"Connessione..."</item>
+    <item msgid="5848277343965362748">"Autenticazione..."</item>
+    <item msgid="3391238031431440676">"Acquisizione indirizzo IP..."</item>
+    <item msgid="5257597310494000224">"Connessa"</item>
+    <item msgid="8472497592913050396">"Sospeso"</item>
+    <item msgid="1228072488815999109">"Disconnessione..."</item>
+    <item msgid="7253087004422991731">"Disconnesso"</item>
+    <item msgid="4169850917304751227">"Non riuscita"</item>
+    <item msgid="6266658166690831131">"Bloccate"</item>
+    <item msgid="4517230805854909775">"Al momento vengono evitate connessioni deboli"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Ricerca..."</item>
+    <item msgid="8058143476674427024">"Connessione a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Autenticazione con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Recupero indirizzo IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Connessa a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Sospeso"</item>
+    <item msgid="4133290864821295785">"Disconnessione da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Disconnesso"</item>
+    <item msgid="2847316776634969068">"Non riuscita"</item>
+    <item msgid="4390990424746035383">"Bloccate"</item>
+    <item msgid="3618248791367063949">"Al momento vengono evitate connessioni deboli"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Pulsante di comando"</item>
+    <item msgid="7401896200768713930">"PIN del dispositivo peer"</item>
+    <item msgid="4526848028011846710">"PIN da dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Connessa"</item>
+    <item msgid="983792611851499732">"Invitato"</item>
+    <item msgid="5438273405428201793">"Non riuscita"</item>
+    <item msgid="4646663015449312554">"Disponibile"</item>
+    <item msgid="3230556734162006146">"Fuori dal raggio d\'azione"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuti"</item>
+    <item msgid="2759776603549270587">"5 minuti"</item>
+    <item msgid="167772676068860015">"1 ora"</item>
+    <item msgid="5985477119043628504">"Mai in timeout"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usa i valori predefiniti del sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Scarsa"</item>
+    <item msgid="7882129634982603782">"Scarsa"</item>
+    <item msgid="6457357501905996224">"Discreta"</item>
+    <item msgid="405271628162918841">"Buona"</item>
+    <item msgid="999948812884919584">"Ottima"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Ultimi 30 giorni"</item>
+    <item msgid="3211287705232736964">"Imp. ciclo di utilizzo..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Tempo di utilizzo"</item>
+    <item msgid="2784401352592276015">"Data ultimo utilizzo:"</item>
+    <item msgid="249854287216326349">"Nome applicazione"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Nessuna"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nessuno"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Nessuna"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statico"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Nessuna"</item>
+    <item msgid="1464741437353223198">"Manuale"</item>
+    <item msgid="5793600062487886090">"Configurazione automatica proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Nessuna"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP o CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Non specificato"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nessuno"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Memorizzazione su dispositivo interno"</item>
+    <item msgid="3186681694079967527">"Scheda SD rimovibile"</item>
+    <item msgid="6902033473986647035">"Impostazione di sistema"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Posizione"</item>
+    <item msgid="6842381562497597649">"Personali"</item>
+    <item msgid="3966700236695683444">"Messaggi"</item>
+    <item msgid="8563996233342430477">"Supporti"</item>
+    <item msgid="5323851085993963783">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"posizione approssimativa"</item>
+    <item msgid="1830619568689922920">"posizione precisa"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrazione"</item>
+    <item msgid="8632513128515114092">"lettura contatti"</item>
+    <item msgid="3741042113569620272">"modifica dei contatti"</item>
+    <item msgid="4204420969709009931">"lettura del registro chiamate"</item>
+    <item msgid="2260380357119423209">"modifica del registro chiamate"</item>
+    <item msgid="6550710385014530934">"lettura calendario"</item>
+    <item msgid="3575906174264853951">"modifica del calendario"</item>
+    <item msgid="4319843242568057174">"scansione Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notifica"</item>
+    <item msgid="6617825156152476692">"scansione cell"</item>
+    <item msgid="8865260890611559753">"chiamate telefono"</item>
+    <item msgid="3254999273961542982">"lettura SMS"</item>
+    <item msgid="7711446453028825171">"scrittura SMS"</item>
+    <item msgid="6123238544099198034">"ricezione SMS"</item>
+    <item msgid="838342167431596036">"ricezione SMS di emergenza"</item>
+    <item msgid="8554432731560956686">"ricezione MMS"</item>
+    <item msgid="7464863464299515059">"ricezione push WAP"</item>
+    <item msgid="310463075729606765">"invio SMS"</item>
+    <item msgid="7338021933527689514">"lettura SMS ICC"</item>
+    <item msgid="6130369335466613036">"scrittura SMS ICC"</item>
+    <item msgid="6536865581421670942">"modifica delle impostazioni"</item>
+    <item msgid="4547203129183558973">"traccia in alto"</item>
+    <item msgid="9080347512916542840">"accesso a notifiche"</item>
+    <item msgid="5332718516635907742">"fotocamera"</item>
+    <item msgid="6098422447246167852">"registrazione audio"</item>
+    <item msgid="9182794235292595296">"riproduzione audio"</item>
+    <item msgid="8760743229597702019">"lettura degli appunti"</item>
+    <item msgid="2266923698240538544">"modifica degli appunti"</item>
+    <item msgid="1801619438618539275">"pulsanti contenuti multimediali"</item>
+    <item msgid="31588119965784465">"focus audio"</item>
+    <item msgid="7565226799008076833">"volume principale"</item>
+    <item msgid="5420704980305018295">"volume voce"</item>
+    <item msgid="5797363115508970204">"volume suoneria"</item>
+    <item msgid="8233154098550715999">"volume contenuti multimediali"</item>
+    <item msgid="5196715605078153950">"volume sveglia"</item>
+    <item msgid="394030698764284577">"volume notifiche"</item>
+    <item msgid="8952898972491680178">"volume bluetooth"</item>
+    <item msgid="8506227454543690851">"mantieni attivo"</item>
+    <item msgid="1108160036049727420">"monitora posizione"</item>
+    <item msgid="1496205959751719491">"monitora geolocalizzazione a consumo elevato"</item>
+    <item msgid="3776296279910987380">"ricevi statistiche sull\'utilizzo"</item>
+    <item msgid="8827100324471975602">"attiva/disattiva microfono"</item>
+    <item msgid="6880736730520126864">"visualizzazione dell\'avviso popup"</item>
+    <item msgid="4933375960222609935">"elementi multimediali dei progetti"</item>
+    <item msgid="8357907018938895462">"attivazione della VPN"</item>
+    <item msgid="8143812849911310973">"scrittura dello sfondo"</item>
+    <item msgid="6266277260961066535">"assistenza per la struttura"</item>
+    <item msgid="7715498149883482300">"assistenza per lo screenshot"</item>
+    <item msgid="4046679376726313293">"lettura dello stato del telefono"</item>
+    <item msgid="6329507266039719587">"aggiunta di un messaggio vocale"</item>
+    <item msgid="7692440726415391408">"utilizzo di SIP"</item>
+    <item msgid="8572453398128326267">"elaborazione della chiamata in uscita"</item>
+    <item msgid="7775674394089376306">"impronta digitale"</item>
+    <item msgid="3182815133441738779">"sensori per il corpo"</item>
+    <item msgid="2793100005496829513">"lettura di cell broadcast"</item>
+    <item msgid="2633626056029384366">"posizione fittizia"</item>
+    <item msgid="8356842191824684631">"lettura dello spazio di archiviazione"</item>
+    <item msgid="5671906070163291500">"scrittura nello spazio di archiviazione"</item>
+    <item msgid="2791955098549340418">"attivazione dello schermo"</item>
+    <item msgid="5599435119609178367">"recupero di account"</item>
+    <item msgid="1165623660533024666">"esecuzione in background"</item>
+    <item msgid="6423861043647911030">"volume accessibilità"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Posizione"</item>
+    <item msgid="6656077694190491067">"Posizione"</item>
+    <item msgid="8790228218278477369">"Posizione"</item>
+    <item msgid="7836406246005211990">"Vibrazione"</item>
+    <item msgid="3951439024549922598">"Lettura contatti"</item>
+    <item msgid="8802152411647068">"Modifica dei contatti"</item>
+    <item msgid="229544934599698735">"Lettura del registro chiamate"</item>
+    <item msgid="7396102294405899613">"Modifica del registro chiamate"</item>
+    <item msgid="3597797992398484655">"Lettura calendario"</item>
+    <item msgid="2705975774250907343">"Modifica del calendario"</item>
+    <item msgid="4668747371441932697">"Posizione"</item>
+    <item msgid="1487578921720243646">"Pubblicazione notifica"</item>
+    <item msgid="4636080349724146638">"Posizione"</item>
+    <item msgid="673510900286463926">"Chiamate telefono"</item>
+    <item msgid="542083422784609790">"Lettura di SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Scrittura di SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Ricezione SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Ricezione SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Ricezione SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Ricezione SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Invio SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Lettura di SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Scrittura di SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Modifica delle impostazioni"</item>
+    <item msgid="8705854389991425629">"Traccia in alto"</item>
+    <item msgid="5861356020344153651">"Accesso a notifiche"</item>
+    <item msgid="78432174621628659">"Fotocamera"</item>
+    <item msgid="3986116419882154794">"Registrazione audio"</item>
+    <item msgid="4516840825756409490">"Riproduzione audio"</item>
+    <item msgid="6811712502798183957">"Lettura degli appunti"</item>
+    <item msgid="2780369012602289114">"Modifica degli appunti"</item>
+    <item msgid="2331359440170850868">"Pulsanti contenuti multimediali"</item>
+    <item msgid="6133599737122751231">"Focus audio"</item>
+    <item msgid="6844485713404805301">"Volume principale"</item>
+    <item msgid="1600379420669104929">"Volume voce"</item>
+    <item msgid="6296768210470214866">"Volume suoneria"</item>
+    <item msgid="510690696071629241">"Volume contenuti multimediali"</item>
+    <item msgid="406861638631430109">"Volume sveglia"</item>
+    <item msgid="4715864795872233884">"Volume notifiche"</item>
+    <item msgid="2311478519251301183">"Volume Bluetooth"</item>
+    <item msgid="5133991377896747027">"Mantieni attivo"</item>
+    <item msgid="2464189519136248621">"Posizione"</item>
+    <item msgid="2062677934050803037">"Posizione"</item>
+    <item msgid="1735171933192715957">"Ricevi statistiche sull\'utilizzo"</item>
+    <item msgid="1014093788778383554">"Attiva/disattiva microfono"</item>
+    <item msgid="4199297950608622850">"Visualizzazione dell\'avviso popup"</item>
+    <item msgid="2527962435313398821">"Proiezione di contenuti multimediali"</item>
+    <item msgid="5117506254221861929">"Attivazione della VPN"</item>
+    <item msgid="8291198322681891160">"Scrivi sfondo"</item>
+    <item msgid="7106921284621230961">"Assistenza per la struttura"</item>
+    <item msgid="4496533640894624799">"Assistenza per lo screenshot"</item>
+    <item msgid="2598847264853993611">"Lettura dello stato del telefono"</item>
+    <item msgid="9215610846802973353">"Aggiunta di un messaggio vocale"</item>
+    <item msgid="9186411956086478261">"Utilizzo di SIP"</item>
+    <item msgid="6884763100104539558">"Elaborazione della chiamata in uscita"</item>
+    <item msgid="125513972170580692">"Impronta digitale"</item>
+    <item msgid="2556071024281275619">"Sensori per il corpo"</item>
+    <item msgid="617168514928339387">"Lettura di cell broadcast"</item>
+    <item msgid="7134693570516523585">"Posizione fittizia"</item>
+    <item msgid="7224489175375229399">"Lettura dello spazio di archiviazione"</item>
+    <item msgid="8472735063903258202">"Scrittura nello spazio di archiviazione"</item>
+    <item msgid="4069276819909595110">"Attivazione dello schermo"</item>
+    <item msgid="1228338896751121025">"Recupero di account"</item>
+    <item msgid="3181581793459233672">"Esecuzione in background"</item>
+    <item msgid="2340936043025374076">"Volume accessibilità"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Breve"</item>
+    <item msgid="4816511817309094890">"Media"</item>
+    <item msgid="8305084671259331134">"Lungo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predefinito"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Corsivo"</item>
+    <item msgid="6896773537705206194">"Maiuscoletto"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Molto piccole"</item>
+    <item msgid="5091603983404027034">"Piccole"</item>
+    <item msgid="176844712416932112">"Normali"</item>
+    <item msgid="2784236342175159295">"Grandi"</item>
+    <item msgid="218913203203160606">"Molto grandi"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predefinito"</item>
+    <item msgid="6488643537808152001">"Nessuna"</item>
+    <item msgid="552332815156010137">"Struttura"</item>
+    <item msgid="7187891159463789272">"Ombreggiatura"</item>
+    <item msgid="8019330250538856521">"In rilievo"</item>
+    <item msgid="8987385315647049787">"Incassato"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Impostazioni predefinite app"</item>
+    <item msgid="8611890312638868524">"Bianco su nero"</item>
+    <item msgid="5891360837786277638">"Nero su bianco"</item>
+    <item msgid="2798457065945456853">"Giallo su nero"</item>
+    <item msgid="5799049811524553967">"Giallo su blu"</item>
+    <item msgid="3673930830658169860">"Personalizzato"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"VPN L2TP/IPSec con chiavi precondivise"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec con certificati"</item>
+    <item msgid="312397853907741968">"VPN IPSec con chiavi precondivise e autenticazione Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec con certificati e autenticazione Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec con certificati e autenticazione ibrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nessuna"</item>
+    <item msgid="1157046369795346308">"Manuale"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Disconnesso"</item>
+    <item msgid="8754480102834556765">"Inizializzazione..."</item>
+    <item msgid="3351334355574270250">"Connessione..."</item>
+    <item msgid="8303882153995748352">"Connessa"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Non riuscita"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Chiedi"</item>
+    <item msgid="7718817231348607934">"Non consentire mai"</item>
+    <item msgid="8184570120217958741">"Consenti sempre"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistente"</item>
+    <item msgid="167418068739176448">"Prima attività"</item>
+    <item msgid="4760813290195199773">"Importante (in primo piano)"</item>
+    <item msgid="2328684826817647595">"Importante (in background)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Pesante"</item>
+    <item msgid="1290888779300174556">"Servizio (in esecuzione)"</item>
+    <item msgid="7241098542073939046">"Service (riavvio)"</item>
+    <item msgid="6610439017684111046">"Ricevitore"</item>
+    <item msgid="7367606086319921117">"Home"</item>
+    <item msgid="3344660712396741826">"Ultima attività"</item>
+    <item msgid="5006559348883303865">"Memorizzata nella cache (attività)"</item>
+    <item msgid="8633480732468137525">"Memorizzata nella cache (client attività)"</item>
+    <item msgid="6248998242443333892">"Memorizzata nella cache (vuoto)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Verde acqua"</item>
+    <item msgid="3228505970082457852">"Blu"</item>
+    <item msgid="6590260735734795647">"Indaco"</item>
+    <item msgid="3521763377357218577">"Viola"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Rosso"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Più vecchi di 30 giorni"</item>
+    <item msgid="8699273238891265610">"Più vecchi di 60 giorni"</item>
+    <item msgid="8346279419423837266">"Più vecchi di 90 giorni"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Rileva automaticamente"</item>
+    <item msgid="773943026484148895">"Considera a consumo"</item>
+    <item msgid="1008268820118852416">"Considera non a consumo"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Usa MAC casuale (opzione predefinita)"</item>
+    <item msgid="214234417308375326">"Utilizza indirizzo MAC del dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Sì"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Scuro"</item>
+    <item msgid="5079453644557603349">"Chiaro"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"OFF"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Dettagliata"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Solo domestica"</item>
+    <item msgid="1161026694891024702">"Automatica"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferito"</item>
+    <item msgid="7581481130337402578">"Solo GSM"</item>
+    <item msgid="8579197487913425819">"Solo WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatico"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatico"</item>
+    <item msgid="4219607161971472471">"CDMA senza EvDo"</item>
+    <item msgid="7278975240951052041">"Solo EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globale"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Solo TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globale"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-it/strings.xml b/tests/CarDeveloperOptions/res/values-it/strings.xml
index 4bf10e9..89d101a 100644
--- a/tests/CarDeveloperOptions/res/values-it/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-it/strings.xml
@@ -370,7 +370,7 @@
     <string name="Accounts_settings_title" msgid="7901374987121953746">"Account"</string>
     <string name="location_settings_title" msgid="2707201457572301030">"Geolocalizzazione"</string>
     <string name="location_settings_master_switch_title" msgid="3108016866082816733">"Usa geolocalizzazione"</string>
-    <string name="location_settings_summary_location_off" msgid="5563530256978372978">"Off"</string>
+    <string name="location_settings_summary_location_off" msgid="5563530256978372978">"OFF"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="7893342914540884818">
       <item quantity="other">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app possono accedere alla posizione</item>
       <item quantity="one">On - <xliff:g id="COUNT_0">%1$d</xliff:g> app può accedere alla posizione</item>
@@ -390,7 +390,7 @@
     <string name="security_passwords_title" msgid="6853942836045862315">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"Disattivata dall\'amministratore"</string>
     <string name="security_status_title" msgid="1261960357751754428">"Stato sicurezza"</string>
-    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blocco schermo, Sblocco col sorriso"</string>
+    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blocco schermo, Sblocco con il volto"</string>
     <string name="security_dashboard_summary" msgid="4048877125766167227">"Blocco schermo, impronta digitale"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"Blocco schermo"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"Volto aggiunto"</string>
@@ -426,8 +426,8 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"Chiedi sempre conferma per l\'autenticazione nelle app"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Rimuovi dati viso"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Il tuo viso può essere utilizzato per sbloccare il tuo dispositivo e accedere alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
-    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Rimuovere i dati viso?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"I dati registrati da Sblocco col sorriso verranno eliminati in modo definitivo e sicuro. Dopo la rimozione, ti serviranno il tuo PIN, la tua sequenza o la tua password per sbloccare il telefono, accedere alle app e confermare i pagamenti."</string>
+    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Eliminare i dati del volto?"</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"I dati registrati da Sblocco con il volto verranno eliminati in modo definitivo e sicuro. Dopo la rimozione, ti serviranno il tuo PIN, la tua sequenza o la tua password per sbloccare il telefono, accedere alle app e confermare i pagamenti."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Impronta digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Gestisci impronte digitali"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"Utilizza l\'impronta digitale per"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Proteggi il tuo tablet con un\'opzione di blocco schermo, così nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare l\'autenticazione volti. Tocca Annulla, quindi imposta un PIN o scegli un\'altra opzione di blocco schermo."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Proteggi il tuo dispositivo con un\'opzione di blocco schermo, così nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare l\'autenticazione volti. Tocca Annulla, quindi imposta un PIN o scegli un\'altra opzione di blocco schermo."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Proteggi il tuo telefono con un\'opzione di blocco schermo, così nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare l\'autenticazione volti. Tocca Annulla, quindi imposta un PIN o scegli un\'altra opzione di blocco schermo."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Saltare impostazione del PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Saltare impostazione password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Saltare impostazione sequenza?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Imposta blocco schermo"</string>
@@ -828,7 +827,7 @@
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"Consenti il pagamento NFC e l\'utilizzo di biglietti per il trasporto pubblico solo quando lo schermo è sbloccato"</string>
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="8068287225180474199">"Pronto a trasmettere i contenuti dell\'app tramite NFC"</string>
-    <string name="android_beam_off_summary" msgid="7365818039159364600">"Off"</string>
+    <string name="android_beam_off_summary" msgid="7365818039159364600">"OFF"</string>
     <string name="nfc_disabled_summary" msgid="2181777971122724361">"Non disponibile perché la tecnologia NFC non è attiva"</string>
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
     <string name="android_beam_explained" msgid="4501176353247859329">"Quando questa funzione è attiva, puoi trasmettere contenuti di app a un altro dispositivo che supporta la tecnologia NFC tenendo vicini i dispositivi. Ad esempio, puoi trasmettere pagine web, video di YouTube, contatti e altro ancora.\n\nÈ sufficiente avvicinare i dispositivi (generalmente mettendo a contatto le parti posteriori), quindi toccare lo schermo. L\'app stabilisce quali dati trasferire."</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Rete mobile"</item>
+    <item msgid="6007360612667098926">"Solo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1180,13 +1182,13 @@
     <string name="brightness_summary" msgid="8687101964451818730">"Regola la luminosità dello schermo"</string>
     <string name="auto_brightness_title" msgid="908511534369820426">"Luminosità adattiva"</string>
     <string name="auto_brightness_summary_on" msgid="121488862610275737">"Attiva"</string>
-    <string name="auto_brightness_summary_off" msgid="8569141123211510256">"Off"</string>
+    <string name="auto_brightness_summary_off" msgid="8569141123211510256">"OFF"</string>
     <string name="auto_brightness_summary_very_low" msgid="7625647285740629347">"Luminosità preferita molto bassa"</string>
     <string name="auto_brightness_summary_low" msgid="1829314781781906712">"Luminosità preferita bassa"</string>
     <string name="auto_brightness_summary_default" msgid="4095465958108128891">"Luminosità preferita predefinita"</string>
     <string name="auto_brightness_summary_high" msgid="8980041483278767898">"Luminosità preferita alta"</string>
     <string name="auto_brightness_summary_very_high" msgid="8891768063638513875">"Luminosità preferita molto alta"</string>
-    <string name="auto_brightness_off_title" msgid="6410562081118281572">"Off"</string>
+    <string name="auto_brightness_off_title" msgid="6410562081118281572">"OFF"</string>
     <string name="auto_brightness_very_low_title" msgid="8716493755125824074">"Molto bassa"</string>
     <string name="auto_brightness_low_title" msgid="5005479920075366970">"Bassa"</string>
     <string name="auto_brightness_default_title" msgid="5446692891470912829">"Predefinita"</string>
@@ -1200,7 +1202,7 @@
     <string name="display_white_balance_title" msgid="5747260735311935143">"Bilanciamento bianco display"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Screen aware"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"On/Lo schermo non si spegne se lo stai guardando"</string>
-    <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Off"</string>
+    <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"OFF"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"Consente di impedire lo spegnimento dello schermo se lo stai guardando."</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Screen aware usa la fotocamera anteriore per controllare se qualcuno sta guardando lo schermo. Funziona sul dispositivo e le immagini non vengono mai memorizzate o inviate a Google."</string>
     <string name="night_display_title" msgid="1305002424893349814">"Luminosità notturna"</string>
@@ -1213,7 +1215,7 @@
     <string name="night_display_end_time_title" msgid="2760793157124245911">"Ora fine"</string>
     <string name="night_display_status_title" msgid="1727020934735770319">"Stato"</string>
     <string name="night_display_temperature_title" msgid="8375126629902616296">"Intensità"</string>
-    <string name="night_display_summary_off" msgid="8850539785332228069">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off" msgid="8850539785332228069">"OFF/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"Non verrà mai attivata automaticamente"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"Verrà attivata automaticamente alle ore <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"Verrà attivata automaticamente al tramonto"</string>
@@ -1244,7 +1246,7 @@
     <string name="screensaver_settings_summary_sleep" msgid="6097363596749362692">"Durante la ricarica"</string>
     <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_never" msgid="3995259444981620707">"Mai"</string>
-    <string name="screensaver_settings_summary_off" msgid="6119947316484763131">"Off"</string>
+    <string name="screensaver_settings_summary_off" msgid="6119947316484763131">"OFF"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"Attiva il salvaschermo per controllare ciò che accade quando il telefono è inserito nel dock e/o in standby."</string>
     <string name="screensaver_settings_when_to_dream" msgid="3763052013516826348">"Quando avviare"</string>
     <string name="screensaver_settings_current" msgid="4017556173596361672">"Salvaschermo attuale"</string>
@@ -2103,7 +2105,7 @@
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> apparecchio acustico salvato</item>
     </plurals>
     <string name="accessibility_summary_state_enabled" msgid="7357731696603247963">"On"</string>
-    <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"Off"</string>
+    <string name="accessibility_summary_state_disabled" msgid="9197369047683087620">"OFF"</string>
     <string name="accessibility_summary_state_stopped" msgid="3170264683616172746">"Non funziona. Tocca per avere informazioni."</string>
     <string name="accessibility_description_state_stopped" msgid="7666178628053039493">"Questo servizio non funziona correttamente."</string>
     <string name="enable_quick_setting" msgid="1580451877998661255">"Mostra in Impostazioni rapide"</string>
@@ -2139,7 +2141,7 @@
     <string name="accessibility_vibration_intensity_high" msgid="7850793704772123134">"Vibrazione alta"</string>
     <string name="accessibility_menu_item_settings" msgid="6809813639403725032">"Impostazioni"</string>
     <string name="accessibility_feature_state_on" msgid="8649102771420898911">"On"</string>
-    <string name="accessibility_feature_state_off" msgid="7536392255214437050">"Off"</string>
+    <string name="accessibility_feature_state_off" msgid="7536392255214437050">"OFF"</string>
     <string name="captioning_preview_title" msgid="6072706647310074854">"Anteprima"</string>
     <string name="captioning_standard_options_title" msgid="4124898413348084226">"Opzioni standard"</string>
     <string name="captioning_locale" msgid="4734464353806207943">"Lingua"</string>
@@ -2186,7 +2188,7 @@
     <string name="accessibility_service_default_description" msgid="857921874644864502">"Nessuna descrizione fornita."</string>
     <string name="settings_button" msgid="8557747862035866953">"Impostazioni"</string>
     <string name="print_settings" msgid="7886184656544483072">"Stampa"</string>
-    <string name="print_settings_summary_no_service" msgid="634173687975841526">"Off"</string>
+    <string name="print_settings_summary_no_service" msgid="634173687975841526">"OFF"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="7580293760281445137">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servizi di stampa attivi</item>
       <item quantity="one">1 servizio di stampa attivo</item>
@@ -2201,7 +2203,7 @@
     <string name="print_menu_item_settings" msgid="2654804159012579508">"Impostazioni"</string>
     <string name="print_menu_item_add_printers" msgid="8198201275621756510">"Aggiungi stampanti"</string>
     <string name="print_feature_state_on" msgid="1838010230650403367">"On"</string>
-    <string name="print_feature_state_off" msgid="208580346723223688">"Off"</string>
+    <string name="print_feature_state_off" msgid="208580346723223688">"OFF"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"Aggiungi servizio"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"Aggiungi stampante"</string>
     <string name="print_menu_item_search" msgid="1165316329772287360">"Cerca"</string>
@@ -2329,7 +2331,7 @@
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"Usa Battery Manager"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Rileva quando le app scaricano la batteria"</string>
     <string name="battery_manager_on" msgid="5626982529932239656">"Opzione attiva/Rileva quando le app scaricano la batteria"</string>
-    <string name="battery_manager_off" msgid="9114027524232450371">"Off"</string>
+    <string name="battery_manager_off" msgid="9114027524232450371">"OFF"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
       <item quantity="other">%1$d app con restrizioni</item>
       <item quantity="one">%1$d app con restrizioni</item>
@@ -2541,7 +2543,7 @@
     <string name="emergency_tone_summary" msgid="8035940153401622240">"Imposta il comportamento in caso di chiamata di emergenza"</string>
     <string name="privacy_settings_title" msgid="3573891462732375772">"Backup"</string>
     <string name="backup_summary_state_on" msgid="1725597360282574647">"On"</string>
-    <string name="backup_summary_state_off" msgid="7138020503288730492">"Off"</string>
+    <string name="backup_summary_state_off" msgid="7138020503288730492">"OFF"</string>
     <string name="backup_section_title" msgid="8177209731777904656">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="9161854418510071558">"Dati personali"</string>
     <string name="backup_data_title" msgid="4461508563849583624">"Backup dei miei dati"</string>
@@ -3234,8 +3236,8 @@
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Solo con priorità"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2800265178411749309">"Off"</string>
+    <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"OFF/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="zen_mode_sound_summary_off" msgid="2800265178411749309">"OFF"</string>
     <string name="zen_mode_sound_summary_on" msgid="6964666541479146310">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7642321938427056823">"Chiedi ogni volta (a meno che l\'opzione non sia stata attivata automaticamente)"</string>
     <string name="zen_mode_duration_summary_forever" msgid="4563938129424903030">"Fino alla disattivazione (a meno che l\'opzione non sia stata attivata automaticamente)"</string>
@@ -3546,7 +3548,7 @@
     <string name="device_feedback" msgid="4042352891448769818">"Invia feedback sul dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="8577847751493521230">"Inserisci PIN amministratore"</string>
     <string name="switch_on_text" msgid="7100491749799298324">"On"</string>
-    <string name="switch_off_text" msgid="3539551289454353555">"Off"</string>
+    <string name="switch_off_text" msgid="3539551289454353555">"OFF"</string>
     <string name="screen_pinning_title" msgid="578020318289781102">"Blocco su schermo"</string>
     <string name="screen_pinning_description" msgid="3814537379086412278">"Quando l\'impostazione è attiva, puoi usare il blocco su schermo per lasciare visibile la schermata corrente finché non la sblocchi.\n\nPer usare la funzione:\n\n1. Assicurati che il blocco su schermo sia attivo\n\n2. Apri Panoramica\n\n3. Tocca l\'icona dell\'app in alto nella schermata, quindi tocca Blocca"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1060334707088339444">"Richiedi sequenza di sblocco prima di sbloccare"</string>
@@ -3597,7 +3599,7 @@
     <string name="notifications_label" msgid="2792398288062643318">"Notifiche"</string>
     <string name="notifications_enabled" msgid="439339392141736137">"On"</string>
     <string name="notifications_enabled_with_info" msgid="7706460489443809452">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g>/<xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
-    <string name="notifications_disabled" msgid="316658185757688983">"Off"</string>
+    <string name="notifications_disabled" msgid="316658185757688983">"OFF"</string>
     <string name="notifications_partly_blocked" msgid="6330451240669068819">"<xliff:g id="COUNT_0">%1$d</xliff:g> di <xliff:g id="COUNT_1">%2$d</xliff:g> categorie disattivate"</string>
     <string name="notifications_silenced" msgid="538923056987616372">"Senza audio"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"Nessun contenuto riservato nella schermata di blocco"</string>
@@ -3818,7 +3820,7 @@
     <string name="write_settings_description" msgid="2536706293042882500">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"Sì"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"No"</string>
-    <string name="external_source_switch_title" msgid="5947220058496373178">"Consenti da questa fonte"</string>
+    <string name="external_source_switch_title" msgid="5947220058496373178">"Consenti da questa origine"</string>
     <string name="camera_gesture_title" msgid="899403310746415135">"Doppia rotazione per fotocamera"</string>
     <string name="camera_gesture_desc" msgid="7751841175916789527">"Apri l\'app Fotocamera ruotando due volte il polso"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="8874747801078147525">"Premi due volte tasto di acc. per fotoc."</string>
@@ -3982,7 +3984,7 @@
     <string name="unrestricted_data_saver" msgid="9139401849550738720">"Dati senza limitazioni"</string>
     <string name="restrict_background_blacklisted" msgid="7158991683849067124">"I dati in background sono disattivati"</string>
     <string name="data_saver_on" msgid="7281809065420480881">"On"</string>
-    <string name="data_saver_off" msgid="7439439787358504018">"Off"</string>
+    <string name="data_saver_off" msgid="7439439787358504018">"OFF"</string>
     <string name="data_saver_switch_title" msgid="8244008132112735207">"Usa Risparmio dati"</string>
     <string name="unrestricted_app_title" msgid="4390661122069905122">"Uso dati senza limitazioni"</string>
     <string name="unrestricted_app_summary" msgid="2829141815077800483">"Consenti accesso senza limitazioni con Risparmio dati attivo"</string>
@@ -4135,7 +4137,7 @@
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="7950264130913070035">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="948946491233738823">"Visualizza rapidamente le notifiche"</string>
     <string name="gesture_setting_on" msgid="7573680730101327866">"On"</string>
-    <string name="gesture_setting_off" msgid="2540159841716890511">"Off"</string>
+    <string name="gesture_setting_off" msgid="2540159841716890511">"OFF"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="7233244080078311793">"Il bootloader è già sbloccato"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="262986780389836168">"Devi prima connetterti a Internet"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="3331374502670483142">"Connettiti a Internet o contatta il tuo operatore"</string>
@@ -4150,9 +4152,9 @@
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"Il tuo spazio di archiviazione è ora gestito dalla Gestione memoria"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"Account di <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"Configurazione"</string>
-    <string name="auto_sync_account_title" msgid="2394463123733529506">"Sincronizza i dati automaticamente"</string>
-    <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Sincronizza i dati personali automaticamente"</string>
-    <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Sincronizza i dati di lavoro automaticamente"</string>
+    <string name="auto_sync_account_title" msgid="2394463123733529506">"Sincronizza dati automaticamente"</string>
+    <string name="auto_sync_personal_account_title" msgid="6844465157916100655">"Sincronizza dati personali automaticamente"</string>
+    <string name="auto_sync_work_account_title" msgid="2403222633447522376">"Sincronizza dati di lavoro automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="6316230976974033772">"Consenti aggiornamento automatico dei dati delle app"</string>
     <string name="account_sync_title" msgid="1570164819114297154">"Sincronizzazione account"</string>
     <string name="account_sync_summary_some_on" msgid="1934556869158274053">"Sincronizzazione attiva per <xliff:g id="ID_1">%1$d</xliff:g> elementi su <xliff:g id="ID_2">%2$d</xliff:g>"</string>
@@ -4236,7 +4238,7 @@
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"utilizzati di <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6924662861545958442">"usato"</string>
-    <string name="clear_instant_app_data" msgid="3673669086522890405">"Cancella dati dall\'app"</string>
+    <string name="clear_instant_app_data" msgid="3673669086522890405">"Cancella app"</string>
     <string name="clear_instant_app_confirmation" msgid="1778553115373698061">"Vuoi rimuovere questa app istantanea?"</string>
     <string name="launch_instant_app" msgid="5251693061228352333">"Apri"</string>
     <string name="game_storage_settings" msgid="6856911551799175914">"Giochi"</string>
@@ -4258,7 +4260,7 @@
     <string name="show_operator_name_title" msgid="5056163028128447308">"Nome della rete"</string>
     <string name="show_operator_name_summary" msgid="6352180285743777497">"Nome della Rete Display nella bara di stato"</string>
     <string name="storage_manager_indicator" msgid="4255140732848476875">"Gestione memoria: <xliff:g id="STATUS">^1</xliff:g>"</string>
-    <string name="storage_manager_indicator_off" msgid="6404056007102580777">"Off"</string>
+    <string name="storage_manager_indicator_off" msgid="6404056007102580777">"OFF"</string>
     <string name="storage_manager_indicator_on" msgid="5295306384982062320">"Attiva"</string>
     <string name="install_type_instant" msgid="6248487669862821874">"App istantanea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"Disattivare la gestione della memoria?"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Rallenta il telefono"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forza esecuzione completa delle misurazioni GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Monitora tutte le costellazioni e le frequenze GNSS senza ciclo di lavoro utile"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Esegui il debug del cambio utente"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Mostra informazioni dettagliate durante il cambio utente"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Consenti l\'avvio dell\'attività in background"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Consente l\'avvio di tutte le attività in background"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Mostra sempre finestra di dialogo di arresti anomali"</string>
@@ -4379,7 +4383,7 @@
     <string name="mobile_data_settings_summary" msgid="6492798151325636912">"Accedi ai dati tramite la rete mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"Il telefono passerà automaticamente a questo operatore quando si trova in portata"</string>
     <string name="calls_preference" msgid="2076353032705811243">"Preferenza per le chiamate"</string>
-    <string name="sms_preference" msgid="8449270011976880">"Preferenza per SMS"</string>
+    <string name="sms_preference" msgid="8449270011976880">"Preferenza per gli SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="2776167541223210738">"Chiedi ogni volta"</string>
     <string name="mobile_network_summary_add_a_network" msgid="5408745221357144009">"Aggiungi una rete"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6222822873390636020">
@@ -4403,7 +4407,7 @@
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"Nome SIM"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Rinomina"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Utilizza SIM"</string>
-    <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"Off"</string>
+    <string name="mobile_network_use_sim_off" msgid="2077820358051946635">"OFF"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="6077154427380613615">"Passare a <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
     <string name="mobile_network_esim_swap_confirm_body" msgid="1192274915146275063">"È possibile attivare una sola SIM scaricata alla volta.\n\nIl passaggio a <xliff:g id="CARRIER1">%1$s</xliff:g> non annullerà il servizio di <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"Passa a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
diff --git a/tests/CarDeveloperOptions/res/values-iw-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-iw-nokeys/strings.xml
new file mode 100644
index 0000000..5887fc4
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-iw-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ניהול אפליקציות"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-iw/arrays.xml b/tests/CarDeveloperOptions/res/values-iw/arrays.xml
new file mode 100644
index 0000000..cf0a6b7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-iw/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"אמריקה"</item>
+    <item msgid="4791956477275129121">"אירופה"</item>
+    <item msgid="3812126832016254559">"אפריקה"</item>
+    <item msgid="2765816300353408280">"אסיה"</item>
+    <item msgid="6683489385344409742">"אוסטרליה"</item>
+    <item msgid="5194868215515664953">"האוקיינוס השקט"</item>
+    <item msgid="7044520255415007865">"הכול"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 שניות"</item>
+    <item msgid="772029947136115322">"30 שניות"</item>
+    <item msgid="8743663928349474087">"דקה"</item>
+    <item msgid="1506508631223164814">"2 דקות"</item>
+    <item msgid="8664703938127907662">"5 דקות"</item>
+    <item msgid="5827960506924849753">"10 דקות"</item>
+    <item msgid="6677424950124253938">"30 דקות"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"אף פעם"</item>
+    <item msgid="2517785806387977252">"15 שניות"</item>
+    <item msgid="6347954399441173672">"30 שניות"</item>
+    <item msgid="4858305253279921789">"דקה"</item>
+    <item msgid="8109273437140044073">"2 דקות"</item>
+    <item msgid="2788593551142462622">"5 דקות"</item>
+    <item msgid="8012672183888404961">"10 דקות"</item>
+    <item msgid="8271452751594598661">"30 דקות"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"מיד"</item>
+    <item msgid="2038544972632026612">"5 שניות"</item>
+    <item msgid="5558060663472279597">"15 שניות"</item>
+    <item msgid="45341168505452037">"30 שניות"</item>
+    <item msgid="227647485917789272">"דקה"</item>
+    <item msgid="3367011891231217504">"2 דקות"</item>
+    <item msgid="4376575879222393045">"5 דקות"</item>
+    <item msgid="811192536981678974">"10 דקות"</item>
+    <item msgid="7258394417241706272">"30 דקות"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"קטן"</item>
+    <item msgid="591935967183159581">"ברירת מחדל"</item>
+    <item msgid="1714184661981538355">"גדול"</item>
+    <item msgid="6195563047686707484">"הכי גדול"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"סורק..."</item>
+    <item msgid="5597394826455877834">"מתחבר…"</item>
+    <item msgid="5848277343965362748">"מאמת…"</item>
+    <item msgid="3391238031431440676">"משיג כתובת IP…"</item>
+    <item msgid="5257597310494000224">"מחובר"</item>
+    <item msgid="8472497592913050396">"בהשעיה"</item>
+    <item msgid="1228072488815999109">"מתנתק..."</item>
+    <item msgid="7253087004422991731">"מנותק"</item>
+    <item msgid="4169850917304751227">"נכשל"</item>
+    <item msgid="6266658166690831131">"חסום"</item>
+    <item msgid="4517230805854909775">"נמנע זמנית מחיבור חלש"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"סורק..."</item>
+    <item msgid="8058143476674427024">"מתחבר אל <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"מאמת עם <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"משיג כתובת IP מתוך <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"מחובר אל <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"בהשעיה"</item>
+    <item msgid="4133290864821295785">"מתנתק מרשת <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"מנותק"</item>
+    <item msgid="2847316776634969068">"נכשל"</item>
+    <item msgid="4390990424746035383">"חסום"</item>
+    <item msgid="3618248791367063949">"נמנע זמנית מחיבור חלש"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"לחצן דחיפה"</item>
+    <item msgid="7401896200768713930">"קוד גישה ממכשיר עמית"</item>
+    <item msgid="4526848028011846710">"קוד גישה ממכשיר זה"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"מחובר"</item>
+    <item msgid="983792611851499732">"הוזמן"</item>
+    <item msgid="5438273405428201793">"נכשל"</item>
+    <item msgid="4646663015449312554">"זמין"</item>
+    <item msgid="3230556734162006146">"מחוץ לטווח"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 דקות"</item>
+    <item msgid="2759776603549270587">"5 דקות"</item>
+    <item msgid="167772676068860015">"שעה אחת"</item>
+    <item msgid="5985477119043628504">"ללא זמן קצוב לתפוגה"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"שימוש בברירת המחדל של המערכת: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"חלשה"</item>
+    <item msgid="7882129634982603782">"חלש"</item>
+    <item msgid="6457357501905996224">"סבירה"</item>
+    <item msgid="405271628162918841">"טובה"</item>
+    <item msgid="999948812884919584">"מצוין"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 הימים האחרונים"</item>
+    <item msgid="3211287705232736964">"הגדר מחזור שימוש..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"זמן שימוש"</item>
+    <item msgid="2784401352592276015">"מועד שימוש אחרון"</item>
+    <item msgid="249854287216326349">"שם האפליקציה"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ללא"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ללא"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ללא"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"סטטי"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ללא"</item>
+    <item msgid="1464741437353223198">"ידני"</item>
+    <item msgid="5793600062487886090">"הגדרה אוט\' לשרת proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ללא"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP או CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"לא צוין"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ללא"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"אחסון פנימי במכשיר"</item>
+    <item msgid="3186681694079967527">"כרטיס SD נשלף"</item>
+    <item msgid="6902033473986647035">"המערכת תחליט"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"מיקום"</item>
+    <item msgid="6842381562497597649">"אישי"</item>
+    <item msgid="3966700236695683444">"העברת הודעות"</item>
+    <item msgid="8563996233342430477">"מדיה"</item>
+    <item msgid="5323851085993963783">"מכשיר"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"מיקום משוער"</item>
+    <item msgid="1830619568689922920">"מיקום מדויק"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"רטט"</item>
+    <item msgid="8632513128515114092">"קרא אנשי קשר"</item>
+    <item msgid="3741042113569620272">"שנה אנשי קשר"</item>
+    <item msgid="4204420969709009931">"קרא יומן שיחות"</item>
+    <item msgid="2260380357119423209">"שנה יומן שיחות"</item>
+    <item msgid="6550710385014530934">"קרא יומן"</item>
+    <item msgid="3575906174264853951">"שנה יומן"</item>
+    <item msgid="4319843242568057174">"סריקת Wi-Fi"</item>
+    <item msgid="2981791890467303819">"התראה"</item>
+    <item msgid="6617825156152476692">"סריקה סלולרית"</item>
+    <item msgid="8865260890611559753">"שיחת טלפון"</item>
+    <item msgid="3254999273961542982">"קרא SMS"</item>
+    <item msgid="7711446453028825171">"כתוב SMS"</item>
+    <item msgid="6123238544099198034">"קבל SMS"</item>
+    <item msgid="838342167431596036">"קבל SMS חירום"</item>
+    <item msgid="8554432731560956686">"קבל MMS"</item>
+    <item msgid="7464863464299515059">"קבל WAP בדחיפה"</item>
+    <item msgid="310463075729606765">"שלח SMS"</item>
+    <item msgid="7338021933527689514">"קרא ICC SMS"</item>
+    <item msgid="6130369335466613036">"כתוב ICC SMS"</item>
+    <item msgid="6536865581421670942">"שנה הגדרות"</item>
+    <item msgid="4547203129183558973">"צייר מעל"</item>
+    <item msgid="9080347512916542840">"גישה אל התראות"</item>
+    <item msgid="5332718516635907742">"מצלמה"</item>
+    <item msgid="6098422447246167852">"הקלט אודיו"</item>
+    <item msgid="9182794235292595296">"הפעל את האודיו"</item>
+    <item msgid="8760743229597702019">"קרא לוח"</item>
+    <item msgid="2266923698240538544">"שנה לוח"</item>
+    <item msgid="1801619438618539275">"לחצני מדיה"</item>
+    <item msgid="31588119965784465">"מיקוד אודיו"</item>
+    <item msgid="7565226799008076833">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="5420704980305018295">"עוצמת קול של דיבור"</item>
+    <item msgid="5797363115508970204">"עוצמת קול של צלצול"</item>
+    <item msgid="8233154098550715999">"עוצמת קול של מדיה"</item>
+    <item msgid="5196715605078153950">"עוצמת קול של התרעה"</item>
+    <item msgid="394030698764284577">"עוצמת קול של התראה"</item>
+    <item msgid="8952898972491680178">"עוצמת קול של Bluetooth"</item>
+    <item msgid="8506227454543690851">"שמור במצב פעיל"</item>
+    <item msgid="1108160036049727420">"עקוב אחר מיקום"</item>
+    <item msgid="1496205959751719491">"מעקב אחר מיקום עם צריכת סוללה גבוהה"</item>
+    <item msgid="3776296279910987380">"קבל סטטיסטיקת שימוש"</item>
+    <item msgid="8827100324471975602">"השתק/בטל השתקה של המיקרופון"</item>
+    <item msgid="6880736730520126864">"הצגת הודעה קופצת"</item>
+    <item msgid="4933375960222609935">"הקרן מדיה"</item>
+    <item msgid="8357907018938895462">"הפעלת VPN"</item>
+    <item msgid="8143812849911310973">"כתיבת טפט"</item>
+    <item msgid="6266277260961066535">"סיוע למבנה"</item>
+    <item msgid="7715498149883482300">"סיוע לצילום מסך"</item>
+    <item msgid="4046679376726313293">"קריאת מצב טלפון"</item>
+    <item msgid="6329507266039719587">"הוספת דואר קולי"</item>
+    <item msgid="7692440726415391408">"שימוש ב-SIP"</item>
+    <item msgid="8572453398128326267">"עיבוד שיחה יוצאת"</item>
+    <item msgid="7775674394089376306">"טביעת אצבע"</item>
+    <item msgid="3182815133441738779">"חיישני גוף"</item>
+    <item msgid="2793100005496829513">"קריאת שידורים סלולריים"</item>
+    <item msgid="2633626056029384366">"הדמיית מיקום"</item>
+    <item msgid="8356842191824684631">"קריאת אחסון"</item>
+    <item msgid="5671906070163291500">"כתיבת אחסון"</item>
+    <item msgid="2791955098549340418">"הפעלת מסך"</item>
+    <item msgid="5599435119609178367">"קבלת חשבונות"</item>
+    <item msgid="1165623660533024666">"הרצה ברקע"</item>
+    <item msgid="6423861043647911030">"עוצמת קול של נגישות"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"קצר"</item>
+    <item msgid="4816511817309094890">"בינונית"</item>
+    <item msgid="8305084671259331134">"ארוך"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ברירת מחדל"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif דחוס"</item>
+    <item msgid="6529379119163117545">"Sans-serif עם רווח יחיד"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif עם רווח יחיד"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"כתב-יד"</item>
+    <item msgid="6896773537705206194">"רישיות קטנות"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"קטן מאוד"</item>
+    <item msgid="5091603983404027034">"קטן"</item>
+    <item msgid="176844712416932112">"רגיל"</item>
+    <item msgid="2784236342175159295">"גדול"</item>
+    <item msgid="218913203203160606">"גדול מאוד"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ברירת מחדל"</item>
+    <item msgid="6488643537808152001">"ללא"</item>
+    <item msgid="552332815156010137">"קו מתאר"</item>
+    <item msgid="7187891159463789272">"הטלת צללית"</item>
+    <item msgid="8019330250538856521">"מובלט"</item>
+    <item msgid="8987385315647049787">"שקוע"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"ברירות המחדל של האפליקציה"</item>
+    <item msgid="8611890312638868524">"לבן על גבי שחור"</item>
+    <item msgid="5891360837786277638">"שחור על גבי לבן"</item>
+    <item msgid="2798457065945456853">"צהוב על גבי שחור"</item>
+    <item msgid="5799049811524553967">"צהוב על גבי כחול"</item>
+    <item msgid="3673930830658169860">"מותאם אישית"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN עם מפתחות משותפים מראש"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN עם אישורים"</item>
+    <item msgid="312397853907741968">"IPSec VPN עם מפתחות משותפים מראש ואימות Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN עם אישורים ואימות Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN עם אישורים ואימות משולב"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ללא"</item>
+    <item msgid="1157046369795346308">"ידני"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"מנותק"</item>
+    <item msgid="8754480102834556765">"מאתחל..."</item>
+    <item msgid="3351334355574270250">"מתחבר…"</item>
+    <item msgid="8303882153995748352">"מחובר"</item>
+    <item msgid="9135049670787351881">"זמן קצוב לתפוגה"</item>
+    <item msgid="2124868417182583926">"נכשל"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"שאל"</item>
+    <item msgid="7718817231348607934">"לעולם אל תאפשר"</item>
+    <item msgid="8184570120217958741">"אפשר תמיד"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"קבוע"</item>
+    <item msgid="167418068739176448">"פעילות מובילה"</item>
+    <item msgid="4760813290195199773">"חשוב (קדמה)"</item>
+    <item msgid="2328684826817647595">"חשוב (רקע)"</item>
+    <item msgid="7746406490652867365">"גיבוי"</item>
+    <item msgid="5597404364389196754">"משקל כבד"</item>
+    <item msgid="1290888779300174556">"שירות (פועל)"</item>
+    <item msgid="7241098542073939046">"שירות (מאתחל)"</item>
+    <item msgid="6610439017684111046">"מקבל"</item>
+    <item msgid="7367606086319921117">"דף הבית"</item>
+    <item msgid="3344660712396741826">"פעילות אחרונה"</item>
+    <item msgid="5006559348883303865">"בקובץ שמור (פעילות)"</item>
+    <item msgid="8633480732468137525">"בקובץ שמור (לקוח פעילות)"</item>
+    <item msgid="6248998242443333892">"בקובץ שמור (ריק)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"כחול-ירקרק"</item>
+    <item msgid="3228505970082457852">"כחול"</item>
+    <item msgid="6590260735734795647">"כחול כהה"</item>
+    <item msgid="3521763377357218577">"סגול"</item>
+    <item msgid="5932337981182999919">"ורוד"</item>
+    <item msgid="5642914536624000094">"אדום"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"בני למעלה מ-30 ימים"</item>
+    <item msgid="8699273238891265610">"בני למעלה מ-60 ימים"</item>
+    <item msgid="8346279419423837266">"בני למעלה מ-90 ימים"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"גילוי אוטומטי"</item>
+    <item msgid="773943026484148895">"יש להתייחס כרשת נמדדת"</item>
+    <item msgid="1008268820118852416">"יש להתייחס כרשת לא נמדדת"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"שימוש ב-MAC אקראי (ברירת מחדל)"</item>
+    <item msgid="214234417308375326">"שימוש ב-MAC של המכשיר"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"לא"</item>
+    <item msgid="1930581185557754880">"כן"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"כהה"</item>
+    <item msgid="5079453644557603349">"בהיר"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"כבוי"</item>
+    <item msgid="4072198137051566919">"ניפוי באגים"</item>
+    <item msgid="2473005316958868509">"מרובה-מילים"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"בית בלבד"</item>
+    <item msgid="1161026694891024702">"באופן אוטומטי"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA מועדפת"</item>
+    <item msgid="7581481130337402578">"GSM בלבד"</item>
+    <item msgid="8579197487913425819">"WCDMA בלבד"</item>
+    <item msgid="8465243227505412498">"GSM/‏WCDMA אוטומטית"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo אוטומטית"</item>
+    <item msgid="4219607161971472471">"CDMA ללא EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo בלבד"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"כללי"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA בלבד"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"כללי"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-iw/strings.xml b/tests/CarDeveloperOptions/res/values-iw/strings.xml
index 944373f..3b30e25 100644
--- a/tests/CarDeveloperOptions/res/values-iw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-iw/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"כדאי להגן על הטאבלט באמצעות אפשרות של נעילת מסך כדי שאף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר אימות פנים. יש להקיש על ביטול, ואז להגדיר קוד אימות או לבחור באפשרות אחרת של נעילת מסך."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"כדאי להגן על המכשיר באמצעות אפשרות של נעילת מסך כדי שאף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר אימות פנים. יש להקיש על ביטול, ואז להגדיר קוד אימות או לבחור באפשרות אחרת של נעילת מסך."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"כדאי להגן על הטלפון באמצעות אפשרות של נעילת מסך כדי שאף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר אימות פנים. יש להקיש על ביטול, ואז להגדיר קוד אימות או לבחור באפשרות אחרת של נעילת מסך."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"לדלג על הגדרת קוד האימות?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"לדלג על הגדרת הסיסמה?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"לדלג על הגדרת קו ביטול הנעילה?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"הגדר נעילת מסך"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"‎@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"סלולרי"</item>
+    <item msgid="6007360612667098926">"Wi-Fi בלבד"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"‎@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2689,7 +2691,7 @@
     <string name="header_data_and_synchronization" msgid="400831816068697286">"נתונים וסינכרון"</string>
     <string name="preference_change_password_title" msgid="7243527448378789274">"שנה סיסמה"</string>
     <string name="header_account_settings" msgid="8586173964125512219">"הגדרות חשבון"</string>
-    <string name="remove_account_label" msgid="5885425720323823387">"הסר חשבון"</string>
+    <string name="remove_account_label" msgid="5885425720323823387">"הסרת החשבון"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"הוספת חשבון"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"להסיר את החשבון?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"הסרת חשבון זה תגרום להסרת כל ההודעות, אנשי הקשר ונתונים נוספים מהטאבלט!"</string>
@@ -3471,7 +3473,7 @@
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"אין אפליקציות מותקנות שתומכות ב\'תמונה בתוך תמונה\'"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"תמונה בתוך תמונה"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"אפשר תמונה בתוך תמונה"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"עם תמונה בתוך תמונה"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"אפליקציה זו תוכל ליצור חלון מסוג תמונה-בתוך-תמונה בזמן שהיא תהיה פתוחה או לאחר היציאה ממנה (למשל, כדי להמשיך לצפות בסרטון). חלון זה מוצג מעל אפליקציות אחרות שנמצאות בשימוש."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"הפעלת ההרשאה \'נא לא להפריע\'"</string>
@@ -3916,7 +3918,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"תצוגה מעל אפליקציות אחרות"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"אפליקציות"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"תצוגה מעל אפליקציות אחרות"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"אפשר הצגה מעל אפליקציות אחרות"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"הצגה מעל אפליקציות אחרות"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"הגדרה זו מתירה לאפליקציה להופיע מעל אפליקציות אחרות שנמצאות בשימוש. הפעולה הזאת עשויה להפריע לשימוש שלך באפליקציות האלה או לשנות את האופן שבו הן מוצגות או מתנהגות."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"שירות מסייע של מציאות מדומה VR להאזנה סטריאופונית"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"חלון ההתרעה יוצג מעל אפליקציות אחרות"</string>
@@ -3931,8 +3933,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות לשנות את הגדרות המערכת"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"גישת SMS לאפליקציות פיננסיות"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"יכולה להתקין אפליקציות אחרות"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"יכולות לשנות את הגדרות המערכת"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"יכולות לשנות את הגדרות המערכת"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"שינוי הגדרות המערכת"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"שינוי הגדרות המערכת"</string>
     <string name="write_system_settings" msgid="20450765210832463">"שינוי הגדרות המערכת"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"הרשאה לשנות את הגדרות המערכת"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
@@ -4426,6 +4428,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"הטלפון יפעל באיטיות עם תכונה זו"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"אילוץ של הרצה מלאה של מדידות Gnss"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"מעקב אחר כל מערכות הניווט והתדרים של GNSS ללא מחזור פעילות"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ניפוי באגים בהחלפת משתמש"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"הצגת מידע מפורט במהלך החלפת משתמש"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"הפעלת התחלות של פעילות ברקע"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"הפעלת כל ההתחלות של הפעילות ברקע"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"הצג תמיד דו-שיח של קריסות מחשב"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ja-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ja-nokeys/strings.xml
new file mode 100644
index 0000000..c7ccad0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ja-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"アプリケーションを管理"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ja/arrays.xml b/tests/CarDeveloperOptions/res/values-ja/arrays.xml
new file mode 100644
index 0000000..fc69723
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ja/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"アメリカ"</item>
+    <item msgid="4791956477275129121">"ヨーロッパ"</item>
+    <item msgid="3812126832016254559">"アフリカ"</item>
+    <item msgid="2765816300353408280">"アジア"</item>
+    <item msgid="6683489385344409742">"オーストラリア"</item>
+    <item msgid="5194868215515664953">"太平洋"</item>
+    <item msgid="7044520255415007865">"すべて"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15秒"</item>
+    <item msgid="772029947136115322">"30秒"</item>
+    <item msgid="8743663928349474087">"1分"</item>
+    <item msgid="1506508631223164814">"2分"</item>
+    <item msgid="8664703938127907662">"5分"</item>
+    <item msgid="5827960506924849753">"10分"</item>
+    <item msgid="6677424950124253938">"30分"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"なし"</item>
+    <item msgid="2517785806387977252">"15秒"</item>
+    <item msgid="6347954399441173672">"30秒"</item>
+    <item msgid="4858305253279921789">"1分"</item>
+    <item msgid="8109273437140044073">"2分"</item>
+    <item msgid="2788593551142462622">"5分"</item>
+    <item msgid="8012672183888404961">"10分"</item>
+    <item msgid="8271452751594598661">"30分"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"すぐ"</item>
+    <item msgid="2038544972632026612">"5秒"</item>
+    <item msgid="5558060663472279597">"15秒"</item>
+    <item msgid="45341168505452037">"30秒"</item>
+    <item msgid="227647485917789272">"1分"</item>
+    <item msgid="3367011891231217504">"2分"</item>
+    <item msgid="4376575879222393045">"5分"</item>
+    <item msgid="811192536981678974">"10分"</item>
+    <item msgid="7258394417241706272">"30分"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"小"</item>
+    <item msgid="591935967183159581">"デフォルト"</item>
+    <item msgid="1714184661981538355">"大"</item>
+    <item msgid="6195563047686707484">"最大"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"スキャン中..."</item>
+    <item msgid="5597394826455877834">"接続しています..."</item>
+    <item msgid="5848277343965362748">"認証しています..."</item>
+    <item msgid="3391238031431440676">"IPアドレスを取得中..."</item>
+    <item msgid="5257597310494000224">"接続済み"</item>
+    <item msgid="8472497592913050396">"強制停止"</item>
+    <item msgid="1228072488815999109">"切断中..."</item>
+    <item msgid="7253087004422991731">"切断"</item>
+    <item msgid="4169850917304751227">"失敗"</item>
+    <item msgid="6266658166690831131">"ブロック済み"</item>
+    <item msgid="4517230805854909775">"接続不良により一時的に無効"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"スキャンしています..."</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続中..."</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>で認証しています..."</item>
+    <item msgid="5145158315060185414">"IPアドレスを<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から取得しています..."</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>に接続しました"</item>
+    <item msgid="6600156231416890902">"強制停止"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
+    <item msgid="3980154971187953257">"切断"</item>
+    <item msgid="2847316776634969068">"失敗"</item>
+    <item msgid="4390990424746035383">"ブロック済み"</item>
+    <item msgid="3618248791367063949">"接続不良により一時的に無効"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"プッシュボタン"</item>
+    <item msgid="7401896200768713930">"ピアデバイスのPIN"</item>
+    <item msgid="4526848028011846710">"このデバイスのPIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"接続済み"</item>
+    <item msgid="983792611851499732">"招待済み"</item>
+    <item msgid="5438273405428201793">"失敗"</item>
+    <item msgid="4646663015449312554">"使用可能"</item>
+    <item msgid="3230556734162006146">"圏外"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2分"</item>
+    <item msgid="2759776603549270587">"5分"</item>
+    <item msgid="167772676068860015">"1時間"</item>
+    <item msgid="5985477119043628504">"タイムアウトしない"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"システムのデフォルトを使用: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"弱"</item>
+    <item msgid="7882129634982603782">"弱"</item>
+    <item msgid="6457357501905996224">"中"</item>
+    <item msgid="405271628162918841">"強"</item>
+    <item msgid="999948812884919584">"非常に強い"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"過去30日間"</item>
+    <item msgid="3211287705232736964">"使用サイクルを設定..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"使用時間"</item>
+    <item msgid="2784401352592276015">"前回の使用"</item>
+    <item msgid="249854287216326349">"アプリ名"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"なし"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"なし"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"なし"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"静的"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"なし"</item>
+    <item msgid="1464741437353223198">"マニュアル"</item>
+    <item msgid="5793600062487886090">"プロキシの自動設定"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"なし"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAPまたはCHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"指定なし"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"なし"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"内部デバイスストレージ"</item>
+    <item msgid="3186681694079967527">"リムーバブルSDカード"</item>
+    <item msgid="6902033473986647035">"システムで判断する"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"現在地"</item>
+    <item msgid="6842381562497597649">"ユーザー設定"</item>
+    <item msgid="3966700236695683444">"メッセージ"</item>
+    <item msgid="8563996233342430477">"メディア"</item>
+    <item msgid="5323851085993963783">"デバイス"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"おおよその位置情報"</item>
+    <item msgid="1830619568689922920">"精細な位置情報"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"バイブレーション"</item>
+    <item msgid="8632513128515114092">"連絡先の読み取り"</item>
+    <item msgid="3741042113569620272">"連絡先の変更"</item>
+    <item msgid="4204420969709009931">"通話履歴の読み取り"</item>
+    <item msgid="2260380357119423209">"通話履歴の変更"</item>
+    <item msgid="6550710385014530934">"カレンダーの読み取り"</item>
+    <item msgid="3575906174264853951">"カレンダーの変更"</item>
+    <item msgid="4319843242568057174">"Wi-Fiスキャン"</item>
+    <item msgid="2981791890467303819">"通知"</item>
+    <item msgid="6617825156152476692">"セルスキャン"</item>
+    <item msgid="8865260890611559753">"通話の発信"</item>
+    <item msgid="3254999273961542982">"SMSの読み取り"</item>
+    <item msgid="7711446453028825171">"SMSの書き込み"</item>
+    <item msgid="6123238544099198034">"SMSの受信"</item>
+    <item msgid="838342167431596036">"緊急SMSの受信"</item>
+    <item msgid="8554432731560956686">"MMSの受信"</item>
+    <item msgid="7464863464299515059">"WAPプッシュの受信"</item>
+    <item msgid="310463075729606765">"SMSの送信"</item>
+    <item msgid="7338021933527689514">"ICC SMSの読み取り"</item>
+    <item msgid="6130369335466613036">"ICC SMSの書き込み"</item>
+    <item msgid="6536865581421670942">"設定の変更"</item>
+    <item msgid="4547203129183558973">"上部に描画"</item>
+    <item msgid="9080347512916542840">"通知へのアクセス"</item>
+    <item msgid="5332718516635907742">"カメラ"</item>
+    <item msgid="6098422447246167852">"音声の録音"</item>
+    <item msgid="9182794235292595296">"音声の再生"</item>
+    <item msgid="8760743229597702019">"クリップボードの読み取り"</item>
+    <item msgid="2266923698240538544">"クリップボードの変更"</item>
+    <item msgid="1801619438618539275">"メディアボタン"</item>
+    <item msgid="31588119965784465">"音声フォーカス"</item>
+    <item msgid="7565226799008076833">"主音量"</item>
+    <item msgid="5420704980305018295">"音声の音量"</item>
+    <item msgid="5797363115508970204">"着信音の音量"</item>
+    <item msgid="8233154098550715999">"メディアの音量"</item>
+    <item msgid="5196715605078153950">"アラームの音量"</item>
+    <item msgid="394030698764284577">"通知音量"</item>
+    <item msgid="8952898972491680178">"Bluetoothの音量"</item>
+    <item msgid="8506227454543690851">"スリープモードにしない"</item>
+    <item msgid="1108160036049727420">"場所を監視"</item>
+    <item msgid="1496205959751719491">"高精度の現在地情報を監視"</item>
+    <item msgid="3776296279910987380">"使用統計情報を取得"</item>
+    <item msgid="8827100324471975602">"マイクをミュート/ミュート解除"</item>
+    <item msgid="6880736730520126864">"トーストの表示"</item>
+    <item msgid="4933375960222609935">"メディアプロジェクション"</item>
+    <item msgid="8357907018938895462">"VPN の有効化"</item>
+    <item msgid="8143812849911310973">"壁紙の書き込み"</item>
+    <item msgid="6266277260961066535">"ストラクチャのアシスト"</item>
+    <item msgid="7715498149883482300">"スクリーンショットのアシスト"</item>
+    <item msgid="4046679376726313293">"スマートフォンのステータスの読み取り"</item>
+    <item msgid="6329507266039719587">"ボイスメールの追加"</item>
+    <item msgid="7692440726415391408">"SIP の使用"</item>
+    <item msgid="8572453398128326267">"発信の処理"</item>
+    <item msgid="7775674394089376306">"指紋"</item>
+    <item msgid="3182815133441738779">"ボディー センサー"</item>
+    <item msgid="2793100005496829513">"緊急速報メールの読み取り"</item>
+    <item msgid="2633626056029384366">"仮の現在地情報"</item>
+    <item msgid="8356842191824684631">"ストレージの読み取り"</item>
+    <item msgid="5671906070163291500">"ストレージへの書き込み"</item>
+    <item msgid="2791955098549340418">"画面をオン"</item>
+    <item msgid="5599435119609178367">"アカウントの取得"</item>
+    <item msgid="1165623660533024666">"バックグラウンドで実行"</item>
+    <item msgid="6423861043647911030">"ユーザー補助機能の音量"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"現在地"</item>
+    <item msgid="6656077694190491067">"現在地"</item>
+    <item msgid="8790228218278477369">"現在地"</item>
+    <item msgid="7836406246005211990">"バイブレーション"</item>
+    <item msgid="3951439024549922598">"連絡先の読み取り"</item>
+    <item msgid="8802152411647068">"連絡先の変更"</item>
+    <item msgid="229544934599698735">"通話履歴の読み取り"</item>
+    <item msgid="7396102294405899613">"通話履歴の変更"</item>
+    <item msgid="3597797992398484655">"カレンダーの読み取り"</item>
+    <item msgid="2705975774250907343">"カレンダーの変更"</item>
+    <item msgid="4668747371441932697">"現在地"</item>
+    <item msgid="1487578921720243646">"通知の投稿"</item>
+    <item msgid="4636080349724146638">"位置情報"</item>
+    <item msgid="673510900286463926">"通話の発信"</item>
+    <item msgid="542083422784609790">"SMS/MMSの読み取り"</item>
+    <item msgid="1033780373029588436">"SMS/MMSの書き込み"</item>
+    <item msgid="5647111115517787488">"SMS/MMSの受信"</item>
+    <item msgid="8591105601108455893">"SMS/MMSの受信"</item>
+    <item msgid="7730995008517841903">"SMS/MMSの受信"</item>
+    <item msgid="2613033109026626086">"SMS/MMSの受信"</item>
+    <item msgid="3037159047591081136">"SMS/MMSの送信"</item>
+    <item msgid="4726682243833913568">"SMS/MMSの読み取り"</item>
+    <item msgid="6555678522277865572">"SMS/MMSの書き込み"</item>
+    <item msgid="6981734935578130884">"設定の変更"</item>
+    <item msgid="8705854389991425629">"上部に描画"</item>
+    <item msgid="5861356020344153651">"通知へのアクセス"</item>
+    <item msgid="78432174621628659">"カメラ"</item>
+    <item msgid="3986116419882154794">"音声の録音"</item>
+    <item msgid="4516840825756409490">"音声の再生"</item>
+    <item msgid="6811712502798183957">"クリップボードの読み取り"</item>
+    <item msgid="2780369012602289114">"クリップボードの変更"</item>
+    <item msgid="2331359440170850868">"メディアボタン"</item>
+    <item msgid="6133599737122751231">"音声フォーカス"</item>
+    <item msgid="6844485713404805301">"主音量"</item>
+    <item msgid="1600379420669104929">"音声の音量"</item>
+    <item msgid="6296768210470214866">"着信音の音量"</item>
+    <item msgid="510690696071629241">"メディアの音量"</item>
+    <item msgid="406861638631430109">"アラームの音量"</item>
+    <item msgid="4715864795872233884">"通知の音量"</item>
+    <item msgid="2311478519251301183">"Bluetoothの音量"</item>
+    <item msgid="5133991377896747027">"スリープモードにしない"</item>
+    <item msgid="2464189519136248621">"位置情報"</item>
+    <item msgid="2062677934050803037">"場所"</item>
+    <item msgid="1735171933192715957">"使用統計情報を取得"</item>
+    <item msgid="1014093788778383554">"マイクをミュート/ミュート解除"</item>
+    <item msgid="4199297950608622850">"トーストの表示"</item>
+    <item msgid="2527962435313398821">"メディア プロジェクション"</item>
+    <item msgid="5117506254221861929">"VPN の有効化"</item>
+    <item msgid="8291198322681891160">"壁紙の書き込み"</item>
+    <item msgid="7106921284621230961">"ストラクチャのアシスト"</item>
+    <item msgid="4496533640894624799">"スクリーンショットのアシスト"</item>
+    <item msgid="2598847264853993611">"スマートフォンのステータスの読み取り"</item>
+    <item msgid="9215610846802973353">"ボイスメールの追加"</item>
+    <item msgid="9186411956086478261">"SIP の使用"</item>
+    <item msgid="6884763100104539558">"発信の処理"</item>
+    <item msgid="125513972170580692">"指紋"</item>
+    <item msgid="2556071024281275619">"ボディー センサー"</item>
+    <item msgid="617168514928339387">"緊急速報メールの読み取り"</item>
+    <item msgid="7134693570516523585">"仮の現在地情報"</item>
+    <item msgid="7224489175375229399">"ストレージの読み取り"</item>
+    <item msgid="8472735063903258202">"ストレージへの書き込み"</item>
+    <item msgid="4069276819909595110">"画面をオン"</item>
+    <item msgid="1228338896751121025">"アカウントの取得"</item>
+    <item msgid="3181581793459233672">"バックグラウンドで実行"</item>
+    <item msgid="2340936043025374076">"ユーザー補助機能の音量"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"短め"</item>
+    <item msgid="4816511817309094890">"中"</item>
+    <item msgid="8305084671259331134">"長め"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"デフォルト"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif Condensed"</item>
+    <item msgid="6529379119163117545">"Sans Serif固定幅"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif固定幅"</item>
+    <item msgid="4448481989108928248">"カジュアル"</item>
+    <item msgid="4627069151979553527">"草書体"</item>
+    <item msgid="6896773537705206194">"スモールキャピタル"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"極小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"標準"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"極大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"デフォルト"</item>
+    <item msgid="6488643537808152001">"なし"</item>
+    <item msgid="552332815156010137">"アウトライン"</item>
+    <item msgid="7187891159463789272">"ドロップシャドウ"</item>
+    <item msgid="8019330250538856521">"浮き彫り"</item>
+    <item msgid="8987385315647049787">"沈み彫り"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"アプリのデフォルトを使用"</item>
+    <item msgid="8611890312638868524">"黒地に白"</item>
+    <item msgid="5891360837786277638">"白地に黒"</item>
+    <item msgid="2798457065945456853">"黒地に黄色"</item>
+    <item msgid="5799049811524553967">"青地に黄色"</item>
+    <item msgid="3673930830658169860">"カスタム"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"事前共有鍵付きのL2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"証明書付きのL2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"事前共有鍵とXauth認証付きのIPSec VPN"</item>
+    <item msgid="3319427315593649917">"証明書とXauth認証付きのIPSec VPN"</item>
+    <item msgid="8258927774145391041">"証明書とハイブリッド認証付きのIPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"なし"</item>
+    <item msgid="1157046369795346308">"マニュアル"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"切断"</item>
+    <item msgid="8754480102834556765">"初期化中..."</item>
+    <item msgid="3351334355574270250">"接続しています..."</item>
+    <item msgid="8303882153995748352">"接続済み"</item>
+    <item msgid="9135049670787351881">"タイムアウト"</item>
+    <item msgid="2124868417182583926">"失敗"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"確認する"</item>
+    <item msgid="7718817231348607934">"許可しない"</item>
+    <item msgid="8184570120217958741">"常に許可する"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"常駐"</item>
+    <item msgid="167418068739176448">"上位のアクティビティ"</item>
+    <item msgid="4760813290195199773">"重要（フォアグラウンド）"</item>
+    <item msgid="2328684826817647595">"重要（バックグラウンド）"</item>
+    <item msgid="7746406490652867365">"バックアップ"</item>
+    <item msgid="5597404364389196754">"大重量"</item>
+    <item msgid="1290888779300174556">"サービス（実行中）"</item>
+    <item msgid="7241098542073939046">"サービス（再起動中）"</item>
+    <item msgid="6610439017684111046">"レシーバー"</item>
+    <item msgid="7367606086319921117">"ホーム"</item>
+    <item msgid="3344660712396741826">"前回のアクティビティ"</item>
+    <item msgid="5006559348883303865">"キャッシュ済み（アクティビティ）"</item>
+    <item msgid="8633480732468137525">"キャッシュ済み（アクティビティクライアント）"</item>
+    <item msgid="6248998242443333892">"キャッシュ済み（空）"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ティール"</item>
+    <item msgid="3228505970082457852">"青"</item>
+    <item msgid="6590260735734795647">"インディゴ"</item>
+    <item msgid="3521763377357218577">"パープル"</item>
+    <item msgid="5932337981182999919">"ピンク"</item>
+    <item msgid="5642914536624000094">"赤"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 日以上経過"</item>
+    <item msgid="8699273238891265610">"60 日以上経過"</item>
+    <item msgid="8346279419423837266">"90 日以上経過"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"自動的に検出"</item>
+    <item msgid="773943026484148895">"従量制として処理"</item>
+    <item msgid="1008268820118852416">"定額制として処理"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ランダムな MAC を使用する（デフォルト）"</item>
+    <item msgid="214234417308375326">"デバイスの MAC を使用する"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"いいえ"</item>
+    <item msgid="1930581185557754880">"はい"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ダーク"</item>
+    <item msgid="5079453644557603349">"ライト"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"OFF"</item>
+    <item msgid="4072198137051566919">"デバッグ"</item>
+    <item msgid="2473005316958868509">"詳細"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ホームのみ"</item>
+    <item msgid="1161026694891024702">"自動"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM / WCDMA を優先"</item>
+    <item msgid="7581481130337402578">"GSM のみ"</item>
+    <item msgid="8579197487913425819">"WCDMA のみ"</item>
+    <item msgid="8465243227505412498">"GSM / WCDMA 自動"</item>
+    <item msgid="9107479914166352132">"CDMA / EV-DO 自動"</item>
+    <item msgid="4219607161971472471">"CDMA（EV-DO 非準拠）"</item>
+    <item msgid="7278975240951052041">"EV-DO のみ"</item>
+    <item msgid="2295969832276827854">"CDMA / EV-DO / GSM / WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA+LTE / EV-DO"</item>
+    <item msgid="463168068025354541">"GSM / WCDMA / LTE"</item>
+    <item msgid="1770755308983338311">"グローバル"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA のみ"</item>
+    <item msgid="4346392996298714633">"TDSCDMA / WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE / TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA / GSM"</item>
+    <item msgid="5874623229495009031">"LTE / TDSCDMA / GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA / GSM / WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE / TDSCDMA / WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE / TDSCDMA / GSM / WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA / CDMA / EV-DO / GSM / WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE / TDSCDMA / CDMA / EV-DO / GSM / WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM / SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"グローバル"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ja/strings.xml b/tests/CarDeveloperOptions/res/values-ja/strings.xml
index bb47e1d..ff4be74 100644
--- a/tests/CarDeveloperOptions/res/values-ja/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ja/strings.xml
@@ -390,7 +390,7 @@
     <string name="security_passwords_title" msgid="6853942836045862315">"プライバシー"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"管理者により無効にされています"</string>
     <string name="security_status_title" msgid="1261960357751754428">"セキュリティ ステータス"</string>
-    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"画面ロック、フェイス アンロック"</string>
+    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"画面ロック、顔認証"</string>
     <string name="security_dashboard_summary" msgid="4048877125766167227">"画面ロック、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"画面ロック"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"顔を追加しました"</string>
@@ -427,7 +427,7 @@
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"顔認証データを削除"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"顔認証でデバイスのロックを解除したり、アプリにアクセスしたりできます。"<annotation id="url">"詳細"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"顔認証データを削除しますか？"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"フェイスアンロックによって記録されたデータは安全かつ完全に削除されます。削除後に、スマートフォンのロック解除、アプリへのログイン、お支払いの確認を行うには、PIN、パターン、パスワードのいずれかが必要になります。"</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"顔認証によって記録されたデータは安全かつ完全に削除されます。削除後に、スマートフォンのロック解除、アプリへのログイン、お支払いの確認を行うには、PIN、パターン、パスワードのいずれかが必要になります。"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"指紋の管理"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"指紋の用途"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"画面ロックによって、紛失や盗難があった場合に誰も使用できないようタブレットを保護できます。また、顔認証の設定にも画面ロックが必要になります。[キャンセル] をタップした後、PIN を設定するか、別の画面ロック方法を選択してください。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"画面ロックによって、紛失や盗難があった場合に誰も使用できないようデバイスを保護できます。また、顔認証の設定にも画面ロックが必要になります。[キャンセル] をタップした後、PIN を設定するか、別の画面ロック方法を選択してください。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"画面ロックによって、紛失や盗難があった場合に誰も使用できないようスマートフォンを保護できます。また、顔認証の設定にも画面ロックが必要になります。[キャンセル] をタップした後、PIN を設定するか、別の画面ロック方法を選択してください。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ピンの設定をスキップしますか？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"パスワードの設定をスキップしますか？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"パターンの設定をスキップしますか？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"画面ロックを設定"</string>
@@ -922,7 +921,7 @@
     <string name="wifi_eap_anonymous" msgid="6352344972490839958">"匿名ID"</string>
     <string name="wifi_password" msgid="6942983531275177771">"パスワード"</string>
     <string name="wifi_show_password" msgid="7878398590772942202">"パスワードを表示する"</string>
-    <string name="wifi_ap_band_config" msgid="6565016368079288433">"AP帯域幅を選択"</string>
+    <string name="wifi_ap_band_config" msgid="6565016368079288433">"AP周波数帯を選択"</string>
     <string name="wifi_ap_choose_auto" msgid="7927637960569365785">"自動"</string>
     <string name="wifi_ap_choose_2G" msgid="43198403259714736">"2.4 GHz 帯"</string>
     <string name="wifi_ap_choose_5G" msgid="2624859713183683146">"5.0 GHz 帯"</string>
@@ -1065,7 +1064,7 @@
     <string name="wifi_hotspot_name_summary_connecting" msgid="5176787959408511889">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"他のデバイスが <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> に接続できます"</string>
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"アクセス ポイントのパスワード"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"AP 帯域幅"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"AP 周波数帯"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"アクセス ポイントを使って他のデバイスとの Wi‑Fi ネットワークを作成します。アクセス ポイントはモバイルデータ通信によるインターネット接続を提供します。モバイルデータ通信料が追加で発生する可能性があります。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"アプリを使ってアクセス ポイントを作成し、コンテンツを近くのデバイスと共有できます。"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"アクセス ポイントを自動的にオフにする"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"モバイル"</item>
+    <item msgid="6007360612667098926">"Wi-Fi のみ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2484,8 +2486,8 @@
     <string name="menu_duration_6h" msgid="6169009210638008417">"6時間"</string>
     <string name="menu_duration_12h" msgid="1435242738163843797">"12時間"</string>
     <string name="menu_duration_1d" msgid="6476370834372352174">"1日"</string>
-    <string name="menu_show_system" msgid="6315865548558708248">"システムを表示"</string>
-    <string name="menu_hide_system" msgid="8457027118873733782">"システムを表示しない"</string>
+    <string name="menu_show_system" msgid="6315865548558708248">"システムアプリを表示"</string>
+    <string name="menu_hide_system" msgid="8457027118873733782">"システムアプリを表示しない"</string>
     <string name="menu_show_percentage" msgid="6983272380729890884">"割合を表示"</string>
     <string name="menu_use_uss" msgid="3765054705208926803">"Ussを使用"</string>
     <string name="menu_proc_stats_type" msgid="2680179749566186247">"統計タイプ"</string>
@@ -3087,11 +3089,11 @@
     <string name="keywords_lockscreen" msgid="4936846554280830394">"スライドでロック解除、パスワード、パターン、PIN"</string>
     <string name="keywords_profile_challenge" msgid="8653718001253979611">"ワーク チャレンジ, 仕事用, プロファイル"</string>
     <string name="keywords_unification" msgid="2020759909366983593">"仕事用プロファイル, 管理対象プロファイル, 統合する, 統合, 仕事, プロファイル"</string>
-    <string name="keywords_gesture" msgid="5031323247529869644">"操作"</string>
+    <string name="keywords_gesture" msgid="5031323247529869644">"ジェスチャー"</string>
     <string name="keywords_payment_settings" msgid="4745023716567666052">"支払い, タップ, ペイメント"</string>
     <string name="keywords_backup" msgid="7433356270034921627">"バックアップ, バック アップ"</string>
     <string name="keywords_assist_gesture_launch" msgid="2711433664837843513">"操作"</string>
-    <string name="keywords_face_unlock" msgid="651615819291927262">"顔, フェイス, ロック解除, アンロック, 認証, ログイン"</string>
+    <string name="keywords_face_unlock" msgid="651615819291927262">"顔, フェイス, ロック解除, アンロック, 認証, ログイン, 顔認証"</string>
     <string name="keywords_imei_info" msgid="4325847870422053408">"IMEI, MEID, MIN, PRL バージョン, IMEI SV"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"ネットワーク, モバイル ネットワークの状態, サービスの状態, 電波強度, モバイル ネットワークの種類, ローミング, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"シリアル番号, ハードウェア バージョン"</string>
@@ -4100,7 +4102,7 @@
     <string name="deletion_helper_automatic_title" msgid="4370975149425263205">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"今すぐ空き容量を増やす"</string>
-    <string name="gesture_preference_title" msgid="583646591518373785">"操作"</string>
+    <string name="gesture_preference_title" msgid="583646591518373785">"ジェスチャー"</string>
     <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"簡単な操作でスマートフォンを管理できます"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"簡単な操作でタブレットを管理できます"</string>
     <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"簡単な操作でデバイスを管理できます"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"このスマートフォンの動作が遅くなります"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GNSS 計測の完全な実行"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"デューティ サイクリングを無効にした状態で、すべての GNSS コンステレーションと頻度をトラッキングします"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ユーザー切り替え時のデバッグ情報"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ユーザー切り替え中の詳細情報の表示"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"バックグラウンド アクティビティの開始を許可"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"すべてのバックグラウンド アクティビティの開始を許可する"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"クラッシュ ダイアログを常に表示"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ka-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ka-nokeys/strings.xml
new file mode 100644
index 0000000..c528701
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ka-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"აპლიკაციების მართვა"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ka/arrays.xml b/tests/CarDeveloperOptions/res/values-ka/arrays.xml
new file mode 100644
index 0000000..bddbdec
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ka/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"ამერიკა"</item>
+    <item msgid="4791956477275129121">"ევროპა"</item>
+    <item msgid="3812126832016254559">"აფრიკა"</item>
+    <item msgid="2765816300353408280">"აზია"</item>
+    <item msgid="6683489385344409742">"ავსტრალია"</item>
+    <item msgid="5194868215515664953">"წყნარი ოკეანის"</item>
+    <item msgid="7044520255415007865">"ყველა"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 წამი"</item>
+    <item msgid="772029947136115322">"30 წამი"</item>
+    <item msgid="8743663928349474087">"1 წუთი"</item>
+    <item msgid="1506508631223164814">"2 წუთი"</item>
+    <item msgid="8664703938127907662">"5 წუთი"</item>
+    <item msgid="5827960506924849753">"10 წუთი"</item>
+    <item msgid="6677424950124253938">"30 წუთი"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"არასოდეს"</item>
+    <item msgid="2517785806387977252">"15 წამი"</item>
+    <item msgid="6347954399441173672">"30 წამი"</item>
+    <item msgid="4858305253279921789">"1 წუთი"</item>
+    <item msgid="8109273437140044073">"2 წუთი"</item>
+    <item msgid="2788593551142462622">"5 წუთი"</item>
+    <item msgid="8012672183888404961">"10 წუთი"</item>
+    <item msgid="8271452751594598661">"30 წუთი"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"დაუყოვნებლივ"</item>
+    <item msgid="2038544972632026612">"5 წამი"</item>
+    <item msgid="5558060663472279597">"15 წამი"</item>
+    <item msgid="45341168505452037">"30 წამი"</item>
+    <item msgid="227647485917789272">"1 წუთი"</item>
+    <item msgid="3367011891231217504">"2 წუთი"</item>
+    <item msgid="4376575879222393045">"5 წუთი"</item>
+    <item msgid="811192536981678974">"10 წუთი"</item>
+    <item msgid="7258394417241706272">"30 წუთი"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"პატარა"</item>
+    <item msgid="591935967183159581">"ნაგულისხმევი"</item>
+    <item msgid="1714184661981538355">"დიდი"</item>
+    <item msgid="6195563047686707484">"უდიდესი"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"სკანირება…"</item>
+    <item msgid="5597394826455877834">"მიმდინარეობს დაკავშირება&amp;hellip;"</item>
+    <item msgid="5848277343965362748">"მიმდინარეობს აუთენტიფიკაცია…"</item>
+    <item msgid="3391238031431440676">"IP მისამართის მიღება…"</item>
+    <item msgid="5257597310494000224">"დაკავშირებულია"</item>
+    <item msgid="8472497592913050396">"შეჩერებული"</item>
+    <item msgid="1228072488815999109">"მიმდინარეობს გათიშვა…"</item>
+    <item msgid="7253087004422991731">"არ არის ხაზზე"</item>
+    <item msgid="4169850917304751227">"წარუმატებლად დასრულდა"</item>
+    <item msgid="6266658166690831131">"დაბლოკილი"</item>
+    <item msgid="4517230805854909775">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"სკანირება…"</item>
+    <item msgid="8058143476674427024">"მიმდინარეობს დაკავშირება <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან…"</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ში ავტორიზაცია…"</item>
+    <item msgid="5145158315060185414">"IP მისამართის მოპოვება <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-დან…"</item>
+    <item msgid="3283243151651124831">"დაკავშირებულია <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან"</item>
+    <item msgid="6600156231416890902">"შეჩერებული"</item>
+    <item msgid="4133290864821295785">"კავშირის გაწყვეტა <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან…"</item>
+    <item msgid="3980154971187953257">"არ არის ხაზზე"</item>
+    <item msgid="2847316776634969068">"წარუმატებლად დასრულდა"</item>
+    <item msgid="4390990424746035383">"დაბლოკილი"</item>
+    <item msgid="3618248791367063949">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"დასაჭერი ღილაკი"</item>
+    <item msgid="7401896200768713930">"ერთრანგიანი მოწყობილობის პინი"</item>
+    <item msgid="4526848028011846710">"ამ მოწყობილობის PIN-კოდი"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"დაკავშირებულია"</item>
+    <item msgid="983792611851499732">"მოწვეულია"</item>
+    <item msgid="5438273405428201793">"წარუმატებლად დასრულდა"</item>
+    <item msgid="4646663015449312554">"ხელმისაწვდომი"</item>
+    <item msgid="3230556734162006146">"დიაპაზონს მიღმა"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 წუთი"</item>
+    <item msgid="2759776603549270587">"5 წუთი"</item>
+    <item msgid="167772676068860015">"1 საათი"</item>
+    <item msgid="5985477119043628504">"დროის ლიმიტის გარეშე"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"სისტემის ნაგულისხმევი პარამეტრების გამოყენება: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ცუდი"</item>
+    <item msgid="7882129634982603782">"სუსტი"</item>
+    <item msgid="6457357501905996224">"ნორმალური"</item>
+    <item msgid="405271628162918841">"კარგი"</item>
+    <item msgid="999948812884919584">"შესანიშნავი"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"ბოლო 30 დღე"</item>
+    <item msgid="3211287705232736964">"გამოყენების ციკლის დაყენება..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"გამოყენების დრო"</item>
+    <item msgid="2784401352592276015">"ბოლოს გამოყენებული"</item>
+    <item msgid="249854287216326349">"აპის სახელი"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"არც ერთი"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"არცერთი"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"არც ერთი"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"სტატიკური"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"არც ერთი"</item>
+    <item msgid="1464741437353223198">"სახელმძღვანელო"</item>
+    <item msgid="5793600062487886090">"პროქსის ავტოკონფიგურაცია"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"არც ერთი"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ან CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"არ არის მითითებული"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"არც ერთი"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"შიდა მოწყობილობის მეხსიერება"</item>
+    <item msgid="3186681694079967527">"შეცვლადი SD ბარათი"</item>
+    <item msgid="6902033473986647035">"გადაწყვიტოს სისტემამ"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"მდებარეობა"</item>
+    <item msgid="6842381562497597649">"პირადი"</item>
+    <item msgid="3966700236695683444">"შეტყობინებები"</item>
+    <item msgid="8563996233342430477">"მედია"</item>
+    <item msgid="5323851085993963783">"მოწყობილობა"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"მიახლოებითი მდებარეობა"</item>
+    <item msgid="1830619568689922920">"ზუსტი მდებარეობა"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ვიბრაცია"</item>
+    <item msgid="8632513128515114092">"კონტაქტების წაკითხვა"</item>
+    <item msgid="3741042113569620272">"კონტაქტების შეცვლა"</item>
+    <item msgid="4204420969709009931">"ზარების სიის ნახვა"</item>
+    <item msgid="2260380357119423209">"ზარების ჟურნალის ჩასწორება"</item>
+    <item msgid="6550710385014530934">"კალენდრის წაკითხვა"</item>
+    <item msgid="3575906174264853951">"კალენდრის ჩასწორება"</item>
+    <item msgid="4319843242568057174">"Wi-Fi ქსელის ძებნა"</item>
+    <item msgid="2981791890467303819">"შეტყობინება"</item>
+    <item msgid="6617825156152476692">"ფიჭური ქსელების ძებნა"</item>
+    <item msgid="8865260890611559753">"ტელეფონზე დარეკვა"</item>
+    <item msgid="3254999273961542982">"SMS-ის წაკითხვა"</item>
+    <item msgid="7711446453028825171">"SMS-ის შექმნა"</item>
+    <item msgid="6123238544099198034">"SMS-ის მიღება"</item>
+    <item msgid="838342167431596036">"სასწრაფო SMS-ის მიღება"</item>
+    <item msgid="8554432731560956686">"MMS-ის მიღება"</item>
+    <item msgid="7464863464299515059">"WAP push მიღება"</item>
+    <item msgid="310463075729606765">"SMS-ის გაგზავნა"</item>
+    <item msgid="7338021933527689514">"ICC SMS-ის წაკითხვა"</item>
+    <item msgid="6130369335466613036">"ICC SMS-ის შექმნა"</item>
+    <item msgid="6536865581421670942">"პარამეტრების შეცვლა"</item>
+    <item msgid="4547203129183558973">"სხვა ერთეულებს ზემოდან ჩვენება"</item>
+    <item msgid="9080347512916542840">"შეტყობინებებთან წვდომა"</item>
+    <item msgid="5332718516635907742">"კამერა"</item>
+    <item msgid="6098422447246167852">"აუდიოს ჩაწერა"</item>
+    <item msgid="9182794235292595296">"აუდიოს დაკვრა"</item>
+    <item msgid="8760743229597702019">"გაცვლის ბუფერის წაკითხვა"</item>
+    <item msgid="2266923698240538544">"გაცვლის ბუფერის ცვლილება"</item>
+    <item msgid="1801619438618539275">"მედიის ღილაკები"</item>
+    <item msgid="31588119965784465">"აუდიოს ფოკუსი"</item>
+    <item msgid="7565226799008076833">"მასტერ-ხმის სიმძლავრე"</item>
+    <item msgid="5420704980305018295">"ხმის სიმძღლავრე"</item>
+    <item msgid="5797363115508970204">"ზარის სიმძლავრე"</item>
+    <item msgid="8233154098550715999">"მედიის ხმა"</item>
+    <item msgid="5196715605078153950">"მაღვიძარას ხმა"</item>
+    <item msgid="394030698764284577">"შეტყობინების ხმა"</item>
+    <item msgid="8952898972491680178">"Bluetooth-ის ხმა"</item>
+    <item msgid="8506227454543690851">"დარჩეს აქტიური"</item>
+    <item msgid="1108160036049727420">"მდებარეობის მონიტორინგი"</item>
+    <item msgid="1496205959751719491">"მაღალი ძაბვის მდებარეობის მონიტორინგი"</item>
+    <item msgid="3776296279910987380">"გამოყენების სტატისტიკის მიღება"</item>
+    <item msgid="8827100324471975602">"მიკროფონის დადუმება/გააქტიურება"</item>
+    <item msgid="6880736730520126864">"შეტყობინების ჩვენება"</item>
+    <item msgid="4933375960222609935">"მედიის პროეცირება"</item>
+    <item msgid="8357907018938895462">"VPN-ის აქტივაცია"</item>
+    <item msgid="8143812849911310973">"ფონის ჩაწერა"</item>
+    <item msgid="6266277260961066535">"დამხმარე სტრუქტურა"</item>
+    <item msgid="7715498149883482300">"დამხმარე ეკრანის ანაბეჭდი"</item>
+    <item msgid="4046679376726313293">"ტელეფონის მდგომარეობის წაკითხვა"</item>
+    <item msgid="6329507266039719587">"ხმოვანი ფოსტის დამატება"</item>
+    <item msgid="7692440726415391408">"SIP-ის გამოყენება"</item>
+    <item msgid="8572453398128326267">"გამავალი ზარის დამუშავება"</item>
+    <item msgid="7775674394089376306">"თითის ანაბეჭდი"</item>
+    <item msgid="3182815133441738779">"სხეულის სენსორები"</item>
+    <item msgid="2793100005496829513">"Cell Broadcast-ების წაკითხვა"</item>
+    <item msgid="2633626056029384366">"მდებარეობის იმიტირება"</item>
+    <item msgid="8356842191824684631">"მეხსიერების წაკითხვა"</item>
+    <item msgid="5671906070163291500">"მეხსიერებაში ჩაწერა"</item>
+    <item msgid="2791955098549340418">"ეკრანის ჩართვა"</item>
+    <item msgid="5599435119609178367">"ანგარიშების მიღება"</item>
+    <item msgid="1165623660533024666">"ფონურ რეჟიმში გაშვება"</item>
+    <item msgid="6423861043647911030">"მარტივი წვდომის ხმის სიმძლავრე"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"მოკლე"</item>
+    <item msgid="4816511817309094890">"საშუალო"</item>
+    <item msgid="8305084671259331134">"ვრცელი"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ნაგულისხმევი"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif შესქელებული"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"თავისუფალი"</item>
+    <item msgid="4627069151979553527">"კურსივი"</item>
+    <item msgid="6896773537705206194">"პატარა მთავრულები"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ძალიან პატარა"</item>
+    <item msgid="5091603983404027034">"პატარა"</item>
+    <item msgid="176844712416932112">"ჩვეულებრივი"</item>
+    <item msgid="2784236342175159295">"დიდი"</item>
+    <item msgid="218913203203160606">"ძალიან დიდი"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ნაგულისხმევი"</item>
+    <item msgid="6488643537808152001">"არც ერთი"</item>
+    <item msgid="552332815156010137">"კონტური"</item>
+    <item msgid="7187891159463789272">"ჩრდილი"</item>
+    <item msgid="8019330250538856521">"ამაღლებული"</item>
+    <item msgid="8987385315647049787">"დაკლებული"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"აპის ნაგულისხმევი"</item>
+    <item msgid="8611890312638868524">"თეთრი შავზე"</item>
+    <item msgid="5891360837786277638">"შავი თეთრზე"</item>
+    <item msgid="2798457065945456853">"ყვითელი შავზე"</item>
+    <item msgid="5799049811524553967">"ყვითელი ლურჯზე"</item>
+    <item msgid="3673930830658169860">"მორგებული"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN წინასწარ გაზიარებული ღილაკებით"</item>
+    <item msgid="6128519070545038358">"VPN მიერთება L2TP/IPSec პროტოკოლის მიხედვით სერტიფიკატების გამოყენებით"</item>
+    <item msgid="312397853907741968">"IPSec VPN წინასწარ გაზიარებული ღილაკებით და Xauth ავტორიზაცია"</item>
+    <item msgid="3319427315593649917">"IPSec VPN სერთიფიკატებითა და Xauth ავთენტიფიკაციით"</item>
+    <item msgid="8258927774145391041">"IPSec VPN მიერთება სერტიფიკატების და კომბინირებული ავთენტიკაციის გამოყენებით"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"არაფერი"</item>
+    <item msgid="1157046369795346308">"სახელმძღვანელო"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"არ არის ხაზზე"</item>
+    <item msgid="8754480102834556765">"მიმდინარეობს ინიციალიზაცია…"</item>
+    <item msgid="3351334355574270250">"მიმდინარეობს დაკავშირება&amp;hellip;"</item>
+    <item msgid="8303882153995748352">"დაკავშირებულია"</item>
+    <item msgid="9135049670787351881">"დროის ლიმიტი"</item>
+    <item msgid="2124868417182583926">"წარუმატებლად დასრულდა"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"შეკითხვა"</item>
+    <item msgid="7718817231348607934">"არასოდეს მიეცეს უფლება"</item>
+    <item msgid="8184570120217958741">"ნებართვის მიცემა - ყოველთვის"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"სისტემატური"</item>
+    <item msgid="167418068739176448">"ტოპ-აქტივობა"</item>
+    <item msgid="4760813290195199773">"მნიშვნელოვანი (წინა პლანზე)"</item>
+    <item msgid="2328684826817647595">"მნიშვნელოვანი (ფონური)"</item>
+    <item msgid="7746406490652867365">"სარეზერვო კოპირება"</item>
+    <item msgid="5597404364389196754">"დიდი დატვირთვა"</item>
+    <item msgid="1290888779300174556">"სერვისი (გაშვებული)"</item>
+    <item msgid="7241098542073939046">"სერვისი (გადატვირთვა)"</item>
+    <item msgid="6610439017684111046">"მიმღები"</item>
+    <item msgid="7367606086319921117">"მთავარი"</item>
+    <item msgid="3344660712396741826">"ბოლო აქტივობა"</item>
+    <item msgid="5006559348883303865">"ქეშირებული (აქტივობა)"</item>
+    <item msgid="8633480732468137525">"ქეშირებულია (აქტივობის კლიენტი)"</item>
+    <item msgid="6248998242443333892">"ქეშირებული (ცარიელი)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ზურმუხტისფერი"</item>
+    <item msgid="3228505970082457852">"ლურჯი"</item>
+    <item msgid="6590260735734795647">"მუქი ლურჯი"</item>
+    <item msgid="3521763377357218577">"მეწამული"</item>
+    <item msgid="5932337981182999919">"ვარდისფერი"</item>
+    <item msgid="5642914536624000094">"წითელი"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 დღეზე ძველი"</item>
+    <item msgid="8699273238891265610">"60 დღეზე ძველი"</item>
+    <item msgid="8346279419423837266">"90 დღეზე ძველი"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ავტომატურად ამოცნობა"</item>
+    <item msgid="773943026484148895">"ლიმიტირებულად ჩათვლა"</item>
+    <item msgid="1008268820118852416">"არალიმიტირებულად ჩათვლა"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"შემთხვევითი MAC-ის გამოყენება (ნაგულ.)"</item>
+    <item msgid="214234417308375326">"მოწყობილობის MAC-მისამართის გამოყენება"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"არა"</item>
+    <item msgid="1930581185557754880">"დიახ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"მუქი"</item>
+    <item msgid="5079453644557603349">"ნათურა"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"გამორთული"</item>
+    <item msgid="4072198137051566919">"შეცდომების გამართვა"</item>
+    <item msgid="2473005316958868509">"დაწვრილებითი"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"მხოლოდ საშინაო"</item>
+    <item msgid="1161026694891024702">"ავტომატური"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"სასურველია GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"მხოლოდ GSM"</item>
+    <item msgid="8579197487913425819">"მხოლოდ WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ავტომატური"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ავტომატური"</item>
+    <item msgid="4219607161971472471">"CDMA, EvDo-ს გარეშე"</item>
+    <item msgid="7278975240951052041">"მხოლოდ EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"გლობალური"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"მხოლოდ TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"გლობალური"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ka/strings.xml b/tests/CarDeveloperOptions/res/values-ka/strings.xml
index fb53e4c..9536e8f 100644
--- a/tests/CarDeveloperOptions/res/values-ka/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ka/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"დაიცავით თქვენი ტაბლეტი ეკრანის დაბლოკვის ვარიანტით, რომ ვერავინ შეძლოს მისი გამოყენება დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახის ავთენტიფიკაციის დასაყენებლადაც. შეეხეთ „გაუქმებას“, შემდეგ დააყენეთ PIN-კოდი ან აირჩიეთ ეკრანის დაბლოკვის სხვა ვარიანტი."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"დაიცავით თქვენი მოწყობილობა ეკრანის დაბლოკვის ვარიანტით, რომ ვერავინ შეძლოს მისი გამოყენება დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახის ავთენტიფიკაციის დასაყენებლადაც. შეეხეთ „გაუქმებას“, შემდეგ დააყენეთ PIN-კოდი ან აირჩიეთ ეკრანის დაბლოკვის სხვა ვარიანტი."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"დაიცავით თქვენი ტელეფონი ეკრანის დაბლოკვის ვარიანტით, რომ ვერავინ შეძლოს მისი გამოყენება დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახის ავთენტიფიკაციის დასაყენებლადაც. შეეხეთ „გაუქმებას“, შემდეგ დააყენეთ PIN-კოდი ან აირჩიეთ ეკრანის დაბლოკვის სხვა ვარიანტი."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"გამოტოვებთ PIN-ის დაყენებას?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"გამოტოვებთ პაროლის დაყენებას?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"გამოტოვებთ ნიმუშის დაყენებას?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ეკრანის დაბლოკვის დაყენება"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"მობილური"</item>
+    <item msgid="6007360612667098926">"მხოლოდ Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1214,7 +1216,7 @@
     <string name="night_display_status_title" msgid="1727020934735770319">"სტატუსი"</string>
     <string name="night_display_temperature_title" msgid="8375126629902616296">"ინტენსივობა"</string>
     <string name="night_display_summary_off" msgid="8850539785332228069">"გამორთულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"არასოდეს ჩაირთოს ავტომატურად"</string>
+    <string name="night_display_summary_off_auto_mode_never" msgid="8618824386434992487">"არასოდეს ჩაირთვება ავტომატურად"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="596847003171394411">"ავტომატურად ჩაირთვება <xliff:g id="ID_1">%1$s</xliff:g>-ზე"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="4071750976585359952">"ავტომატურად ჩაირთვება მზის ჩასვლისას"</string>
     <string name="night_display_summary_on" msgid="6580571388791426596">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ის შეანელებს ამ ტელეფონს"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"სრული GNSS გაზომვის განხორციელების იძულება"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ყველა GNSS კონსტელაციისა და სიხშირის აღრიცხვა, დატვირთვის კოეფიციენტის გარეშე"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"მომხმარებლის გადამრთველის შეცდომების გამართვა"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"დეტალური ინფორმაციის ჩვენება მომხმარებლის გადართვის პროცესში"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"აქტივობის ფონურ რეჟიმში დაწყების დაშვება"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"დაუშვებს აქტივობის ფონურ რეჟიმში დაწყებას"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ავარიულად გათიშვის დიალოგური ფანჯრის ყოველთვის ჩვენება"</string>
diff --git a/tests/CarDeveloperOptions/res/values-kk-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-kk-nokeys/strings.xml
new file mode 100644
index 0000000..2ecfbfa
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-kk-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Қолданбаларды басқару"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-kk/arrays.xml b/tests/CarDeveloperOptions/res/values-kk/arrays.xml
new file mode 100644
index 0000000..2dca861
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-kk/arrays.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Aмерика"</item>
+    <item msgid="4791956477275129121">"Европа"</item>
+    <item msgid="3812126832016254559">"Aфрика"</item>
+    <item msgid="2765816300353408280">"Aзия"</item>
+    <item msgid="6683489385344409742">"Aвстралия"</item>
+    <item msgid="5194868215515664953">"Тынық"</item>
+    <item msgid="7044520255415007865">"Барлығы"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Бірден"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 минут"</item>
+    <item msgid="3367011891231217504">"2 минут"</item>
+    <item msgid="4376575879222393045">"5 минут"</item>
+    <item msgid="811192536981678974">"10 минут"</item>
+    <item msgid="7258394417241706272">"30 минут"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Жалғанған"</item>
+    <item msgid="983792611851499732">"Шақырылған"</item>
+    <item msgid="5438273405428201793">"Сәтсіз"</item>
+    <item msgid="4646663015449312554">"Қолжетімді"</item>
+    <item msgid="3230556734162006146">"Аумақтан тыc"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Жүйенінің әдепкі мәнін пайдалану: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Соңғы 30 күн"</item>
+    <item msgid="3211287705232736964">"Пайдалану циклын орнату…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Қолдану уақыты"</item>
+    <item msgid="2784401352592276015">"Соңғы пайдаланылған уақыты"</item>
+    <item msgid="249854287216326349">"Қолданба атауы"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ешқандай"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ешқандай"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ешқандай"</item>
+    <item msgid="7901133332272818442">"PAP (кілтсөз арқылы растау)"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ешқандай"</item>
+    <item msgid="1464741437353223198">"Қолмен"</item>
+    <item msgid="5793600062487886090">"Прокси автоконфигурациясы"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ешқандай"</item>
+    <item msgid="1950796738039490374">"PAP (кілтсөз арқылы растау)"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP (кілтсөз арқылы) немесе CHAP (сұрақ қою арқылы)"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Анықталмаған"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ешқандай"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Ішкі құрылғы жады"</item>
+    <item msgid="3186681694079967527">"Алынбалы SD картасы"</item>
+    <item msgid="6902033473986647035">"Жүйені өзі шешсін"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Орналасу"</item>
+    <item msgid="6842381562497597649">"Жеке"</item>
+    <item msgid="3966700236695683444">"Хабар алмасу"</item>
+    <item msgid="8563996233342430477">"Meдиа"</item>
+    <item msgid="5323851085993963783">"Құрылғы"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"өңделмеген аймақ"</item>
+    <item msgid="1830619568689922920">"өңделген аймақ"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"діріл"</item>
+    <item msgid="8632513128515114092">"контактілерді оқу"</item>
+    <item msgid="3741042113569620272">"контактілерді өзгерту"</item>
+    <item msgid="4204420969709009931">"қоңыраулар тіркелімін оқу"</item>
+    <item msgid="2260380357119423209">"қоңыраулар тіркелімін өзгерту"</item>
+    <item msgid="6550710385014530934">"күнтізбені оқу"</item>
+    <item msgid="3575906174264853951">"күнтізбені өзгерту"</item>
+    <item msgid="4319843242568057174">"wi-fi сканнер"</item>
+    <item msgid="2981791890467303819">"хабар"</item>
+    <item msgid="6617825156152476692">"ұялы сканнер"</item>
+    <item msgid="8865260890611559753">"қоңырау шалу"</item>
+    <item msgid="3254999273961542982">"SMS оқу"</item>
+    <item msgid="7711446453028825171">"SMS жазу"</item>
+    <item msgid="6123238544099198034">"SMS алу"</item>
+    <item msgid="838342167431596036">"Төтенше SMS алу"</item>
+    <item msgid="8554432731560956686">"MMS алу"</item>
+    <item msgid="7464863464299515059">"WAP push хабарын алу"</item>
+    <item msgid="310463075729606765">"SMS жіберу"</item>
+    <item msgid="7338021933527689514">"Орнатылған картадан SMS хабарын оқу"</item>
+    <item msgid="6130369335466613036">"ICC SMS жазу"</item>
+    <item msgid="6536865581421670942">"параметрлерді өзгерту"</item>
+    <item msgid="4547203129183558973">"үстінен жазу"</item>
+    <item msgid="9080347512916542840">"хабарларға кіру"</item>
+    <item msgid="5332718516635907742">"Камера"</item>
+    <item msgid="6098422447246167852">"аудио жазу"</item>
+    <item msgid="9182794235292595296">"аудио ойнату"</item>
+    <item msgid="8760743229597702019">"ақпарат алмастыру қорын оқу"</item>
+    <item msgid="2266923698240538544">"ақпарат алмастыру қорын өзгерту"</item>
+    <item msgid="1801619438618539275">"медиа түймелері"</item>
+    <item msgid="31588119965784465">"аудио көздеу"</item>
+    <item msgid="7565226799008076833">"негізгі дыбыс"</item>
+    <item msgid="5420704980305018295">"дыбыс қаттылығы"</item>
+    <item msgid="5797363115508970204">"қоңыраудың дыбыс деңгейі"</item>
+    <item msgid="8233154098550715999">"мультимeдиа дыбыс деңгейі"</item>
+    <item msgid="5196715605078153950">"дабыл дыбысының қаттылығы"</item>
+    <item msgid="394030698764284577">"хабар дыбысының қаттылығы"</item>
+    <item msgid="8952898972491680178">"bluetooth дыбысының қаттылығы"</item>
+    <item msgid="8506227454543690851">"ұйқы бермеу"</item>
+    <item msgid="1108160036049727420">"аймақты бақылау"</item>
+    <item msgid="1496205959751719491">"қуаты жоғары аймақты бақылау"</item>
+    <item msgid="3776296279910987380">"пайдалану статистикасын алу"</item>
+    <item msgid="8827100324471975602">"микрофон дыбысын өшіру/қосу"</item>
+    <item msgid="6880736730520126864">"қалқымалы хабарландыру көрсету"</item>
+    <item msgid="4933375960222609935">"жоба тасушысы"</item>
+    <item msgid="8357907018938895462">"VPN функциясын белсендіру"</item>
+    <item msgid="8143812849911310973">"тұсқағаз жазу"</item>
+    <item msgid="6266277260961066535">"көмекші құрылым"</item>
+    <item msgid="7715498149883482300">"көмекші скриншот"</item>
+    <item msgid="4046679376726313293">"телефон күйін оқу"</item>
+    <item msgid="6329507266039719587">"дауыстық хабар қосу"</item>
+    <item msgid="7692440726415391408">"SIP пайдалану"</item>
+    <item msgid="8572453398128326267">"шығыс қоңырауды өңдеу"</item>
+    <item msgid="7775674394089376306">"саусақ ізі"</item>
+    <item msgid="3182815133441738779">"дене датчиктері"</item>
+    <item msgid="2793100005496829513">"ұялы таратылымдарды оқу"</item>
+    <item msgid="2633626056029384366">"жалған орын"</item>
+    <item msgid="8356842191824684631">"жадты оқу"</item>
+    <item msgid="5671906070163291500">"жадқа жазу"</item>
+    <item msgid="2791955098549340418">"экранды қосу"</item>
+    <item msgid="5599435119609178367">"есептік жазбаларды алу"</item>
+    <item msgid="1165623660533024666">"фонда іске қосу"</item>
+    <item msgid="6423861043647911030">"арнайы мүмкіндіктердің дыбыс деңгейі"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Қысқа"</item>
+    <item msgid="4816511817309094890">"Орташа"</item>
+    <item msgid="8305084671259331134">"Ұзақ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Әдепкі"</item>
+    <item msgid="4147246073737933622">"Готикалық шрифт"</item>
+    <item msgid="3117680749167407907">"Нығыз орналасқан готикалық шрифт"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Кертілген"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Қалыпты"</item>
+    <item msgid="4627069151979553527">"Көлбеу"</item>
+    <item msgid="6896773537705206194">"Кішкене бас әріптер"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Әдепкі"</item>
+    <item msgid="6488643537808152001">"Ешқандай"</item>
+    <item msgid="552332815156010137">"Контур"</item>
+    <item msgid="7187891159463789272">"Көлеңке түсіру"</item>
+    <item msgid="8019330250538856521">"Көтерілген"</item>
+    <item msgid="8987385315647049787">"Басылған"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec, пернелері ортақ ВЖЖ"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec ВЖЖ, сертификаттары бар"</item>
+    <item msgid="312397853907741968">"IPSec ВЖЖ, пернелері ортақ және Xauth растамасы бар"</item>
+    <item msgid="3319427315593649917">"IPSec ВЖЖ, сертификаттары және Xauth растамасы бар"</item>
+    <item msgid="8258927774145391041">"IPSec ВЖЖ, сертификаттары және гибридті растамасы бар"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ешқандай"</item>
+    <item msgid="1157046369795346308">"Қолмен"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Сұрау"</item>
+    <item msgid="7718817231348607934">"Әрқашан рұқсат емес"</item>
+    <item msgid="8184570120217958741">"Әрқашан рұқсат"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Тұрақты"</item>
+    <item msgid="167418068739176448">"Ең жоғары белсенділік"</item>
+    <item msgid="4760813290195199773">"Маңызды (алдыңғы фон)"</item>
+    <item msgid="2328684826817647595">"Маңызды (артқы фон)"</item>
+    <item msgid="7746406490652867365">"Сақтық көшірме"</item>
+    <item msgid="5597404364389196754">"Ауыр салмақ"</item>
+    <item msgid="1290888779300174556">"Қызмет (іске қосылған)"</item>
+    <item msgid="7241098542073939046">"Қызмет (қайта іске қосылуда)"</item>
+    <item msgid="6610439017684111046">"Алушы"</item>
+    <item msgid="7367606086319921117">"Негізгі"</item>
+    <item msgid="3344660712396741826">"Соңғы белсенділік"</item>
+    <item msgid="5006559348883303865">"Кэштелген (белсенділік)"</item>
+    <item msgid="8633480732468137525">"Кэштелген (белсенділік клиенті)"</item>
+    <item msgid="6248998242443333892">"Кэштелген (бос)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Көгілдір"</item>
+    <item msgid="3228505970082457852">"Көк"</item>
+    <item msgid="6590260735734795647">"Индиго түсі"</item>
+    <item msgid="3521763377357218577">"Қызылкүрең"</item>
+    <item msgid="5932337981182999919">"Қызғылт"</item>
+    <item msgid="5642914536624000094">"Қызыл"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 күннен артық сақталған"</item>
+    <item msgid="8699273238891265610">"60 күннен артық сақталған"</item>
+    <item msgid="8346279419423837266">"90 күннен артық сақталған"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Автоматты түрде анықтау"</item>
+    <item msgid="773943026484148895">"Трафик саналсын"</item>
+    <item msgid="1008268820118852416">"Трафик саналмасын"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Кездейсоқ MAC мекенжайын пайдалану (әдепкі)"</item>
+    <item msgid="214234417308375326">"Құрылғының MAC мекенжайын пайдалану"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Жоқ"</item>
+    <item msgid="1930581185557754880">"Иә"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Қараңғы"</item>
+    <item msgid="5079453644557603349">"Жарық"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Өшірулі"</item>
+    <item msgid="4072198137051566919">"Жөндеу"</item>
+    <item msgid="2473005316958868509">"Толық ақпарат"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Тек үй желісі"</item>
+    <item msgid="1161026694891024702">"Aвтоматты"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA (оңтайлы режим)"</item>
+    <item msgid="7581481130337402578">"Тек GSM"</item>
+    <item msgid="8579197487913425819">"Тек WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA (aвтоматты)"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo (автоматты)"</item>
+    <item msgid="4219607161971472471">"EvDo-сыз CDMA"</item>
+    <item msgid="7278975240951052041">"Тек EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Бүкіл әлем"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Тек TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM картасы"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Бүкіл әлем"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-kk/strings.xml b/tests/CarDeveloperOptions/res/values-kk/strings.xml
index d2a9c45..f301c5e 100644
--- a/tests/CarDeveloperOptions/res/values-kk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kk/strings.xml
@@ -208,7 +208,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"Порт аймағын аяқтауыңыз қажет."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"Егер хост жақтауы бос болса, порт жақтауы да бос болуы тиіс."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"Сіз терген порт жарамсыз."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP прокси браузер арқылы қолданылады, бірақ басқа қолданбалар оны пайдаланбауы мүмкін."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP прокси-серверін браузер пайдаланады, бірақ басқа қолданбалар пайдалана алмайды."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL мекенжайы: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL өткізу мүмкіндігі (кбит/сек):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL өткізу мүмкіндігі (кбит/сек):"</string>
@@ -326,7 +326,7 @@
     <string name="date_time_auto" msgid="2679132152303750218">"Желі уақытын пайдалану"</string>
     <string name="zone_auto_title" msgid="5500880975376882488">"Желінің уақыт белдеуін пайдалану"</string>
     <string name="date_time_24hour_auto" msgid="7499659679134962547">"Жергілікті әдепкі параметрді пайдалану"</string>
-    <string name="date_time_24hour_title" msgid="6209923858891621283">"24 сағаттық пішім"</string>
+    <string name="date_time_24hour_title" msgid="6209923858891621283">"24 сағаттық формат"</string>
     <string name="date_time_24hour" msgid="1265706705061608742">"24 сағаттық форматты қолдану"</string>
     <string name="date_time_set_time_title" msgid="7116850506333406367">"Уақыт"</string>
     <string name="time_format_category_title" msgid="518820270017543364">"Уақыт форматы"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын орнатыңыз немесе экран құлыптау опциясын таңдаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын орнатыңыз немесе экран құлыптау опциясын таңдаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экранын құлыптау арқылы қорғаңыз. Бетті тану функциясын реттеу үшін экран құлпы қажет. \"Бас тарту\" түймесін түртіп, PIN кодын орнатыңыз немесе экран құлыптау опциясын таңдаңыз."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN коды реттелмесін бе?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Құпия сөз реттелмесін бе?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Өрнек реттелмесін бе?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Экран құлпын орнату"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобильдік"</item>
+    <item msgid="6007360612667098926">"Тек Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1168,7 +1170,7 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"Табиғи"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"Жарқын"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"Қаныққан"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Адаптивті"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Бейімделгіш"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"Тек анық түстерді пайдаланыңыз"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"Түстердің ашықтығы мен анықтығын реттеңіз"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"Планшетті айналдырғанда бағытын автоматты түрде ауыстыру"</string>
@@ -1364,7 +1366,7 @@
     <string name="memory_calculating_size" msgid="8407591625479256510">"Есептеуде…"</string>
     <string name="memory_apps_usage" msgid="1886814780760368266">"Қолданбалар мен қолданба деректері"</string>
     <string name="memory_media_usage" msgid="2744652206722240527">"Meдиа"</string>
-    <string name="memory_downloads_usage" msgid="7039979723012065168">"Жүктеулер"</string>
+    <string name="memory_downloads_usage" msgid="7039979723012065168">"Жүктеп алынғандар"</string>
     <string name="memory_dcim_usage" msgid="599009211606524732">"Фотосуреттер, видеолар"</string>
     <string name="memory_music_usage" msgid="809605300042546279">"Aудио (музыка, әуендер, подкастар, т.б.)"</string>
     <string name="memory_media_misc_usage" msgid="6258827529046910705">"Басқа файлдар"</string>
@@ -2621,9 +2623,9 @@
     <string name="header_account_settings" msgid="8586173964125512219">"Есептік жазба параметрлері"</string>
     <string name="remove_account_label" msgid="5885425720323823387">"Есептік жазбаны жою"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Есептік жазба қосу"</string>
-    <string name="really_remove_account_title" msgid="4166512362915154319">"Есептік жазба алынсын ба?"</string>
+    <string name="really_remove_account_title" msgid="4166512362915154319">"Есептік жазба жойылсын ба?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Бұл есептік жазбаны алып тастау нәтижесінде оның хабарлары, контактілері және басқа планшет деректері жойылады!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Бұл есептік жазбаны алып тастаса, телефоннан барлық хабарлар, контактілер мен басқа деректер жойылады!"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Бұл есептік жазба жойылса, телефоннан барлық хабарлар, контактілер мен басқа деректер өшіріледі!"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Бұл есептік жазба жойылса, құрылғыдағы барлық хабарлар, контактілер және басқа деректер қоса жойылады!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Әкімші бұл өзгертуге рұқсат бермеген"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Қолмен синхрондау мүмкін болмады"</string>
@@ -3029,8 +3031,8 @@
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"дерек шығыны"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="7795222675849060444">"Жалғанған құрылғылар"</string>
-    <string name="connected_devices_dashboard_summary" msgid="1072664369515033179">"Bluetooth, көлік жүргізу режимі, NFC"</string>
-    <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, көлік жүргізу режимі"</string>
+    <string name="connected_devices_dashboard_summary" msgid="1072664369515033179">"Bluetooth, автокөлік режимі, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, автокөлік режимі"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Қолданбалар мен хабарландырулар"</string>
@@ -3379,9 +3381,9 @@
     <string name="display_vr_pref_off" msgid="4681320968818852691">"Жыпылықтауды азайту"</string>
     <string name="picture_in_picture_title" msgid="4960733106166035448">"Суреттегі сурет"</string>
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"Орнатылған қолданбалардың ешқайсысы \"сурет ішіндегі сурет\" режимін қолдамайды"</string>
-    <string name="picture_in_picture_keywords" msgid="7326958702002259262">"сурет ішіндегі сурет"</string>
+    <string name="picture_in_picture_keywords" msgid="7326958702002259262">"суреттегі сурет"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Суреттегі сурет"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"\"Сурет ішіндегі сурет\" режиміне рұқсат беру"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"\"Суреттегі сурет\" режиміне рұқсат беру"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Қолданба ашық болғанда не одан шыққанда (мысалы, бейнені көре беру үшін), бұл қолданбаға суреттегі сурет терезесін ашуға мүмкіндік береді. Бұл терезе пайдаланылып жатқан басқа қолданбалардың үстінен шығады."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"\"Мазаламау\" режимін пайдалану"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\"Мазаламау\" режимін пайдалануға рұқсат ету"</string>
@@ -3587,7 +3589,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"Сұрамастан ашу"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Қолдау көрсетілетін сілтемелер"</string>
     <string name="app_launch_other_defaults_title" msgid="2986685757258232543">"Басқа әдепкі мәндер"</string>
-    <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ішінде <xliff:g id="SIZE">%1$s</xliff:g> пайдаланылған"</string>
+    <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g> пайдаланылған"</string>
     <string name="storage_type_internal" msgid="4434212376539293892">"Ішкі жад"</string>
     <string name="storage_type_external" msgid="8827468573685648108">"Сыртқы жад"</string>
     <string name="data_summary_format" msgid="5022135392347814271">"<xliff:g id="DATE">%2$s</xliff:g> бері <xliff:g id="SIZE">%1$s</xliff:g>"</string>
@@ -3675,7 +3677,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Пайдалануға рұқсат беру"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Қолданба пайдалану параметрлері"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Пайдалану уақыты"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Пайдалану мүмкіндігі қолданбаға сіз пайдаланатын басқа қолданбаларды және қаншалықты жиі пайдаланатыңыз туралы ақпаратты, сондай-ақ операторды, тіл параметрлерін және басқа мәліметтерді бақылауға мүмкіндік береді."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Пайдалану тарихын көру мүмкіндігі қолданбаға сіз пайдаланатын басқа қолданбаларды және қаншалықты жиі пайдаланатыңыз туралы ақпаратты, сондай-ақ операторды, тіл параметрлерін және басқа мәліметтерді бақылауға мүмкіндік береді."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Жад"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Жад туралы мәліметтер"</string>
     <string name="always_running" msgid="5320183445080208766">"Әрдайым қосулы (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3796,8 +3798,8 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Басқа қолданбалардың үстінен көрсету"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Қолданбалар"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Басқа қолданбалардың үстінен көрсету"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Басқа қолданбалардың үстінен көрсетуге рұқсат беру"</string>
-    <string name="allow_overlay_description" msgid="6669524816705082807">"Қолданбаның пайдаланылып жатқан басқа қолданбалардың үстінен көрсетілуіне рұқсат беріңіз. Ол аталған қолданбаларды пайдалануыңызға кедергі келтіріп, олардың көрсетілуін не жұмыс әдісін өзгертуі ықтимал."</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Басқа қолданба үстінен көрсетуге рұқсат беру"</string>
+    <string name="allow_overlay_description" msgid="6669524816705082807">"Қолданбаның пайдаланылып жатқан басқа қолданбалардың үстінен көрсетілуіне рұқсат беріледі. Ол қолданбаларды пайдалануыңызға кедергі келтіріп, олардың көрсетілуін не жұмысын өзгертуі мүмкін."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"виртуалды шындық тыңдаушысының стерео көмекші қызметі"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"жүйе ескертуі терезесі дилогтық терезені басқа қолданбалардың үстінен көрсету"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"Басқа қолданбалардың үстінен көрсету"</string>
@@ -3811,8 +3813,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> ішінен <xliff:g id="COUNT_0">%1$d</xliff:g> қолданбаға жүйелік параметрлерді өзгертуге рұқсат етілген"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Қаржылық қолданбаларға қатысты SMS хабарларын көру"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Басқа қолданбаларды орната алады"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Жүйелік параметрлерді өзгертуге болады"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"Жүйелік параметрлерді өзгертуге болады"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Жүйе параметрлерін өзгерте алады"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Жүйе параметрлерін өзгерте алады"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Жүйелік параметрлерді өзгерту"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Жүйелік параметрлерді өзгертуге рұқсат ету"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"Бұл рұқсат қолданбаға жүйелік параметрлерді өзгертуге рұқсат етеді."</string>
@@ -4236,7 +4238,7 @@
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"Жалпы <xliff:g id="TOTAL">%1$s</xliff:g> жадтан пайдаланылған"</string>
     <string name="storage_percent_full" msgid="6924662861545958442">"пайдаланылған"</string>
-    <string name="clear_instant_app_data" msgid="3673669086522890405">"Қолданбаны деректерін өшіру"</string>
+    <string name="clear_instant_app_data" msgid="3673669086522890405">"Қолданбаны өшіру"</string>
     <string name="clear_instant_app_confirmation" msgid="1778553115373698061">"Бұл лездік қолданбаны өшіргіңіз келе ме?"</string>
     <string name="launch_instant_app" msgid="5251693061228352333">"Ашу"</string>
     <string name="game_storage_settings" msgid="6856911551799175914">"Ойындар"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Бұл — телефонның жұмысын баяулатуы мүмкін."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GNSS толық өлшемдерін қосу"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Жұмыс циклінсіз барлық GNSS тізбектері мен жиіліктерін қадағалау"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Пайдаланушыларды ауыстырудағы түзету деректері"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Пайдаланушыны ауыстыру кезінде толық мәліметтерді көрсету"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Фондық әрекеттердің басталуына рұқсат ету"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Барлық фондық әрекеттердің басталуына рұқсат етеді."</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Ақау туралы хабарларды әрдайым көрсету"</string>
diff --git a/tests/CarDeveloperOptions/res/values-km-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-km-nokeys/strings.xml
new file mode 100644
index 0000000..ac50830
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-km-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"គ្រប់គ្រង​កម្មវិធី"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-km/arrays.xml b/tests/CarDeveloperOptions/res/values-km/arrays.xml
new file mode 100644
index 0000000..5951f65
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-km/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"អាមេរិក"</item>
+    <item msgid="4791956477275129121">"អឺរ៉ុប"</item>
+    <item msgid="3812126832016254559">"អាហ្រ្វិក"</item>
+    <item msgid="2765816300353408280">"អាស៊ី"</item>
+    <item msgid="6683489385344409742">"អូស្ត្រាលី"</item>
+    <item msgid="5194868215515664953">"ប៉ាស៊ីហ្វិក"</item>
+    <item msgid="7044520255415007865">"ទាំងអស់"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"១៥វិនាទី"</item>
+    <item msgid="772029947136115322">"30 វិនាទី"</item>
+    <item msgid="8743663928349474087">"1 នាទី"</item>
+    <item msgid="1506508631223164814">"2 នាទី"</item>
+    <item msgid="8664703938127907662">"៥ នាទី"</item>
+    <item msgid="5827960506924849753">"១០ នាទី"</item>
+    <item msgid="6677424950124253938">"៣០ នាទី"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"កុំឲ្យសោះ"</item>
+    <item msgid="2517785806387977252">"១៥ វិនាទី"</item>
+    <item msgid="6347954399441173672">"30 វិនាទី"</item>
+    <item msgid="4858305253279921789">"1 នាទី"</item>
+    <item msgid="8109273437140044073">"2 នាទី"</item>
+    <item msgid="2788593551142462622">"៥ នាទី"</item>
+    <item msgid="8012672183888404961">"១០ នាទី"</item>
+    <item msgid="8271452751594598661">"៣០ នាទី"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ភ្លាម​ៗ"</item>
+    <item msgid="2038544972632026612">"៥ វិនាទី"</item>
+    <item msgid="5558060663472279597">"១៥ វិនាទី"</item>
+    <item msgid="45341168505452037">"30 វិនាទី"</item>
+    <item msgid="227647485917789272">"1 នាទី"</item>
+    <item msgid="3367011891231217504">"2 នាទី"</item>
+    <item msgid="4376575879222393045">"៥ នាទី"</item>
+    <item msgid="811192536981678974">"១០ នាទី"</item>
+    <item msgid="7258394417241706272">"៣០ នាទី"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"តូច"</item>
+    <item msgid="591935967183159581">"លំនាំដើម"</item>
+    <item msgid="1714184661981538355">"ធំ"</item>
+    <item msgid="6195563047686707484">"ធំបំផុត"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"កំពុង​វិភាគ​រក…"</item>
+    <item msgid="5597394826455877834">"កំពុង​ត​ភ្ជាប់​…"</item>
+    <item msgid="5848277343965362748">"កំពុង​ផ្ទៀងផ្ទាត់..."</item>
+    <item msgid="3391238031431440676">"កំពុង​ទទួល​អាសយដ្ឋាន IP…"</item>
+    <item msgid="5257597310494000224">"បានភ្ជាប់"</item>
+    <item msgid="8472497592913050396">"បានផ្អាក"</item>
+    <item msgid="1228072488815999109">"កំពុង​ផ្ដាច់…"</item>
+    <item msgid="7253087004422991731">"បាន​ផ្ដាច់"</item>
+    <item msgid="4169850917304751227">"មិន​ជោគជ័យ"</item>
+    <item msgid="6266658166690831131">"បាន​រារាំង"</item>
+    <item msgid="4517230805854909775">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ​ជា​បណ្ដោះ​អាសន្ន"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"កំពុង​វិភាគ​រក..."</item>
+    <item msgid="8058143476674427024">"កំពុង​តភ្ជាប់​ទៅ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"កំពុង​ផ្ទៀងផ្ទាត់​ជា​មួយ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"កំពុង​ទទួល​អាសយដ្ឋាន IP ពី <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"បាន​តភ្ជាប់​ទៅ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"បានផ្អាក"</item>
+    <item msgid="4133290864821295785">"កំពុង​ផ្ដាច់​ពីរ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"បាន​ផ្ដាច់"</item>
+    <item msgid="2847316776634969068">"មិន​ជោគជ័យ"</item>
+    <item msgid="4390990424746035383">"បាន​រារាំង"</item>
+    <item msgid="3618248791367063949">"ជៀសវាង​ការ​តភ្ជាប់​​ខ្សោយ​ជា​បណ្ដោះអាសន្ន"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"ប៊ូតុង​ចុច"</item>
+    <item msgid="7401896200768713930">"កូដ PIN ពី​ឧបករណ៍​"</item>
+    <item msgid="4526848028011846710">"កូដ PIN ពី​ឧបករណ៍​នេះ"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"បានភ្ជាប់"</item>
+    <item msgid="983792611851499732">"បាន​​អញ្ជើញ"</item>
+    <item msgid="5438273405428201793">"មិន​ជោគជ័យ"</item>
+    <item msgid="4646663015449312554">"អាចប្រើបាន"</item>
+    <item msgid="3230556734162006146">"ក្រៅ​តំបន់"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 នាទី"</item>
+    <item msgid="2759776603549270587">"៥​នាទី"</item>
+    <item msgid="167772676068860015">"1 ម៉ោង"</item>
+    <item msgid="5985477119043628504">"កុំ​អស់​ពេល"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ប្រើលំនាំដើម​របស់ប្រព័ន្ធ៖ <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ខ្សោយ​"</item>
+    <item msgid="7882129634982603782">"ខ្សោយ​"</item>
+    <item msgid="6457357501905996224">"មធ្យម"</item>
+    <item msgid="405271628162918841">"ខ្លាំង"</item>
+    <item msgid="999948812884919584">"ល្អ​ណាស់"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 ថ្ងៃ​មុន"</item>
+    <item msgid="3211287705232736964">"កំណត់រង្វង់ប្រើប្រាស់..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ពេល​វាល​ប្រើ"</item>
+    <item msgid="2784401352592276015">"បាន​ប្រើ​​​ចុងក្រោយ"</item>
+    <item msgid="249854287216326349">"ឈ្មោះ​កម្មវិធី"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"គ្មាន"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"គ្មាន"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"គ្មាន"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"ថេរ"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"គ្មាន"</item>
+    <item msgid="1464741437353223198">"ឯកសារណែនាំ"</item>
+    <item msgid="5793600062487886090">"រចនាសម្ព័ន្ធប្រូកស៊ីស្វ័យប្រវត្តិ"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"គ្មាន"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ឬ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"មិន​បាន​បញ្ជាក់"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"គ្មាន"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ឧបករណ៍​ផ្ទុក​ខាង​ក្នុង"</item>
+    <item msgid="3186681694079967527">"កាត​អេសឌី​​ដែល​អាច​ដក​បាន"</item>
+    <item msgid="6902033473986647035">"ឲ្យ​ប្រព័ន្ធ​សម្រេចចិត្ត​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ទី​តាំង​"</item>
+    <item msgid="6842381562497597649">"ផ្ទាល់ខ្លួន"</item>
+    <item msgid="3966700236695683444">"ការ​ផ្ញើ​សារ"</item>
+    <item msgid="8563996233342430477">"មេឌៀ"</item>
+    <item msgid="5323851085993963783">"ឧបករណ៍"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ទីតាំង​មិន​ល្អ"</item>
+    <item msgid="1830619568689922920">"ទីតាំង​ល្អ"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ញ័រ"</item>
+    <item msgid="8632513128515114092">"អាន​ទំនាក់ទំនង"</item>
+    <item msgid="3741042113569620272">"កែ​ទំនាក់ទំនង"</item>
+    <item msgid="4204420969709009931">"អាន​​បញ្ជី​​ហៅ"</item>
+    <item msgid="2260380357119423209">"កែ​កំណត់​ហេតុ​ហៅ"</item>
+    <item msgid="6550710385014530934">"អាន​ប្រតិទិន"</item>
+    <item msgid="3575906174264853951">"កែ​ប្រតិទិន"</item>
+    <item msgid="4319843242568057174">"វិភាគ​រក វ៉ាយហ្វាយ"</item>
+    <item msgid="2981791890467303819">"ការ​ជូនដំណឹង"</item>
+    <item msgid="6617825156152476692">"វិភាគ​រក​ក្រុម"</item>
+    <item msgid="8865260890611559753">"ហៅ​ទូរស័ព្ទ"</item>
+    <item msgid="3254999273961542982">"អាន​សារ SMS"</item>
+    <item msgid="7711446453028825171">"សរសេរ SMS"</item>
+    <item msgid="6123238544099198034">"ទទួល SMS"</item>
+    <item msgid="838342167431596036">"ទទួល​សារ SMS ពេល​អាសន្ន"</item>
+    <item msgid="8554432731560956686">"ទទួល MMS"</item>
+    <item msgid="7464863464299515059">"ទទួល WAP push"</item>
+    <item msgid="310463075729606765">"ផ្ញើ​សារ SMS"</item>
+    <item msgid="7338021933527689514">"អាន​សារ SMS ICC"</item>
+    <item msgid="6130369335466613036">"សរសេរ ICC SMS"</item>
+    <item msgid="6536865581421670942">"កែ​ការ​កំណត់"</item>
+    <item msgid="4547203129183558973">"គូរ​នៅ​ផ្នែក​ខាង​លើ"</item>
+    <item msgid="9080347512916542840">"ចូល​មើល​ការ​ជូន​ដំណឹង"</item>
+    <item msgid="5332718516635907742">"ម៉ាស៊ីន​ថត"</item>
+    <item msgid="6098422447246167852">"ថត​សំឡេង"</item>
+    <item msgid="9182794235292595296">"ចាក់​អូឌីយ៉ូ"</item>
+    <item msgid="8760743229597702019">"អាន​ក្ដារតម្បៀតខ្ទាស់"</item>
+    <item msgid="2266923698240538544">"កែ​ក្ដារតម្បៀតខ្ទាស់"</item>
+    <item msgid="1801619438618539275">"ប៊ូតុង​មេឌៀ"</item>
+    <item msgid="31588119965784465">"ការ​ផ្ដោត​សំឡេង"</item>
+    <item msgid="7565226799008076833">"កម្រិត​សំឡេង​មេ"</item>
+    <item msgid="5420704980305018295">"កម្រិត​សំឡេង​​"</item>
+    <item msgid="5797363115508970204">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="8233154098550715999">"កម្រិត​សំឡេង​មេឌៀ"</item>
+    <item msgid="5196715605078153950">"កម្រិត​សំឡេងម៉ោង​រោទ៍"</item>
+    <item msgid="394030698764284577">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
+    <item msgid="8952898972491680178">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
+    <item msgid="8506227454543690851">"មិន​ដេក"</item>
+    <item msgid="1108160036049727420">"តាមដាន​ទីតាំង"</item>
+    <item msgid="1496205959751719491">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
+    <item msgid="3776296279910987380">"ទទួល​​ស្ថិតិ​​ប្រើប្រាស់"</item>
+    <item msgid="8827100324471975602">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
+    <item msgid="6880736730520126864">"បង្ហាញថូស"</item>
+    <item msgid="4933375960222609935">"មេឌៀ​គម្រោង"</item>
+    <item msgid="8357907018938895462">"ធ្វើឲ្យ VPN សកម្ម"</item>
+    <item msgid="8143812849911310973">"សរសេរផ្ទាំងរូបភាព"</item>
+    <item msgid="6266277260961066535">"រចនាសម្ព័ន្ធជំនួយ"</item>
+    <item msgid="7715498149883482300">"រូបថតអេក្រង់ជំនួយ"</item>
+    <item msgid="4046679376726313293">"អានស្ថានភាពទូរស័ព្ទ"</item>
+    <item msgid="6329507266039719587">"បន្ថែមសារជាសំឡេង"</item>
+    <item msgid="7692440726415391408">"ប្រើ sip"</item>
+    <item msgid="8572453398128326267">"កំពុងដំណើរការហៅចេញ"</item>
+    <item msgid="7775674394089376306">"ស្នាមម្រាមដៃ"</item>
+    <item msgid="3182815133441738779">"ឧបករណ៍ចាប់សញ្ញារាងកាយ"</item>
+    <item msgid="2793100005496829513">"អានការផ្សព្វផ្សាយសារចល័ត"</item>
+    <item msgid="2633626056029384366">"ទីតាំងបញ្ឆោត"</item>
+    <item msgid="8356842191824684631">"អានទំហំផ្ទុក"</item>
+    <item msgid="5671906070163291500">"សរសេរទំហំផ្ទុក"</item>
+    <item msgid="2791955098549340418">"បើកអេក្រង់"</item>
+    <item msgid="5599435119609178367">"ទទួលគណនី"</item>
+    <item msgid="1165623660533024666">"រត់នៅក្នុងផ្ទៃខាងក្រោយ"</item>
+    <item msgid="6423861043647911030">"កម្រិតសំឡេងភាពងាយស្រួល"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"ខ្លី"</item>
+    <item msgid="4816511817309094890">"មធ្យម"</item>
+    <item msgid="8305084671259331134">"វែង"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"លំនាំដើម"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"ធម្មតា"</item>
+    <item msgid="4627069151979553527">"សរសេរ​ជាប់​គ្នា"</item>
+    <item msgid="6896773537705206194">"អក្សរ​ពុម្ព​ធំ​ល្អិត"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"តូច​ណាស់"</item>
+    <item msgid="5091603983404027034">"តូច"</item>
+    <item msgid="176844712416932112">"ធម្មតា"</item>
+    <item msgid="2784236342175159295">"ធំ"</item>
+    <item msgid="218913203203160606">"ធំ​ណាស់"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"លំនាំដើម"</item>
+    <item msgid="6488643537808152001">"គ្មាន"</item>
+    <item msgid="552332815156010137">"គ្រោង"</item>
+    <item msgid="7187891159463789272">"ទម្លាក់​ស្រមោល"</item>
+    <item msgid="8019330250538856521">"បង្កើន"</item>
+    <item msgid="8987385315647049787">"បន្ថយ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"២៥%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"៧៥%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"ប្រើ​លំនាំដើម​កម្មវិធី"</item>
+    <item msgid="8611890312638868524">"ពណ៌ស​លើ​ពណ៌​ខ្មៅ"</item>
+    <item msgid="5891360837786277638">"ពណ៌​ខ្មៅ​លើ​ពណ៌​ស"</item>
+    <item msgid="2798457065945456853">"ពណ៌លឿង​​លើ​​ពណ៌​ខ្មៅ"</item>
+    <item msgid="5799049811524553967">"ពណ៌លឿង​លើ​ពណ៌ខៀវ"</item>
+    <item msgid="3673930830658169860">"ផ្ទាល់ខ្លួន"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN ជា​មួយ​សោ​ចែករំលែក​ជាមុន"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN ជា​មួយ​វិញ្ញាបនបត្រ"</item>
+    <item msgid="312397853907741968">"IPSec VPN ជា​មួយ​សោ​ចែករំលែក​ជាមុន និង​ការ​ផ្ទៀងផ្ទាត់ Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN ជា​មួយ​ការ​ផ្ទៀងផ្ទាត់​វិញ្ញាបនបត្រ និង Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN ជា​មួយ​វិញ្ញាបនបត្រ និង​ការ​ផ្ទៀងផ្ទាត់​ឆ្លង"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"គ្មាន"</item>
+    <item msgid="1157046369795346308">"ឯកសារណែនាំ"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"បាន​ផ្ដាច់"</item>
+    <item msgid="8754480102834556765">"កំពុង​​ចាប់ផ្ដើម…"</item>
+    <item msgid="3351334355574270250">"កំពុង​ត​ភ្ជាប់​…"</item>
+    <item msgid="8303882153995748352">"បានភ្ជាប់"</item>
+    <item msgid="9135049670787351881">"អស់​ពេល​"</item>
+    <item msgid="2124868417182583926">"មិន​ជោគជ័យ"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"សួរ"</item>
+    <item msgid="7718817231348607934">"កុំ​អនុញ្ញាត"</item>
+    <item msgid="8184570120217958741">"អនុញ្ញាត​ជា​និច្ច"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ជាប់​លាប់"</item>
+    <item msgid="167418068739176448">"សកម្មភាព​​លើ​គេ"</item>
+    <item msgid="4760813290195199773">"សំខាន់ (ផ្ទៃ​ខាង​មុខ​)"</item>
+    <item msgid="2328684826817647595">"សំខាន់ (ផ្ទៃ​ខាង​ក្រោយ​)"</item>
+    <item msgid="7746406490652867365">"បម្រុង​ទុក"</item>
+    <item msgid="5597404364389196754">"ប្រើ​ច្រើន"</item>
+    <item msgid="1290888779300174556">"សេវាកម្ម (កំពុង​ដំណើរការ)"</item>
+    <item msgid="7241098542073939046">"សេវាកម្ម (ចាប់ផ្ដើម​ឡើង​វិញ)"</item>
+    <item msgid="6610439017684111046">"កម្មវិធី​ទទួល"</item>
+    <item msgid="7367606086319921117">"ដើម"</item>
+    <item msgid="3344660712396741826">"សកម្ម​ភាព​ចុង​ក្រោយ"</item>
+    <item msgid="5006559348883303865">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (សកម្មភាព​)"</item>
+    <item msgid="8633480732468137525">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ម៉ាស៊ីន​​កូន​សកម្មភាព​)"</item>
+    <item msgid="6248998242443333892">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ទទេ​)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"បៃតង​​ចាស់"</item>
+    <item msgid="3228505970082457852">"ពណ៌ខៀវ"</item>
+    <item msgid="6590260735734795647">"ពណ៌​ឆ្លុះ"</item>
+    <item msgid="3521763377357218577">"ស្វាយ"</item>
+    <item msgid="5932337981182999919">"ផ្កាឈូក"</item>
+    <item msgid="5642914536624000094">"ពណ៌ក្រហម"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"លើសពី 30 ថ្ងៃ"</item>
+    <item msgid="8699273238891265610">"លើសពី 60 ថ្ងៃ"</item>
+    <item msgid="8346279419423837266">"លើសពី 90 ថ្ងៃ"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ចាប់ដោយ​ស្វ័យ​ប្រវត្តិ"</item>
+    <item msgid="773943026484148895">"ចាត់​ទុកថាមានការកំណត់"</item>
+    <item msgid="1008268820118852416">"​ចាត់​ទុកថាមិនមាន​ការកំណត់ទេ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ប្រើ MAC ចៃដន្យ (លំនាំដើម)"</item>
+    <item msgid="214234417308375326">"ប្រើ MAC ឧបករណ៍"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ទេ"</item>
+    <item msgid="1930581185557754880">"បាទ/ចាស"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ងងឹត"</item>
+    <item msgid="5079453644557603349">"ភ្លឺ"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"បិទ"</item>
+    <item msgid="4072198137051566919">"ជួសជុល"</item>
+    <item msgid="2473005316958868509">"រៀបរាប់"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ផ្ទះ​​ប៉ុណ្ណោះ"</item>
+    <item msgid="1161026694891024702">"ស្វ័យប្រវត្តិ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"ប្រើ GSM/WCDMA ជាអាទិភាព"</item>
+    <item msgid="7581481130337402578">"GSM ប៉ុណ្ណោះ"</item>
+    <item msgid="8579197487913425819">"WCDMA ប៉ុណ្ណោះ"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ស្វ័យ​ប្រវត្តិ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ស្វ័យ​ប្រវត្តិ"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo ប៉ុណ្ណោះ"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"សកល"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA ប៉ុណ្ណោះ"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/ស៊ីម"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"សកល"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-km/strings.xml b/tests/CarDeveloperOptions/res/values-km/strings.xml
index 648d628..c54c6a9 100644
--- a/tests/CarDeveloperOptions/res/values-km/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-km/strings.xml
@@ -128,7 +128,7 @@
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"សំណើ​ផ្គូផ្គង"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"ប៉ះដើម្បីផ្គូផ្គងជាមួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"ឯកសារ​ដែល​បានទទួល"</string>
-    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"បាន​ទទួល​ឯកសារ​តាម​រយៈ​ប៊្លូធូស"</string>
+    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"ឯកសារដែលបាន​ទទួល​​តាម​រយៈ​ប៊្លូធូស"</string>
     <string name="device_picker" msgid="8345264486071697705">"ជ្រើស​ឧបករណ៍​ប៊្លូ​ធូ​ស"</string>
     <string name="bluetooth_ask_enablement" msgid="8716802066127746062">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់បើកប៊្លូធូស"</string>
     <string name="bluetooth_ask_disablement" msgid="7125319551097350783">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់បិទប៊្លូធូស"</string>
@@ -327,7 +327,7 @@
     <string name="zone_auto_title" msgid="5500880975376882488">"ប្រើ​ល្វែងម៉ោង​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_24hour_auto" msgid="7499659679134962547">"ប្រើភាសា​លំនាំដើម"</string>
     <string name="date_time_24hour_title" msgid="6209923858891621283">"ប្រព័ន្ធ 24 ម៉ោង"</string>
-    <string name="date_time_24hour" msgid="1265706705061608742">"ប្រើ​ប្រព័ន្ធ ២៤ ម៉ោង"</string>
+    <string name="date_time_24hour" msgid="1265706705061608742">"ប្រើ​ទម្រង់ 24 ម៉ោង"</string>
     <string name="date_time_set_time_title" msgid="7116850506333406367">"ម៉ោង"</string>
     <string name="time_format_category_title" msgid="518820270017543364">"ទម្រង់​ម៉ោង"</string>
     <string name="date_time_set_timezone_title" msgid="7385810505603797962">"ល្វែងម៉ោង"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ការពារថេប្លេត​របស់អ្នកដោយប្រើជម្រើស​ចាក់សោអេក្រង់ណាមួយ ដើម្បី​កុំឱ្យអ្នក​ផ្សេង​អាចប្រើថេប្លេត​នេះ ប្រសិនបើវា​បាត់ ឬត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ការផ្ទៀងផ្ទាត់​មុខផងដែរ។ សូមចុច​បោះបង់ រួចកំណត់កូដ PIN ឬជ្រើសរើស​ជម្រើស​ចាក់សោអេក្រង់​ផ្សេងទៀត។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ការពារឧបករណ៍​របស់អ្នក​ដោយប្រើជម្រើស​ចាក់សោអេក្រង់ណាមួយ ដើម្បី​កុំឱ្យអ្នក​ផ្សេង​អាចប្រើឧបករណ៍​នេះ ប្រសិនបើវាបាត់ ឬត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ការផ្ទៀងផ្ទាត់​មុខផងដែរ។ សូមចុច​បោះបង់ រួចកំណត់កូដ PIN ឬជ្រើសរើស​ជម្រើស​ចាក់សោអេក្រង់​ផ្សេងទៀត។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ការពារទូរសព្ទ​របស់អ្នក​ដោយប្រើជម្រើស​ចាក់សោអេក្រង់ណាមួយ ដើម្បី​កុំឱ្យអ្នក​ផ្សេង​អាចប្រើទូរសព្ទ​នេះ ប្រសិនបើវា​បាត់ ឬត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ការផ្ទៀងផ្ទាត់​មុខផងដែរ។ សូមចុច​បោះបង់ រួចកំណត់កូដ PIN ឬជ្រើសរើស​ជម្រើស​ចាក់សោអេក្រង់​ផ្សេងទៀត។"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"រំលងការ​រៀបចំកូដ PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"រំលង​ការរៀបចំ​ពាក្យសម្ងាត់?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"រំលង​ការរៀបចំ​លំនាំ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"កំណត់ការចាក់សោអេក្រង់"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ទូរសព្ទ​ចល័ត"</item>
+    <item msgid="6007360612667098926">"Wi-Fi តែប៉ុណ្ណោះ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"មុខងារនេះ​នឹង​ធ្វើឱ្យ​ទូរសព្ទ​នេះ​ដំណើរការយឺត"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"ជំរុញការវាស់ GNSS ពេញលេញ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"តាមដានក្រុមរូបថត និងហ្រេ្វកង់ GNSS ទាំងអស់​ដែល​គ្មាន​ការបែង​ចែក​រយៈពេល​ដំណើរការ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ជួសជុល​ការប្ដូរអ្នក​ប្រើប្រាស់"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"បង្ហាញព័ត៌មាន​លម្អិត អំឡុងពេល​ប្ដូរអ្នកប្រើប្រាស់"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"អនុញ្ញាតឱ្យ​សកម្មភាពនៅ​ផ្ទៃខាងក្រោយ​ចាប់ផ្តើម"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"អនុញ្ញាតឱ្យ​សកម្មភាព​នៅផ្ទៃខាងក្រោយ​ទាំងអស់​ចាប់ផ្តើម"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"បង្ហាញ​ប្រអប់បញ្ចូល​នៃ​ការ​គាំង​ជានិច្ច"</string>
diff --git a/tests/CarDeveloperOptions/res/values-kn-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-kn-nokeys/strings.xml
new file mode 100644
index 0000000..fb7c367
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-kn-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-kn/arrays.xml b/tests/CarDeveloperOptions/res/values-kn/arrays.xml
new file mode 100644
index 0000000..073f9a3
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-kn/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"ಅಮೆರಿಕ"</item>
+    <item msgid="4791956477275129121">"ಯೂರೋಪ್"</item>
+    <item msgid="3812126832016254559">"ಆಫ್ರಿಕಾ"</item>
+    <item msgid="2765816300353408280">"ಏಷ್ಯಾ"</item>
+    <item msgid="6683489385344409742">"ಆಸ್ಟ್ರೇಲಿಯ"</item>
+    <item msgid="5194868215515664953">"ಪೆಸಿಫಿಕ್"</item>
+    <item msgid="7044520255415007865">"ಎಲ್ಲಾ"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="772029947136115322">"30 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="8743663928349474087">"1 ನಿಮಿಷ"</item>
+    <item msgid="1506508631223164814">"2 ನಿಮಿಷಗಳು"</item>
+    <item msgid="8664703938127907662">"5 ನಿಮಿಷಗಳು"</item>
+    <item msgid="5827960506924849753">"10 ನಿಮಿಷಗಳು"</item>
+    <item msgid="6677424950124253938">"30 ನಿಮಿಷಗಳು"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ತಕ್ಷಣವೇ"</item>
+    <item msgid="2038544972632026612">"5 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="5558060663472279597">"15 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="45341168505452037">"30 ಸೆಕೆಂಡುಗಳು"</item>
+    <item msgid="227647485917789272">"1 ನಿಮಿಷ"</item>
+    <item msgid="3367011891231217504">"2 ನಿಮಿಷಗಳು"</item>
+    <item msgid="4376575879222393045">"5 ನಿಮಿಷಗಳು"</item>
+    <item msgid="811192536981678974">"10 ನಿಮಿಷಗಳು"</item>
+    <item msgid="7258394417241706272">"30 ನಿಮಿಷಗಳು"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</item>
+    <item msgid="983792611851499732">"ಆಹ್ವಾನಿಸಲಾಗಿದೆ"</item>
+    <item msgid="5438273405428201793">"ವಿಫಲವಾಗಿದೆ"</item>
+    <item msgid="4646663015449312554">"ಲಭ್ಯತೆ"</item>
+    <item msgid="3230556734162006146">"ವ್ಯಾಪ್ತಿಯ ಹೊರಗಿದೆ"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 ನಿಮಿಷಗಳು"</item>
+    <item msgid="2759776603549270587">"5 ನಿಮಿಷಗಳು"</item>
+    <item msgid="167772676068860015">"1 ಗಂಟೆ"</item>
+    <item msgid="5985477119043628504">"ಎಂದಿಗೂ ಅವಧಿ ಮೀರದಿರಲಿ"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ಸಿಸ್ಟಂ ಡೀಫಾಲ್ಟ್ ಬಳಸಿ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"ಕಳೆದ 30 ದಿನಗಳು"</item>
+    <item msgid="3211287705232736964">"ಬಳಕೆಯ ಆವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ಬಳಕೆ ಸಮಯ"</item>
+    <item msgid="2784401352592276015">"ಕಳೆದ ಬಾರಿಯ ಬಳಕೆ"</item>
+    <item msgid="249854287216326349">"ಅಪ್ಲಿಕೇಶನ್ ಹೆಸರು"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ಯಾವುದೂ ಅಲ್ಲ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ಸಿಮ್"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="1464741437353223198">"ಹಸ್ತಚಾಲಿತ"</item>
+    <item msgid="5793600062487886090">"ಪ್ರಾಕ್ಸಿ ಸ್ವಯಂ-ಕಾನ್ಫಿಗ್"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ಅಥವಾ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗದ್ದು"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ಆಂತರಿಕ ಸಾಧನ ಸಂಗ್ರಹಣೆ"</item>
+    <item msgid="3186681694079967527">"ತೆಗೆದುಹಾಕಬಹುದಾದ SD ಕಾರ್ಡ್"</item>
+    <item msgid="6902033473986647035">"ಸಿಸ್ಟಂ ನಿರ್ಧರಿಸಲಿ"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ಸ್ಥಳ"</item>
+    <item msgid="6842381562497597649">"ವೈಯಕ್ತಿಕ"</item>
+    <item msgid="3966700236695683444">"ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</item>
+    <item msgid="8563996233342430477">"ಮಾಧ್ಯಮ"</item>
+    <item msgid="5323851085993963783">"ಸಾಧನ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ಒರಟು ಸ್ಥಳ"</item>
+    <item msgid="1830619568689922920">"ಉತ್ಕೃಷ್ಟ ಸ್ಥಳ"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ಕಂಪನ"</item>
+    <item msgid="8632513128515114092">"ಓದುವ ಸಂಪರ್ಕಗಳು"</item>
+    <item msgid="3741042113569620272">"ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="4204420969709009931">"ಕರೆಯ ಲಾಗ್‌ ಓದಿ"</item>
+    <item msgid="2260380357119423209">"ಕರೆಯ ಲಾಗ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="6550710385014530934">"ಕ್ಯಾಲೆಂಡರ್‌ ಓದಿ"</item>
+    <item msgid="3575906174264853951">"ಕ್ಯಾಲೆಂಡರ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="4319843242568057174">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನ್‌"</item>
+    <item msgid="2981791890467303819">"ಅಧಿಸೂಚನೆ"</item>
+    <item msgid="6617825156152476692">"ಸೆಲ್ ಸ್ಕ್ಯಾನ್"</item>
+    <item msgid="8865260890611559753">"ಫೋನ್‌‌ಗೆ ಕರೆಮಾಡಿ"</item>
+    <item msgid="3254999273961542982">"SMS ಓದಿ"</item>
+    <item msgid="7711446453028825171">"SMS ಬರೆಯಿರಿ"</item>
+    <item msgid="6123238544099198034">"SMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="838342167431596036">"ತುರ್ತು SMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="8554432731560956686">"MMS ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="7464863464299515059">"WAP ಪುಶ್‌ ಸ್ವೀಕರಿಸಿ"</item>
+    <item msgid="310463075729606765">"SMS ಕಳುಹಿಸು"</item>
+    <item msgid="7338021933527689514">"ICC SMS ಓದಿ"</item>
+    <item msgid="6130369335466613036">"ICC SMS ಬರೆಯಿರಿ"</item>
+    <item msgid="6536865581421670942">"ಸೆಟ್ಟಿಂಗ್‌‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="4547203129183558973">"ಮೇಲಕ್ಕೆ ಎಳೆಯಿರಿ"</item>
+    <item msgid="9080347512916542840">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</item>
+    <item msgid="5332718516635907742">"ಕ್ಯಾಮರಾ"</item>
+    <item msgid="6098422447246167852">"ಆಡಿಯೋ ರೆಕಾರ್ಡ್‌ ಮಾಡಲು"</item>
+    <item msgid="9182794235292595296">"ಆಡಿಯೋ ಪ್ಲೇ ಮಾಡಿ"</item>
+    <item msgid="8760743229597702019">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ ಓದಿ"</item>
+    <item msgid="2266923698240538544">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
+    <item msgid="1801619438618539275">"ಮಾಧ್ಯಮ ಬಟನ್‌ಗಳು"</item>
+    <item msgid="31588119965784465">"ಆಡಿಯೋ ಫೋಕಸ್"</item>
+    <item msgid="7565226799008076833">"ಮಾಸ್ಟರ್‌ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="5420704980305018295">"ಧ್ವನಿ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="5797363115508970204">"ರಿಂಗ್‌ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="8233154098550715999">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="5196715605078153950">"ಎಚ್ಚರಿಕೆ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="394030698764284577">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="8952898972491680178">"ಬ್ಲೂಟೂತ್ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="8506227454543690851">"ಎಚ್ಚರವಹಿಸಿ"</item>
+    <item msgid="1108160036049727420">"ಪರಿವೀಕ್ಷಣೆ ಸ್ಥಳ"</item>
+    <item msgid="1496205959751719491">"ಪರಿವೀಕ್ಷಣೆಯ ಹೆಚ್ಚಿನ ಸಾಮರ್ಥ್ಯದ ಸ್ಥಳ"</item>
+    <item msgid="3776296279910987380">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆಯಿರಿ"</item>
+    <item msgid="8827100324471975602">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
+    <item msgid="6880736730520126864">"ಟೋಸ್ಟ್ ತೋರಿಸಿ"</item>
+    <item msgid="4933375960222609935">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
+    <item msgid="8357907018938895462">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
+    <item msgid="8143812849911310973">"ವಾಲ್‌ಪೇಪರ್‌ ರೈಟ್ ಮಾಡಿ"</item>
+    <item msgid="6266277260961066535">"ವಿನ್ಯಾಸಕ್ಕೆ ಸಹಾಯ"</item>
+    <item msgid="7715498149883482300">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌‌ಗೆ ಸಹಾಯ"</item>
+    <item msgid="4046679376726313293">"ಫೋನ್ ಸ್ಥಿತಿಯನ್ನು ರೀಡ್‌ ಮಾಡಿ"</item>
+    <item msgid="6329507266039719587">"ಧ್ವನಿಮೇಲ್ ಸೇರಿಸಿ"</item>
+    <item msgid="7692440726415391408">"sip ಬಳಸಿ"</item>
+    <item msgid="8572453398128326267">"ಹೊರಹೋಗುವ ಕರೆಯನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಿ"</item>
+    <item msgid="7775674394089376306">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</item>
+    <item msgid="3182815133441738779">"ದೇಹ ಸೆನ್ಸರ್‌ಗಳು"</item>
+    <item msgid="2793100005496829513">"ಸೆಲ್ ಪ್ರಸಾರಗಳನ್ನು ರೀಡ್ ಮಾಡಿ"</item>
+    <item msgid="2633626056029384366">"ಸ್ಥಳ ನಕಲಿಸು"</item>
+    <item msgid="8356842191824684631">"ಸಂಗ್ರಹಣೆಯನ್ನು ರೀಡ್ ಮಾಡಿ"</item>
+    <item msgid="5671906070163291500">"ಸಂಗ್ರಹಣೆಯನ್ನು ರೈಟ್ ಮಾಡಿ"</item>
+    <item msgid="2791955098549340418">"ಸ್ಕ್ರೀನ್ ಆನ್ ಮಾಡಿ"</item>
+    <item msgid="5599435119609178367">"ಖಾತೆಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"</item>
+    <item msgid="1165623660533024666">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಮಾಡಿ"</item>
+    <item msgid="6423861043647911030">"ಪ್ರವೇಶಿಸುವಿಕೆ ವಾಲ್ಯೂಮ್‌"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"ಚಿಕ್ಕದು"</item>
+    <item msgid="4816511817309094890">"ಮಧ್ಯಮ"</item>
+    <item msgid="8305084671259331134">"ದೊಡ್ಡದು"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ಡೀಫಾಲ್ಟ್"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"ಪ್ರಾಸಂಗಿಕ"</item>
+    <item msgid="4627069151979553527">"ಹಸ್ತಾಕ್ಷರಲಿಪಿ"</item>
+    <item msgid="6896773537705206194">"ಸ್ಮಾಲ್‌ ಕ್ಯಾಪಿಟಲ್ಸ್‌‌"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ಡೀಫಾಲ್ಟ್"</item>
+    <item msgid="6488643537808152001">"ಯಾವುದೂ ಇಲ್ಲ"</item>
+    <item msgid="552332815156010137">"ಔಟ್‌ಲೈನ್"</item>
+    <item msgid="7187891159463789272">"ಡ್ರಾಪ್ ನೆರಳು"</item>
+    <item msgid="8019330250538856521">"ಹೆಚ್ಚಿಸಲಾಗಿದೆ"</item>
+    <item msgid="8987385315647049787">"ಕುಗ್ಗಿಸಲಾಗಿದೆ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"ಪೂರ್ವ-ಹಂಚಿಕೆಯಾದ ಕೀಗಳನ್ನು ಹೊಂದಿರುವ L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಹೊಂದಿರುವ L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"ಪೂರ್ವ-ಹಂಚಿಕೆಯಾದ ಕೀಗಳು ಮತ್ತು Xauth ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IPSec VPN"</item>
+    <item msgid="3319427315593649917">"ಪ್ರಮಾಣಪತ್ರಗಳು ಮತ್ತು Xauth ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IPSec VPN"</item>
+    <item msgid="8258927774145391041">"ಪ್ರಮಾಣಪತ್ರಗಳು ಮತ್ತು ಹೈಬ್ರಿಡ್ ಪ್ರಮಾಣೀಕರಣವನ್ನು ಹೊಂದಿರುವ IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ಯಾವುದೂ ಅಲ್ಲ"</item>
+    <item msgid="1157046369795346308">"ಹಸ್ತಚಾಲಿತ"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ಕೇಳಿ"</item>
+    <item msgid="7718817231348607934">"ಎಂದಿಗೂ ಅನುಮತಿಸಬೇಡಿ"</item>
+    <item msgid="8184570120217958741">"ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ನಿರಂತರ"</item>
+    <item msgid="167418068739176448">"ಉನ್ನತ ಚಟುವಟಿಕೆ"</item>
+    <item msgid="4760813290195199773">"ಪ್ರಮುಖ (ಮುನ್ನೆಲೆ)"</item>
+    <item msgid="2328684826817647595">"ಪ್ರಮುಖ (ಹಿನ್ನೆಲೆ)"</item>
+    <item msgid="7746406490652867365">"ಬ್ಯಾಕಪ್"</item>
+    <item msgid="5597404364389196754">"ಭಾರಿ ತೂಕ"</item>
+    <item msgid="1290888779300174556">"ಸೇವೆ (ಚಾಲನೆಯಲ್ಲಿದೆ)"</item>
+    <item msgid="7241098542073939046">"ಸೇವೆ (ಮರುಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ)"</item>
+    <item msgid="6610439017684111046">"ಸ್ವೀಕರಿಸುವವರು"</item>
+    <item msgid="7367606086319921117">"ಮುಖಪುಟ"</item>
+    <item msgid="3344660712396741826">"ಕೊನೆಯ ಚಟುವಟಿಕೆ"</item>
+    <item msgid="5006559348883303865">"ಕ್ಯಾಶ್ ಮಾಡಲಾಗಿದೆ (ಚಟುವಟಿಕೆ)"</item>
+    <item msgid="8633480732468137525">"ಕ್ಯಾಶ್ ಮಾಡಲಾದ (ಚಟುವಟಿಕೆ ಕ್ಲೈಂಟ್)"</item>
+    <item msgid="6248998242443333892">"ಕ್ಯಾಶ್ ಮಾಡಲಾಗಿದೆ (ಖಾಲಿ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ಗಾಢ ಹಸಿರು-ನೀಲಿ"</item>
+    <item msgid="3228505970082457852">"ನೀಲಿ"</item>
+    <item msgid="6590260735734795647">"ಊದಾ"</item>
+    <item msgid="3521763377357218577">"ನೇರಳೆ"</item>
+    <item msgid="5932337981182999919">"ಗುಲಾಬಿ ಬಣ್ಣ"</item>
+    <item msgid="5642914536624000094">"ಕೆಂಪು"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
+    <item msgid="8699273238891265610">"60 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
+    <item msgid="8346279419423837266">"90 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪತ್ತೆಹಚ್ಚಿರಿ"</item>
+    <item msgid="773943026484148895">"ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
+    <item msgid="1008268820118852416">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ಯಾದೃಚ್ಛಿಕವಾದ MAC (ಡೀಫಾಲ್ಟ್) ಅನ್ನು ಬಳಸಿ"</item>
+    <item msgid="214234417308375326">"ಸಾಧನದ MAC ಬಳಸಿ"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ಇಲ್ಲ"</item>
+    <item msgid="1930581185557754880">"ಹೌದು"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ಕತ್ತಲೆ"</item>
+    <item msgid="5079453644557603349">"ಹಗುರ"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ಆಫ್"</item>
+    <item msgid="4072198137051566919">"ಡೀಬಗ್ ಮಾಡಿ"</item>
+    <item msgid="2473005316958868509">"ಅತಿಯಾದ ಮಾತು"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ಹೋಮ್ ಮಾತ್ರ"</item>
+    <item msgid="1161026694891024702">"ಸ್ವಯಂಚಾಲಿತ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</item>
+    <item msgid="7581481130337402578">"GSM ಮಾತ್ರ"</item>
+    <item msgid="8579197487913425819">"WCDMA ಮಾತ್ರ"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ಸ್ವಯಂ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ಸ್ವಯಂ"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo ಮಾತ್ರ"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ಜಾಗತಿಕ"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA ಮಾತ್ರ"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/ಸಿಮ್‌"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ಜಾಗತಿಕ"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-kn/strings.xml b/tests/CarDeveloperOptions/res/values-kn/strings.xml
index b9b14d4..af78069 100644
--- a/tests/CarDeveloperOptions/res/values-kn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kn/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಜೊತೆಗೆ ಸುರಕ್ಷಿತಗೊಳಿಸಿ, ಆದ್ದರಿಂದ ಅದು ಕಳೆದುಹೋದಾಗ ಅಥವಾ ಅಪಹರಣವಾದಾಗ ಅದನ್ನು ಯಾರಾದರೂ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮುಖ ಗುರುತಿಸುವಿಕೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ ಆಯ್ಕೆಯೂ ಸಹ ಅಗತ್ಯವಿದೆ. ರದ್ದುಗೊಳಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ ಅಥವಾ ಮತ್ತೊಂದು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಜೊತೆಗೆ ಸುರಕ್ಷಿತಗೊಳಿಸಿ, ಆದ್ದರಿಂದ ಅದು ಕಳೆದುಹೋದಾಗ ಅಥವಾ ಅಪಹರಣವಾದಾಗ ಅದನ್ನು ಯಾರಾದರೂ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮುಖ ಗುರುತಿಸುವಿಕೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ ಆಯ್ಕೆಯೂ ಸಹ ಅಗತ್ಯವಿದೆ. ರದ್ದುಗೊಳಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ ಅಥವಾ ಮತ್ತೊಂದು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಜೊತೆಗೆ ಸುರಕ್ಷಿತಗೊಳಿಸಿ, ಆದ್ದರಿಂದ ಅದು ಕಳೆದುಹೋದಾಗ ಅಥವಾ ಅಪಹರಣವಾದಾಗ ಅದನ್ನು ಯಾರಾದರೂ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಮುಖ ಗುರುತಿಸುವಿಕೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ ಆಯ್ಕೆಯೂ ಸಹ ಅಗತ್ಯವಿದೆ. ರದ್ದುಗೊಳಿಸಿ ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಹೊಂದಿಸಿ ಅಥವಾ ಮತ್ತೊಂದು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ಪಿನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ಪಾಸ್‌ವರ್ಡ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ಪ್ಯಾಟರ್ನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಹೊಂದಿಸಿ"</string>
@@ -505,7 +504,7 @@
     <string name="fingerprint_delete_message" msgid="5895802741486967970">"ನೀವು ಈ ಫಿಂಗರ್‌ ಫ್ರಿಂಟ್ ಅಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಕೆಲಸದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಬಳಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
-    <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"ಹೌದು, ತೆಗೆದುಹಾಕು"</string>
+    <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"ಹೌದು, ತೆಗೆದುಹಾಕಿ"</string>
     <string name="crypt_keeper_settings_title" msgid="839783588093862748">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್"</string>
@@ -629,7 +628,7 @@
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1201259228331105948">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಇಲ್ಲದೆ ಪ್ರೊಫೈಲ್ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ಈ ಪ್ರೊಫೈಲ್‌ನಿಂದ ನಿಮ್ಮ ಉಳಿಸಲಾದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ಗಳನ್ನು ಸಹ ತೆಗೆದುಹಾಕಲಾಗುವುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅವುಗಳ ಮೂಲಕ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
-    <string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"ಹೌದು, ತೆಗೆದುಹಾಕು"</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"ಹೌದು, ತೆಗೆದುಹಾಕಿ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="7622476883851319877">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_password_title" msgid="7886432065775170719">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್‌ ಬದಲಾಯಿಸಿ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ವೈ-ಫೈ"</item>
+    <item msgid="4421333712484542489">"ಮೊಬೈಲ್"</item>
+    <item msgid="6007360612667098926">"ವೈ-ಫೈ ಮಾತ್ರ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1265,14 +1267,14 @@
     <string name="sim_lock_settings_summary_off" msgid="348656447968142307">"ಆಫ್"</string>
     <string name="sim_lock_settings_summary_on" msgid="3440707542514810045">"ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="sim_lock_settings_title" msgid="877336472752342977">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್"</string>
-    <string name="sim_pin_toggle" msgid="2026507420678167488">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಮಾಡು"</string>
+    <string name="sim_pin_toggle" msgid="2026507420678167488">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಮಾಡಿ"</string>
     <string name="sim_lock_on" product="tablet" msgid="3917977767884071323">"ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸಲು ಪಿನ್‌ ಅಗತ್ಯವಿದೆ"</string>
     <string name="sim_lock_on" product="default" msgid="1363159192182487883">"ಫೋನ್ ಬಳಸಲು ಪಿನ್‌ ಅಗತ್ಯವಿದೆ"</string>
     <string name="sim_lock_off" product="tablet" msgid="8428566346685080195">"ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸಲು ಪಿನ್‌ ಅಗತ್ಯವಿದೆ"</string>
     <string name="sim_lock_off" product="default" msgid="5873747770983496755">"ಫೋನ್ ಬಳಸಲು ಪಿನ್‌ ಅಗತ್ಯವಿದೆ"</string>
     <string name="sim_pin_change" msgid="5615972926944053213">"ಸಿಮ್‌ ಪಿನ್‌ ಬದಲಾಯಿಸು"</string>
     <string name="sim_enter_pin" msgid="149201344579560481">"ಸಿಮ್‌ ಪಿನ್‌"</string>
-    <string name="sim_enable_sim_lock" msgid="4478794975656337476">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಮಾಡು"</string>
+    <string name="sim_enable_sim_lock" msgid="4478794975656337476">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಮಾಡಿ"</string>
     <string name="sim_disable_sim_lock" msgid="394864376519820956">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡು"</string>
     <string name="sim_enter_old" msgid="8984991229691526849">"ಹಳೆಯ ಸಿಮ್‌ ಪಿನ್‌"</string>
     <string name="sim_enter_new" msgid="1720792957661107585">"ಹೊಸ ಸಿಮ್‌ ಪಿನ್‌"</string>
@@ -2272,7 +2274,7 @@
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"ಬ್ಯಾಟರಿ ನಿರ್ವಾಹಕರನ್ನು ಆನ್‌ ಮಾಡಿ"</string>
     <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆನ್‌ ಮಾಡಿ"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಮೊದಲೇ ರನ್ ಆಗಬಹುದು"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"ಬ್ಯಾಟರಿ ರಕ್ಷಕ ಆನ್ ಆಗಿದೆ"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"ಬ್ಯಾಟರಿ ಸೇವರ್ ಆನ್ ಆಗಿದೆ"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳು ಸೀಮಿತವಾಗಿರಬಹುದು"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="4103005178310487352">"ಫೋನ್ ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
@@ -2603,7 +2605,7 @@
     <string name="sync_enabled" msgid="535172627223336983">"ಸಿಂಕ್ ಆನ್ ಆಗಿದೆ"</string>
     <string name="sync_disabled" msgid="713721807204805062">"ಸಿಂಕ್‌ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="sync_error" msgid="988155155932442765">"ಸಿಂಕ್ ದೋಷ"</string>
-    <string name="last_synced" msgid="4511434057768999129">"ಕೊನೆಯದಾಗಿ ಸಿಂಕ್ ಮಾಡಿರುವುದು <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4511434057768999129">"ಕೊನೆಯದಾಗಿ ಸಿಂಕ್ ಮಾಡಿರುವುದು: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="1311828882739675714">"ಇದೀಗ ಸಿಂಕ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="settings_backup" msgid="3261579634252074247">"ಬ್ಯಾಕಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"ನನ್ನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬ್ಯಾಕ್‌ ಅಪ್ ಮಾಡು"</string>
@@ -2612,7 +2614,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"ಈಗ ಸಿಂಕ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"ಕ್ಯಾಲೆಂಡರ್"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ಸಿಂಕ್‌ಗೆ ಸ್ವಾಗತ!"</font>" \nನಿಮ್ಮ ಸಂಪರ್ಕಗಳು, ಪೂರ್ವನಿಗದಿಗಳು, ಮತ್ತು ನೀವು ಎಲ್ಲಿದ್ದೀರೋ ಅಲ್ಲಿಂದಲೇ ಇನ್ನಷ್ಟನ್ನು ಪ್ರವೇಶಿಸಲು ಅನುಮತಿಸಲು ಡೇಟಾವನ್ನು ಸಿಂಕ್‌ ಮಾಡಲು Google ನ ಒಂದು ತೊಡಗುವಿಕೆಯಾಗಿದೆ."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"ಅಪ್ಲಿಕೇಶನ್ ಸಿಂಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -3626,7 +3628,7 @@
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="filter_enabled_apps" msgid="5888459261768538489">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="filter_instant_apps" msgid="8087483282854072366">"ತತ್‌ಕ್ಷಣ ಆಪ್‌ಗಳು"</string>
+    <string name="filter_instant_apps" msgid="8087483282854072366">"ಇನ್‌ಸ್ಟಂಟ್ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"ಕೆಲಸ"</string>
     <string name="filter_notif_all_apps" msgid="1862666327228804896">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು: ಎಲ್ಲ"</string>
@@ -3657,7 +3659,7 @@
     <string name="default_apps_title" msgid="3848048391400989931">"ಡಿಫಾಲ್ಟ್"</string>
     <string name="default_for_work" msgid="7290411716804495366">"ಕೆಲಸದ ಡಿಫಾಲ್ಟ್"</string>
     <string name="assist_and_voice_input_title" msgid="324148194703846130">"ಸಹಾಯ &amp; ಧ್ವನಿ ಇನ್‌ಪುಟ್"</string>
-    <string name="default_assist_title" msgid="2060846994203235317">"ಅಪ್ಲಿಕೇಶನ್ ಸಹಾಯ"</string>
+    <string name="default_assist_title" msgid="2060846994203235317">"ಸಹಾಯಕ ಆ್ಯಪ್"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ಅನ್ನು ನಿಮ್ಮ ಸಹಾಯಕವನ್ನಾಗಿ ಮಾಡುವುದೇ?"</string>
     <string name="assistant_security_warning" msgid="1304057692847069938">"ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿ ಗೋಚರಿಸುವ ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿಯೇ ಪ್ರವೇಶಿಸಬಹುದಾದಂತಹ ಮಾಹಿತಿ ಸೇರಿದಂತೆ ನಿಮ್ಮ ಸಿಸ್ಟಂನಲ್ಲಿ ಬಳಕೆಯಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಕುರಿತು ಮಾಹಿತಿಯನ್ನು ಓದಲು ಸಹಾಯಕಕ್ಕೆ ಸಾಧ್ಯವಾಗಬಹುದು."</string>
     <string name="assistant_security_warning_agree" msgid="5105692801460137289">"ಅನುಮೋದಿಸು"</string>
@@ -3785,7 +3787,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶವನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳುವುದೇ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"ಈ ಅಪ್ಲಿಕೇಶನ್ ರಚಿಸಿರುವಂತಹ ಎಲ್ಲ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಬೇಡಿ"</string>
-    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡು"</string>
+    <string name="ignore_optimizations_off" msgid="4372289432580282870">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಿ"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ತ್ವರಿತವಾಗಿ ಬರಿದಾಗಿಸಬಹುದು. ಹಿನ್ನೆಲೆ ಬ್ಯಾಟರಿ ಬಳಸದಂತೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಇನ್ನು ಮುಂದೆ ನಿರ್ಬಂಧಿಸಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="ignore_optimizations_off_desc" msgid="5598702251817814289">"ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ"</string>
     <string name="ignore_optimizations_title" msgid="7924345545276166305">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ಕಡೆಗಣಿಸಲು <xliff:g id="APP">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
@@ -3886,7 +3888,7 @@
     <string name="condition_zen_title" msgid="2128184708916052585">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಆಗಿದೆ"</string>
     <string name="condition_zen_summary_phone_muted" msgid="4396050395522974654">"ಫೋನ್ ಅನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="3435216391993785818">"ವಿನಾಯಿತಿಗಳು ಸೇರಿವೆ"</string>
-    <string name="condition_battery_title" msgid="6704870010912986274">"ಬ್ಯಾಟರಿ ರಕ್ಷಕ ಆನ್ ಆಗಿದೆ"</string>
+    <string name="condition_battery_title" msgid="6704870010912986274">"ಬ್ಯಾಟರಿ ಸೇವರ್ ಆನ್ ಆಗಿದೆ"</string>
     <string name="condition_battery_summary" msgid="1236078243905690620">"ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="condition_cellular_title" msgid="6605277435894307935">"ಮೊಬೈಲ್ ಡೇಟಾ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="condition_cellular_summary" msgid="3607459310548343777">"ಇಂಟರ್ನೆಟ್, ಕೇವಲ ವೈ-ಫೈ ಮೂಲಕ ಲಭ್ಯವಿದೆ"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ಇದರಿಂದ, ಫೋನ್‌ನ ಕಾರ್ಯಾಚರಣೆ ನಿಧಾನವಾಗುತ್ತದೆ"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"ಫೋರ್ಸ್‌ ಫುಲ್ GNSS ಅಳತೆಗಳು"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ಯಾವುದೇ ಡ್ಯೂಟಿ ಸೈಕ್ಲಿಂಗ್ ಇಲ್ಲದೆ ಎಲ್ಲಾ GNSS ಕಾನ್ಸ್ಟಲೇಶನ್‌ಗಳು ಮತ್ತು ಆವರ್ತನೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ಡೀಬಗ್ ಬಳಕೆದಾರರ ಸ್ವಿಚ್"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ಬಳಕೆದಾರರನ್ನು ಬದಲಾಯಿಸುವಾಗ ವಿವರವಾದ ಮಾಹಿತಿಯನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತದೆ"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ ಪ್ರಾರಂಭಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"ಎಲ್ಲಾ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆ ಪ್ರಾರಂಭಿಸುವಿಕೆಗಳನ್ನು ಅನುಮತಿಸುತ್ತದೆ"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ಯಾವಾಗಲೂ ಕ್ರ್ಯಾಶ್ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ko-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ko-nokeys/strings.xml
new file mode 100644
index 0000000..51f2b43
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ko-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"애플리케이션 관리"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ko/arrays.xml b/tests/CarDeveloperOptions/res/values-ko/arrays.xml
new file mode 100644
index 0000000..a7a5ba5
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ko/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"미국"</item>
+    <item msgid="4791956477275129121">"유럽"</item>
+    <item msgid="3812126832016254559">"아프리카"</item>
+    <item msgid="2765816300353408280">"아시아"</item>
+    <item msgid="6683489385344409742">"호주"</item>
+    <item msgid="5194868215515664953">"태평양"</item>
+    <item msgid="7044520255415007865">"전체"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15초"</item>
+    <item msgid="772029947136115322">"30초"</item>
+    <item msgid="8743663928349474087">"1분"</item>
+    <item msgid="1506508631223164814">"2분"</item>
+    <item msgid="8664703938127907662">"5분"</item>
+    <item msgid="5827960506924849753">"10분"</item>
+    <item msgid="6677424950124253938">"30분"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"사용 안함"</item>
+    <item msgid="2517785806387977252">"15초"</item>
+    <item msgid="6347954399441173672">"30초"</item>
+    <item msgid="4858305253279921789">"1분"</item>
+    <item msgid="8109273437140044073">"2분"</item>
+    <item msgid="2788593551142462622">"5분"</item>
+    <item msgid="8012672183888404961">"10분"</item>
+    <item msgid="8271452751594598661">"30분"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"즉시"</item>
+    <item msgid="2038544972632026612">"5초"</item>
+    <item msgid="5558060663472279597">"15초"</item>
+    <item msgid="45341168505452037">"30초"</item>
+    <item msgid="227647485917789272">"1분"</item>
+    <item msgid="3367011891231217504">"2분"</item>
+    <item msgid="4376575879222393045">"5분"</item>
+    <item msgid="811192536981678974">"10분"</item>
+    <item msgid="7258394417241706272">"30분"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"작게"</item>
+    <item msgid="591935967183159581">"기본"</item>
+    <item msgid="1714184661981538355">"크게"</item>
+    <item msgid="6195563047686707484">"가장 크게"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"검색 중..."</item>
+    <item msgid="5597394826455877834">"연결 중..."</item>
+    <item msgid="5848277343965362748">"인증 중..."</item>
+    <item msgid="3391238031431440676">"IP 주소를 가져오는 중..."</item>
+    <item msgid="5257597310494000224">"연결됨"</item>
+    <item msgid="8472497592913050396">"일시 정지됨"</item>
+    <item msgid="1228072488815999109">"연결을 끊는 중…"</item>
+    <item msgid="7253087004422991731">"연결 끊김"</item>
+    <item msgid="4169850917304751227">"실패"</item>
+    <item msgid="6266658166690831131">"차단됨"</item>
+    <item msgid="4517230805854909775">"연결 불량 일시적으로 방지"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"검색 중..."</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결 중..."</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 인증하는 중..."</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 IP 주소를 가져오는 중..."</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결됨"</item>
+    <item msgid="6600156231416890902">"일시 정지됨"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 연결을 끊는 중..."</item>
+    <item msgid="3980154971187953257">"연결 끊김"</item>
+    <item msgid="2847316776634969068">"실패"</item>
+    <item msgid="4390990424746035383">"차단됨"</item>
+    <item msgid="3618248791367063949">"연결 상태 불량 일시적으로 방지"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"누름 버튼"</item>
+    <item msgid="7401896200768713930">"피어 기기 PIN"</item>
+    <item msgid="4526848028011846710">"이 기기의 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"연결됨"</item>
+    <item msgid="983792611851499732">"초대됨"</item>
+    <item msgid="5438273405428201793">"실패"</item>
+    <item msgid="4646663015449312554">"사용 가능"</item>
+    <item msgid="3230556734162006146">"범위를 벗어났습니다."</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2분"</item>
+    <item msgid="2759776603549270587">"5분"</item>
+    <item msgid="167772676068860015">"1시간"</item>
+    <item msgid="5985477119043628504">"제한 시간 없음"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"시스템 기본값 사용: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>개"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"매우 약함"</item>
+    <item msgid="7882129634982603782">"매우 약함"</item>
+    <item msgid="6457357501905996224">"양호"</item>
+    <item msgid="405271628162918841">"좋음"</item>
+    <item msgid="999948812884919584">"매우 좋음"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"최근 30일"</item>
+    <item msgid="3211287705232736964">"사용 주기 설정..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"사용 시간"</item>
+    <item msgid="2784401352592276015">"최근 사용"</item>
+    <item msgid="249854287216326349">"앱 이름"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"없음"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"없음"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"없음"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"고정"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"없음"</item>
+    <item msgid="1464741437353223198">"수동"</item>
+    <item msgid="5793600062487886090">"프록시 자동 구성"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"없음"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP 또는 CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"지정되지 않음"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"없음"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"내부 기기 저장용량"</item>
+    <item msgid="3186681694079967527">"이동식 SD 카드"</item>
+    <item msgid="6902033473986647035">"시스템에서 결정"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"위치"</item>
+    <item msgid="6842381562497597649">"개인"</item>
+    <item msgid="3966700236695683444">"메시지"</item>
+    <item msgid="8563996233342430477">"미디어"</item>
+    <item msgid="5323851085993963783">"기기"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"대략적 위치"</item>
+    <item msgid="1830619568689922920">"세부 위치"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"진동"</item>
+    <item msgid="8632513128515114092">"주소록 읽기"</item>
+    <item msgid="3741042113569620272">"주소록 수정"</item>
+    <item msgid="4204420969709009931">"통화 기록 읽기"</item>
+    <item msgid="2260380357119423209">"통화 기록 수정"</item>
+    <item msgid="6550710385014530934">"캘린더 읽기"</item>
+    <item msgid="3575906174264853951">"캘린더 수정"</item>
+    <item msgid="4319843242568057174">"Wi-Fi 검색"</item>
+    <item msgid="2981791890467303819">"알림"</item>
+    <item msgid="6617825156152476692">"셀 검색"</item>
+    <item msgid="8865260890611559753">"전화 걸기"</item>
+    <item msgid="3254999273961542982">"SMS 읽기"</item>
+    <item msgid="7711446453028825171">"SMS 작성하기"</item>
+    <item msgid="6123238544099198034">"SMS 수신"</item>
+    <item msgid="838342167431596036">"긴급 SMS 수신"</item>
+    <item msgid="8554432731560956686">"MMS 수신"</item>
+    <item msgid="7464863464299515059">"WAP PUSH 수신"</item>
+    <item msgid="310463075729606765">"SMS 보내기"</item>
+    <item msgid="7338021933527689514">"ICC SMS 읽기"</item>
+    <item msgid="6130369335466613036">"ICC SMS 작성하기"</item>
+    <item msgid="6536865581421670942">"설정 수정"</item>
+    <item msgid="4547203129183558973">"위에 그림"</item>
+    <item msgid="9080347512916542840">"액세스 알림"</item>
+    <item msgid="5332718516635907742">"카메라"</item>
+    <item msgid="6098422447246167852">"오디오 녹음"</item>
+    <item msgid="9182794235292595296">"오디오 재생"</item>
+    <item msgid="8760743229597702019">"클립보드 읽기"</item>
+    <item msgid="2266923698240538544">"클립보드 수정"</item>
+    <item msgid="1801619438618539275">"미디어 버튼"</item>
+    <item msgid="31588119965784465">"오디오 포커스"</item>
+    <item msgid="7565226799008076833">"마스터 볼륨"</item>
+    <item msgid="5420704980305018295">"음성 볼륨"</item>
+    <item msgid="5797363115508970204">"벨소리 볼륨"</item>
+    <item msgid="8233154098550715999">"미디어 볼륨"</item>
+    <item msgid="5196715605078153950">"알람 볼륨"</item>
+    <item msgid="394030698764284577">"알림 볼륨"</item>
+    <item msgid="8952898972491680178">"블루투스 볼륨"</item>
+    <item msgid="8506227454543690851">"켜진 상태로 유지"</item>
+    <item msgid="1108160036049727420">"위치 모니터링"</item>
+    <item msgid="1496205959751719491">"고전력 위치 모니터링"</item>
+    <item msgid="3776296279910987380">"사용 통계 가져오기"</item>
+    <item msgid="8827100324471975602">"마이크 음소거/음소거 해제"</item>
+    <item msgid="6880736730520126864">"토스트 표시"</item>
+    <item msgid="4933375960222609935">"프로젝트 미디어"</item>
+    <item msgid="8357907018938895462">"VPN 활성화"</item>
+    <item msgid="8143812849911310973">"배경화면 작성"</item>
+    <item msgid="6266277260961066535">"구조 지원"</item>
+    <item msgid="7715498149883482300">"스크린샷 지원"</item>
+    <item msgid="4046679376726313293">"휴대전화 상태 읽기"</item>
+    <item msgid="6329507266039719587">"음성사서함 추가"</item>
+    <item msgid="7692440726415391408">"SIP 사용"</item>
+    <item msgid="8572453398128326267">"발신 전화 처리"</item>
+    <item msgid="7775674394089376306">"지문"</item>
+    <item msgid="3182815133441738779">"인체 감지 센서"</item>
+    <item msgid="2793100005496829513">"셀 브로드캐스트 읽기"</item>
+    <item msgid="2633626056029384366">"가상 위치"</item>
+    <item msgid="8356842191824684631">"저장용량 읽기"</item>
+    <item msgid="5671906070163291500">"저장용량 작성"</item>
+    <item msgid="2791955098549340418">"화면 켜기"</item>
+    <item msgid="5599435119609178367">"계정 가져오기"</item>
+    <item msgid="1165623660533024666">"백그라운드에서 실행"</item>
+    <item msgid="6423861043647911030">"접근성 볼륨"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"위치"</item>
+    <item msgid="6656077694190491067">"위치"</item>
+    <item msgid="8790228218278477369">"위치"</item>
+    <item msgid="7836406246005211990">"진동"</item>
+    <item msgid="3951439024549922598">"주소록 읽기"</item>
+    <item msgid="8802152411647068">"주소록 수정"</item>
+    <item msgid="229544934599698735">"통화 기록 읽기"</item>
+    <item msgid="7396102294405899613">"통화 기록 수정"</item>
+    <item msgid="3597797992398484655">"캘린더 읽기"</item>
+    <item msgid="2705975774250907343">"캘린더 수정"</item>
+    <item msgid="4668747371441932697">"위치"</item>
+    <item msgid="1487578921720243646">"소식 알림"</item>
+    <item msgid="4636080349724146638">"위치"</item>
+    <item msgid="673510900286463926">"전화 걸기"</item>
+    <item msgid="542083422784609790">"SMS/MMS 읽기"</item>
+    <item msgid="1033780373029588436">"SMS/MMS 쓰기"</item>
+    <item msgid="5647111115517787488">"SMS/MMS 수신"</item>
+    <item msgid="8591105601108455893">"SMS/MMS 수신"</item>
+    <item msgid="7730995008517841903">"SMS/MMS 수신"</item>
+    <item msgid="2613033109026626086">"SMS/MMS 수신"</item>
+    <item msgid="3037159047591081136">"SMS/MMS 전송"</item>
+    <item msgid="4726682243833913568">"SMS/MMS 읽기"</item>
+    <item msgid="6555678522277865572">"SMS/MMS 쓰기"</item>
+    <item msgid="6981734935578130884">"설정 수정"</item>
+    <item msgid="8705854389991425629">"위에 그림"</item>
+    <item msgid="5861356020344153651">"액세스 알림"</item>
+    <item msgid="78432174621628659">"카메라"</item>
+    <item msgid="3986116419882154794">"오디오 녹음"</item>
+    <item msgid="4516840825756409490">"오디오 재생"</item>
+    <item msgid="6811712502798183957">"클립보드 읽기"</item>
+    <item msgid="2780369012602289114">"클립보드 수정"</item>
+    <item msgid="2331359440170850868">"미디어 버튼"</item>
+    <item msgid="6133599737122751231">"오디오 포커스"</item>
+    <item msgid="6844485713404805301">"마스터 볼륨"</item>
+    <item msgid="1600379420669104929">"음성 볼륨"</item>
+    <item msgid="6296768210470214866">"벨소리 볼륨"</item>
+    <item msgid="510690696071629241">"미디어 볼륨"</item>
+    <item msgid="406861638631430109">"알람 볼륨"</item>
+    <item msgid="4715864795872233884">"알림 볼륨"</item>
+    <item msgid="2311478519251301183">"블루투스 볼륨"</item>
+    <item msgid="5133991377896747027">"켜진 상태로 유지"</item>
+    <item msgid="2464189519136248621">"위치"</item>
+    <item msgid="2062677934050803037">"위치"</item>
+    <item msgid="1735171933192715957">"사용 통계 가져오기"</item>
+    <item msgid="1014093788778383554">"마이크 음소거/음소거 해제"</item>
+    <item msgid="4199297950608622850">"토스트 표시"</item>
+    <item msgid="2527962435313398821">"프로젝트 미디어"</item>
+    <item msgid="5117506254221861929">"VPN 활성화"</item>
+    <item msgid="8291198322681891160">"배경화면 작성"</item>
+    <item msgid="7106921284621230961">"구조 지원"</item>
+    <item msgid="4496533640894624799">"스크린샷 지원"</item>
+    <item msgid="2598847264853993611">"휴대전화 상태 읽기"</item>
+    <item msgid="9215610846802973353">"음성사서함 추가"</item>
+    <item msgid="9186411956086478261">"SIP 사용"</item>
+    <item msgid="6884763100104539558">"발신 전화 처리"</item>
+    <item msgid="125513972170580692">"지문"</item>
+    <item msgid="2556071024281275619">"인체 감지 센서"</item>
+    <item msgid="617168514928339387">"셀 브로드캐스트 읽기"</item>
+    <item msgid="7134693570516523585">"가상 위치"</item>
+    <item msgid="7224489175375229399">"저장용량 읽기"</item>
+    <item msgid="8472735063903258202">"저장용량 작성"</item>
+    <item msgid="4069276819909595110">"화면 켜기"</item>
+    <item msgid="1228338896751121025">"계정 가져오기"</item>
+    <item msgid="3181581793459233672">"백그라운드에서 실행"</item>
+    <item msgid="2340936043025374076">"접근성 볼륨"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"짧게"</item>
+    <item msgid="4816511817309094890">"보통"</item>
+    <item msgid="8305084671259331134">"길게"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"기본"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"좁은 Sans-serif"</item>
+    <item msgid="6529379119163117545">"Sans Serif 고정 너비"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif 고정 너비"</item>
+    <item msgid="4448481989108928248">"캐주얼"</item>
+    <item msgid="4627069151979553527">"필기체"</item>
+    <item msgid="6896773537705206194">"작은 대문자"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"아주 작게"</item>
+    <item msgid="5091603983404027034">"작게"</item>
+    <item msgid="176844712416932112">"보통"</item>
+    <item msgid="2784236342175159295">"크게"</item>
+    <item msgid="218913203203160606">"아주 크게"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"기본"</item>
+    <item msgid="6488643537808152001">"없음"</item>
+    <item msgid="552332815156010137">"윤곽선"</item>
+    <item msgid="7187891159463789272">"그림자"</item>
+    <item msgid="8019330250538856521">"높임"</item>
+    <item msgid="8987385315647049787">"낮춤"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"앱 기본값 사용"</item>
+    <item msgid="8611890312638868524">"검은색 바탕에 흰색"</item>
+    <item msgid="5891360837786277638">"흰색 바탕에 검정색"</item>
+    <item msgid="2798457065945456853">"검은색 바탕에 노란색"</item>
+    <item msgid="5799049811524553967">"파란색 바탕에 노란색"</item>
+    <item msgid="3673930830658169860">"사용자설정"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"사전 공유 키를 사용하는 L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"인증서가 있는 L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"사전 공유 키 및 Xauth 인증을 가진 IPSec VPN"</item>
+    <item msgid="3319427315593649917">"인증서 및 Xauth 인증을 가진 IPSec VPN"</item>
+    <item msgid="8258927774145391041">"인증서 및 하이브리드 인증을 가진 IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"선택 안함"</item>
+    <item msgid="1157046369795346308">"수동"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"연결 끊김"</item>
+    <item msgid="8754480102834556765">"초기화 중..."</item>
+    <item msgid="3351334355574270250">"연결 중..."</item>
+    <item msgid="8303882153995748352">"연결됨"</item>
+    <item msgid="9135049670787351881">"시간제한"</item>
+    <item msgid="2124868417182583926">"실패"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"질문"</item>
+    <item msgid="7718817231348607934">"허용 안함"</item>
+    <item msgid="8184570120217958741">"항상 허용"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"영구"</item>
+    <item msgid="167418068739176448">"메모리 사용이 가장 많은 활동"</item>
+    <item msgid="4760813290195199773">"중요(포그라운드)"</item>
+    <item msgid="2328684826817647595">"중요(백그라운드)"</item>
+    <item msgid="7746406490652867365">"백업"</item>
+    <item msgid="5597404364389196754">"무거운 활동"</item>
+    <item msgid="1290888779300174556">"서비스(운영 중)"</item>
+    <item msgid="7241098542073939046">"서비스(다시 시작 중)"</item>
+    <item msgid="6610439017684111046">"수신기"</item>
+    <item msgid="7367606086319921117">"홈"</item>
+    <item msgid="3344660712396741826">"마지막 활동"</item>
+    <item msgid="5006559348883303865">"캐시됨(활동)"</item>
+    <item msgid="8633480732468137525">"캐시됨(활동 클라이언트)"</item>
+    <item msgid="6248998242443333892">"캐시됨(비어 있음)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"청록색"</item>
+    <item msgid="3228505970082457852">"파란색"</item>
+    <item msgid="6590260735734795647">"남색"</item>
+    <item msgid="3521763377357218577">"보라색"</item>
+    <item msgid="5932337981182999919">"분홍색"</item>
+    <item msgid="5642914536624000094">"빨간색"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30일 이전"</item>
+    <item msgid="8699273238891265610">"60일 이전"</item>
+    <item msgid="8346279419423837266">"90일 이전"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"자동 감지"</item>
+    <item msgid="773943026484148895">"종량제 Wi-Fi로 취급"</item>
+    <item msgid="1008268820118852416">"무제한 Wi-Fi로 취급"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"임의의 MAC 사용(기본값)"</item>
+    <item msgid="214234417308375326">"기기 MAC 사용"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"아니요"</item>
+    <item msgid="1930581185557754880">"예"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"어둡게"</item>
+    <item msgid="5079453644557603349">"밝게"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"사용 안함"</item>
+    <item msgid="4072198137051566919">"디버그"</item>
+    <item msgid="2473005316958868509">"상세"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"집 전용"</item>
+    <item msgid="1161026694891024702">"자동"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA로 기본 설정"</item>
+    <item msgid="7581481130337402578">"GSM 전용"</item>
+    <item msgid="8579197487913425819">"WCDMA 전용"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA 자동"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo 자동"</item>
+    <item msgid="4219607161971472471">"CDMA(EvDo 없음)"</item>
+    <item msgid="7278975240951052041">"EvDo 전용"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA+LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"글로벌"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA 전용"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"글로벌"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ko/strings.xml b/tests/CarDeveloperOptions/res/values-ko/strings.xml
index a1b242e..b8657ba 100644
--- a/tests/CarDeveloperOptions/res/values-ko/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ko/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"태블릿을 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 태블릿을 보호하세요. 또한 얼굴 인증을 설정하려면 화면 잠금 옵션이 필요합니다. 취소를 탭한 다음 PIN을 설정하거나 다른 화면 잠금 옵션을 선택하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"기기를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 기기를 보호하세요. 또한 얼굴 인증을 설정하려면 화면 잠금 옵션이 필요합니다. 취소를 탭한 다음 PIN을 설정하거나 다른 화면 잠금 옵션을 선택하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"휴대전화를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 휴대전화를 보호하세요. 또한 얼굴 인증을 설정하려면 화면 잠금 옵션이 필요합니다. 취소를 탭한 다음 PIN을 설정하거나 다른 화면 잠금 옵션을 선택하세요."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"비밀번호 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"패턴 설정을 건너뛰시겠습니까?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"화면 잠금 설정"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"모바일"</item>
+    <item msgid="6007360612667098926">"Wi-Fi에서만"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1163,7 +1165,7 @@
     <string name="accessibility_personal_account_title" msgid="7251761883688839354">"개인 계정 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="5809250790214921377">"검색"</string>
     <string name="display_settings" msgid="1045535829232307190">"디스플레이"</string>
-    <string name="accelerometer_title" msgid="2427487734964971453">"자동 화면 회전"</string>
+    <string name="accelerometer_title" msgid="2427487734964971453">"화면 자동 회전"</string>
     <string name="color_mode_title" msgid="8164858320869449142">"색상"</string>
     <string name="color_mode_option_natural" msgid="1292837781836645320">"자연스럽게"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"생생하게"</string>
@@ -2233,7 +2235,7 @@
     <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"백그라운드 활동을 제한하시겠습니까?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
-    <string name="device_screen_usage" msgid="4470485475363132750">"충전 완료 후 화면 사용"</string>
+    <string name="device_screen_usage" msgid="4470485475363132750">"충전 완료 후 화면 사용 시간"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"충전 완료 후 배터리 사용"</string>
     <string name="screen_usage_summary" msgid="263396144684078341">"충전 완료 후 화면이 켜진 시간"</string>
     <string name="device_usage_list_summary" msgid="8299017481332816368">"충전 완료 후 기기 사용"</string>
@@ -2420,7 +2422,7 @@
     <string name="battery_used_by" msgid="840331542883421888">"<xliff:g id="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$s</xliff:g> 사용"</string>
     <string name="battery_overall_usage" msgid="5874301442415987516">"전체 배터리 사용량의 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="3814176986148084378">"마지막 충전 완료 후 사용 내역 분석"</string>
-    <string name="battery_last_full_charge" msgid="5624033030647170717">"마지막 충전 완료"</string>
+    <string name="battery_last_full_charge" msgid="5624033030647170717">"충전 완료 시간"</string>
     <string name="battery_full_charge_last" msgid="4614554109170251301">"충전 완료 후 사용 가능 시간"</string>
     <string name="battery_footer_summary" msgid="4828444679643906943">"배터리 사용 데이터는 대략적인 수치이며, 사용량에 따라 변경될 수 있습니다."</string>
     <string name="battery_detail_foreground" msgid="6616408559186553085">"연속사용 중일 때"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"휴대전화 속도를 저하시키는 기능입니다."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"전체 GNSS 측정 강제 사용"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"듀티 사이클 없이 모든 GNSS 배열 및 빈도를 추적"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"사용자 전환 관련 세부정보 표시"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"사용자 전환 중에 자세한 정보를 표시합니다."</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"백그라운드 활동 시작 허용"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"모든 백그라운드 활동 시작 허용"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"비정상 종료 대화상자 항상 표시"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ky-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ky-nokeys/strings.xml
new file mode 100644
index 0000000..8ac55e4
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ky-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Колдонмолорду башкаруу"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ky/arrays.xml b/tests/CarDeveloperOptions/res/values-ky/arrays.xml
new file mode 100644
index 0000000..46dc219
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ky/arrays.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америка"</item>
+    <item msgid="4791956477275129121">"Европа"</item>
+    <item msgid="3812126832016254559">"Африка"</item>
+    <item msgid="2765816300353408280">"Азия"</item>
+    <item msgid="6683489385344409742">"Австралия"</item>
+    <item msgid="5194868215515664953">"Тынч океан"</item>
+    <item msgid="7044520255415007865">"Бардыгы"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Дароо"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 мүнөт"</item>
+    <item msgid="3367011891231217504">"2 мүнөт"</item>
+    <item msgid="4376575879222393045">"5 мүнөт"</item>
+    <item msgid="811192536981678974">"10 мүнөт"</item>
+    <item msgid="7258394417241706272">"30 мүнөт"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Туташты"</item>
+    <item msgid="983792611851499732">"Чакырылды"</item>
+    <item msgid="5438273405428201793">"Ийгиликсиз"</item>
+    <item msgid="4646663015449312554">"Жеткиликтүү"</item>
+    <item msgid="3230556734162006146">"Аракет чегинен тышкары"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Демейки маани колдонулат: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Акыркы 30 күн"</item>
+    <item msgid="3211287705232736964">"Колдонуу мерчимин коюу…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Колдонулган убакыт"</item>
+    <item msgid="2784401352592276015">"Акыркы жолу колдонулган"</item>
+    <item msgid="249854287216326349">"Колдонмонун аты"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Эчтеке жок"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Жок"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM-карта"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Эчтеке жок"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Эчтеке жок"</item>
+    <item msgid="1464741437353223198">"Нускама"</item>
+    <item msgid="5793600062487886090">"Прокси авто-конфигурац."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Эчтеке жок"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP же CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Такталбаган"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Эчтеке жок"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Ички түзмөк эстутуму"</item>
+    <item msgid="3186681694079967527">"Ташыма SD карта"</item>
+    <item msgid="6902033473986647035">"Тутум өзү тандасын"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Жайгашкан жер"</item>
+    <item msgid="6842381562497597649">"Жеке"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Медиа"</item>
+    <item msgid="5323851085993963783">"Түзмөк"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"болжолдуу жайгаштыруу"</item>
+    <item msgid="1830619568689922920">"так жайгаштыруу"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"дирилдөө"</item>
+    <item msgid="8632513128515114092">"байланыштарды окуу"</item>
+    <item msgid="3741042113569620272">"байланыштарды өзгөртүү"</item>
+    <item msgid="4204420969709009931">"чалуулар тизмесин окуу"</item>
+    <item msgid="2260380357119423209">"чалуулар тизмесин өзгөртүү"</item>
+    <item msgid="6550710385014530934">"күнбаракты окуу"</item>
+    <item msgid="3575906174264853951">"күнбаракты өзгөртүү"</item>
+    <item msgid="4319843242568057174">"wi-fi издөө"</item>
+    <item msgid="2981791890467303819">"эскертме"</item>
+    <item msgid="6617825156152476692">"түйүн издөө"</item>
+    <item msgid="8865260890611559753">"телефон чалуу"</item>
+    <item msgid="3254999273961542982">"SMS окуу"</item>
+    <item msgid="7711446453028825171">"SMS жазуу"</item>
+    <item msgid="6123238544099198034">"SMS алуу"</item>
+    <item msgid="838342167431596036">"шашылыш SMS алуу"</item>
+    <item msgid="8554432731560956686">"MMS алуу"</item>
+    <item msgid="7464863464299515059">"WAP push алуу"</item>
+    <item msgid="310463075729606765">"SMS жөнөтүү"</item>
+    <item msgid="7338021933527689514">"ICC SMS окуу"</item>
+    <item msgid="6130369335466613036">"ICC SMS жазуу"</item>
+    <item msgid="6536865581421670942">"тууралоолорду өзгөртүү"</item>
+    <item msgid="4547203129183558973">"үстүнө тартуу"</item>
+    <item msgid="9080347512916542840">"жетки эскертүүлөрү"</item>
+    <item msgid="5332718516635907742">"камера"</item>
+    <item msgid="6098422447246167852">"audio жаздыруу"</item>
+    <item msgid="9182794235292595296">"audio ойнотуу"</item>
+    <item msgid="8760743229597702019">"алмашуу буферин окуу"</item>
+    <item msgid="2266923698240538544">"алмашуу буферин өзгөртүү"</item>
+    <item msgid="1801619438618539275">"медиа баскычтар"</item>
+    <item msgid="31588119965784465">"audio фокус"</item>
+    <item msgid="7565226799008076833">"үн башкаргыч"</item>
+    <item msgid="5420704980305018295">"үн деңгээли"</item>
+    <item msgid="5797363115508970204">"шыңгырактын үнү"</item>
+    <item msgid="8233154098550715999">"мультимедианын үнү"</item>
+    <item msgid="5196715605078153950">"ойготкучтун үнү"</item>
+    <item msgid="394030698764284577">"эскерткичтин үнү"</item>
+    <item msgid="8952898972491680178">"bluetooth үнү"</item>
+    <item msgid="8506227454543690851">"ойго кармоо"</item>
+    <item msgid="1108160036049727420">"жайгашууну көзөмөлдөө"</item>
+    <item msgid="1496205959751719491">"жогору кубаттуу жайгашууну көзөмөлдөө"</item>
+    <item msgid="3776296279910987380">"колдонуу статистикасын алуу"</item>
+    <item msgid="8827100324471975602">"микрофондун үнүн басуу/чыгаруу"</item>
+    <item msgid="6880736730520126864">"эскертмени көрсөтүү"</item>
+    <item msgid="4933375960222609935">"долбоор медиясы"</item>
+    <item msgid="8357907018938895462">"VPN\'ди жандыруу"</item>
+    <item msgid="8143812849911310973">"тушкагаз жазуу"</item>
+    <item msgid="6266277260961066535">"көмөкчү түзүм"</item>
+    <item msgid="7715498149883482300">"көмөкчү скриншот"</item>
+    <item msgid="4046679376726313293">"телефон абалын окуу"</item>
+    <item msgid="6329507266039719587">"үн почтасын кошуу"</item>
+    <item msgid="7692440726415391408">"sip пайдалануу"</item>
+    <item msgid="8572453398128326267">"чыгуучу чалууну иштетүү"</item>
+    <item msgid="7775674394089376306">"манжа изи"</item>
+    <item msgid="3182815133441738779">"дене сенсорлору"</item>
+    <item msgid="2793100005496829513">"Калкка кабар берүү тутумунун билдирүүлөрүн окуу"</item>
+    <item msgid="2633626056029384366">"Жайгашкан жер дайындарын бурмалоо"</item>
+    <item msgid="8356842191824684631">"сактагычтагы дайындарды окуу"</item>
+    <item msgid="5671906070163291500">"сактагычка дайындарды жазуу"</item>
+    <item msgid="2791955098549340418">"экранды күйгүзүү"</item>
+    <item msgid="5599435119609178367">"каттоо эсептерин алуу"</item>
+    <item msgid="1165623660533024666">"фондо ойнотуу"</item>
+    <item msgid="6423861043647911030">"атайын мүмкүнчүлүктөрдүн үнүнүн катуулугу"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Кыска"</item>
+    <item msgid="4816511817309094890">"Орто"</item>
+    <item msgid="8305084671259331134">"Узун"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Демейки"</item>
+    <item msgid="4147246073737933622">"Санс-сериф"</item>
+    <item msgid="3117680749167407907">"коюлтулган Санс-сериф"</item>
+    <item msgid="6529379119163117545">"Sans-serif бир орундуу"</item>
+    <item msgid="1487203730637617924">"Сериф"</item>
+    <item msgid="4937790671987480464">"Serif бир орундуу"</item>
+    <item msgid="4448481989108928248">"Эркин"</item>
+    <item msgid="4627069151979553527">"Жантык"</item>
+    <item msgid="6896773537705206194">"Кичине баш тамгалар"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Демейки"</item>
+    <item msgid="6488643537808152001">"Эчтеке жок"</item>
+    <item msgid="552332815156010137">"Текши"</item>
+    <item msgid="7187891159463789272">"Көлөкөлөтүү"</item>
+    <item msgid="8019330250538856521">"Дөмпөйгөн"</item>
+    <item msgid="8987385315647049787">"Ныгырылган"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"Алдын ала бөлүшүлгөн ачкычтары бар L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"Тастыктамасы бар L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"Алдын ала бөлүшүлгөн ачкычтары бар жана аныктыгы Xauth менен текшерилүчүү IPSec VPN"</item>
+    <item msgid="3319427315593649917">"Тастыктамалары бар жана аныктыгы Xauth менен текшерилүчүү IPSec VPN"</item>
+    <item msgid="8258927774145391041">"Тастыктамалары бар жана аныктыгы аралаш ыкма менен текшерилүчүү IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Эч нерсе жок"</item>
+    <item msgid="1157046369795346308">"Нускама"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Суроо"</item>
+    <item msgid="7718817231348607934">"Эч качан уруксат жок"</item>
+    <item msgid="8184570120217958741">"Дайым уруксат"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Туруктуу"</item>
+    <item msgid="167418068739176448">"Көп аткарылган иш"</item>
+    <item msgid="4760813290195199773">"Маанилүү (алдыңкы көрүнүштө)"</item>
+    <item msgid="2328684826817647595">"Маанилүү (арткы көрүнүштө)"</item>
+    <item msgid="7746406490652867365">"Камдык көчүрмөнү сактоо"</item>
+    <item msgid="5597404364389196754">"Оор"</item>
+    <item msgid="1290888779300174556">"Кызмат (иштеп жатат)"</item>
+    <item msgid="7241098542073939046">"Кызмат (өчүрүлүп-күйгүзүлүүдө)"</item>
+    <item msgid="6610439017684111046">"Алуучу"</item>
+    <item msgid="7367606086319921117">"Үй"</item>
+    <item msgid="3344660712396741826">"Акыркы аткарылган иш"</item>
+    <item msgid="5006559348883303865">"Кештелген (иш)"</item>
+    <item msgid="8633480732468137525">"Кештелген (иш-аракет кардары)"</item>
+    <item msgid="6248998242443333892">"Кештелген (бош)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Жашыл көгүш"</item>
+    <item msgid="3228505970082457852">"Көк"</item>
+    <item msgid="6590260735734795647">"Индиго"</item>
+    <item msgid="3521763377357218577">"Кызгылт көгүш"</item>
+    <item msgid="5932337981182999919">"Кызгылтым"</item>
+    <item msgid="5642914536624000094">"Кызыл"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 күндөн мурунку"</item>
+    <item msgid="8699273238891265610">"60 күндөн мурунку"</item>
+    <item msgid="8346279419423837266">"90 күндөн мурунку"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Автоматтык түрдө аныкталат"</item>
+    <item msgid="773943026484148895">"Ченелет"</item>
+    <item msgid="1008268820118852416">"Ченелбейт"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Демейки (туш келди MAC дарегин колдонуу)"</item>
+    <item msgid="214234417308375326">"MAC түзмөгүн колдонуу"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Жок"</item>
+    <item msgid="1930581185557754880">"Ооба"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Караңгы"</item>
+    <item msgid="5079453644557603349">"Жарык"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Өчүк"</item>
+    <item msgid="4072198137051566919">"Мүчүлүштүктөрдү оңдоо"</item>
+    <item msgid="2473005316958868509">"Оозеки кирүү"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Башкы бет гана"</item>
+    <item msgid="1161026694891024702">"Автоматтык"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA артыкчылыктуу"</item>
+    <item msgid="7581481130337402578">"GSM гана"</item>
+    <item msgid="8579197487913425819">"WCDMA гана"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA авто"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo авто"</item>
+    <item msgid="4219607161971472471">"CDMA EvDo\'суз"</item>
+    <item msgid="7278975240951052041">"EvDo гана"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Жалпы"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA гана"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Жалпы"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ky/strings.xml b/tests/CarDeveloperOptions/res/values-ky/strings.xml
index 842eeae..4d00850 100644
--- a/tests/CarDeveloperOptions/res/values-ky/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ky/strings.xml
@@ -56,7 +56,7 @@
     <string name="radio_info_ims_reg_status" msgid="4771711884059371514">"IMS каттоосу: <xliff:g id="STATUS">%1$s</xliff:g>\nLTE аркылуу аудио чалуу: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nWiFi аркылуу аудио чалуу: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nВидео чалуу: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT интерфейс: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1297020186765943857">"Тейлөө аймагында"</string>
     <string name="radioInfo_service_out" msgid="8460363463722476510">"Тейлөө аймагынын сыртында"</string>
-    <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Өзгөчө кырдаалда гана чалганга болот"</string>
+    <string name="radioInfo_service_emergency" msgid="7674989004735662599">"Кырсыктаганда гана чалууга болот"</string>
     <string name="radioInfo_service_off" msgid="1873939869994136791">"Радио өчүк"</string>
     <string name="radioInfo_roaming_in" msgid="7059350234710947417">"Роуминг"</string>
     <string name="radioInfo_roaming_not" msgid="7733269160603599835">"Роумингде эмес"</string>
@@ -256,8 +256,8 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="637014061735266364">"SD-карта башкы сактагыч катары колдонулууда."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1489916516292644696">"Эми USB сактагычты коопсуз чыгарып алсаңыз болот."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="6250598657624241686">"Эми SD картаны коопсуз ажыратса болот."</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="4694941967864756404">"USB сактагыч колдонулуп жатканда алынып салынды!"</string>
-    <string name="sdcard_settings_bad_removal_status" product="default" msgid="2079348895479890677">"SD карта колдонулуп жатканда алынып салынды!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="4694941967864756404">"USB сактагыч колдонулуп жатканда өчүрүлдү!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="2079348895479890677">"SD карта колдонулуп жатканда өчүрүлдү!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="1254929038284900156">"Колдонулган байттар:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="4807897851513791634">"USB сактагчтн медиа изделүүдө…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="67933353112027726">"SD картадан медиа изделүүдө…"</string>
@@ -383,7 +383,7 @@
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"Түзмөк шифрленген"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"Түзмөк шифрленген эмес"</string>
     <string name="lockscreen_settings_title" msgid="1221505938891948413">"Кулпуланган экран"</string>
-    <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"Эмнелер көрсөтүлөт"</string>
+    <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"Эмнелер көрүнөт"</string>
     <string name="security_settings_summary" msgid="5210109100643223686">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="cdma_security_settings_summary" msgid="1783066617800041869">"Жайгашкан жеримди, экран кулпусун ачууну, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="security_passwords_title" msgid="6853942836045862315">"Купуялык"</string>
@@ -412,7 +412,7 @@
     <string name="face_intro_error_unknown" msgid="3241592604198351134">"Дагы жүздөрдү кошуу мүмкүн эмес"</string>
     <string name="security_settings_face_enroll_error_dialog_title" msgid="3933492758701563051">"Жүз кошулган жок"</string>
     <string name="security_settings_face_enroll_dialog_ok" msgid="1078348922734845090">"ЖАРАЙТ"</string>
-    <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="4917894418448325405">"Жүздү каттоо боюнча убакыт чегине жетти. Кайра аракет кылыңыз."</string>
+    <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="4917894418448325405">"Жүздү каттоо боюнча убакыт чегине жетти. Кайталап көрүңүз."</string>
     <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="5160473187142616862">"Жүздү каттоо ишке ашкан жок."</string>
     <string name="security_settings_face_enroll_finish_title" msgid="6800717857394410769">"Баары жөндөлдү. Сүрөтүңүз жакшы чыкты."</string>
     <string name="security_settings_face_enroll_done" msgid="5409739233373490971">"Бүттү"</string>
@@ -426,7 +426,7 @@
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Жүздү өчүрүү"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Түзмөгүңүздүн кулпусун жүзүңүздү көрсөтүп ачып, колдонмолорго киресиз. "<annotation id="url">"Кеңири маалымат"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Жүзүңүздү таануу дайындарын өчүрөсүзбү?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Жүзүнөн таануу функциясы аркылуу жаздырылган дайындар биротоло жана коопсуз өчүрүлөт. Өчүрүлгөндөн кийин, телефонуңуздун кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастоо үчүн, PIN кодуңуз, графикалык ачкычыңыз же сырсөзүңүз керек болот."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Жүзүнөн таануу функциясын колдонууда топтолгон дайын-даректер биротоло өчүрүлөт. Өчүрүлгөндөн кийин, телефонуңуздун кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастоо үчүн, PIN кодуңуз, графикалык ачкычыңыз же сырсөзүңүз суралат."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Манжа изи"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Манжа издерин башкаруу"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"Манжа издерин колдонуу"</string>
@@ -439,7 +439,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="3613424536269750172"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="889558002683900544">"Кулпну манж из менн ач"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7915504118657864429">"Манжа изиңизди колдонуңуз"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин бардыгын аткара алат.\n\nТүзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин баарын аткара алат.\n\nТүзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1640839304679275468">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз.\n\nЭскертүү: Манжа изиңизди бул түзмөктүн кулпусун ачууга колдоно албайсыз. Кеңири маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн манжа изиңизди пайдаланыңыз.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"Жокко чыгаруу"</string>
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Планшетиңизди экранды бөгөттөө опциясы менен коргоңуз, ошондо ал жоголсо же бирөө уурдап кетсе, эч ким колдоно албай калат. Экранды бөгөттөө функциясы менен жүздүн аныктыгын текшерүүнү жөндөсөңүз да болот. \"Жокко чыгарууну\" таптаңыз, анан PIN кодду жөндөңүз же экранды бөгөттөөнүн башка опциясын тандаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Түзмөгүңүздү экранды бөгөттөө опциясы менен коргоңуз, ошондо ал жоголсо же бирөө уурдап кетсе, эч ким колдоно албай калат. Экранды бөгөттөө функциясы менен жүздүн аныктыгын текшерүүнү жөндөсөңүз да болот. \"Жокко чыгарууну\" таптаңыз, анан PIN кодду жөндөңүз же экранды бөгөттөөнүн башка опциясын тандаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Телефонуңузду экранды бөгөттөө опциясы менен коргоңуз, ошондо ал жоголсо же бирөө уурдап кетсе, эч ким колдоно албай калат. Экранды бөгөттөө функциясы менен жүздүн аныктыгын текшерүүнү жөндөсөңүз да болот. \"Жокко чыгарууну\" таптаңыз, анан PIN кодду жөндөңүз же экранды бөгөттөөнүн башка опциясын тандаңыз."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN кодду жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Сырсөздү жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Графикалык ачкычты жөндөөнү өткөрүп жибересизби?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Экранды кулпулоо ыкмасын коюу"</string>
@@ -489,7 +488,7 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="7410398793283818609">"Ой, ал сенсор эмес"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="7192100314788868883">"Телефонуңуздун аркасындагы сенсорго сөөмөйүңүз менен тийиңиз."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="1415709674142168770">"Манжа изи кошулган жок"</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="498951203761192366">"Манжа изин каттоо боюнча убакыт чегине жетти. Кайра аракет кылыңыз."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="498951203761192366">"Манжа изин каттоо боюнча убакыт чегине жетти. Кайталап көрүңүз."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="7896295829530444810">"Манжа изи кошулбай калды. Кайра кайталап көрүңүз же башка манжаңыздын изин сактаңыз."</string>
     <string name="fingerprint_enroll_button_add" msgid="6335782936874996629">"Дагы бирди кошуу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6419214079104413695">"Кийинки"</string>
@@ -501,7 +500,7 @@
     <string name="fingerprint_intro_error_unknown" msgid="3975674268256524015">"Дагы манжа издерин кошуу мүмкүн эмес"</string>
     <string name="fingerprint_last_delete_title" msgid="3104596858161269635">"Манжа издерин өчүрөсүзбү?"</string>
     <string name="fingerprint_delete_title" msgid="3120894112324235536">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" манжа изин алып салуу"</string>
-    <string name="fingerprint_delete_message" msgid="5895802741486967970">"Бул манжа изин жок кыласызбы?"</string>
+    <string name="fingerprint_delete_message" msgid="5895802741486967970">"Бул манжа изин өчүрөсүзбү?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"Телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же колдонмолорго кирүү үчүн манжа издерин башка колдоно албай каласыз"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"Жумуш профилиңиздин кулпусун ачып, сатып алууга уруксат берип же жумуштагы колдонмолорго кирүү үчүн манжа издерин башка колдоно албай каласыз"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"Ооба, өчүрөм"</string>
@@ -509,12 +508,12 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"Планшетти шифрлөө"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"Телефонду шифрлөө"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"Шифрленген"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"Каттоо эсептериңизди, жөндөөлөрүңүздү, жүктөп алынган колдонмолоруңузду жана алардын дайындарын, медиа жана башка файлдарды шифрлей аласыз. Планшетиңиз шифрленгенден кийин, экран кулпуланганда (башкача айтканда, үлгү же сандык PIN же сырсөз менен), планшетиңиз күйгүзүлгөн сайын, аны дешифрлөө үчүн экрандын кулпусун ачууга туура келет. Дешифрлөөнүн бирден-бир жалгыз жолу – бардык дайындарыңызды өчүрүү менен, планшетиңизди демейки абалга кайтаруу.\n\nШифрлөөгө бир саат же көбүрөөк убакыт талап кылынышы мүмкүн. Ишти кубатталган батарея менен баштап, процесс аягына чейин чыкмайынча, планшетиңизди суурубай туруңуз. Эгер аны үзгүлтүккө учуратсаңыз, айрым дайындарыңызды же баарын жоготуп алышыңыз мүмкүн."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"Каттоо эсептериңизди, жөндөөлөрүңүздү, жүктөп алынган колдонмолоруңузду жана алардын дайындарын, медиа жана башка файлдарды шифрлей аласыз. Телефонуңуз шифрленгенден кийин, экран кулпуланганда (башкача айтканда, үлгү же сандык PIN же сырсөз менен), телефонуңуз күйгүзүлгөн сайын, аны дешифрлөө үчүн экрандын кулпусун ачууга туура келет. Дешифрлөөнүн бирден-бир жалгыз жолу – бардык дайындарыңызды өчүрүү менен, телефонуңузду демейки абалга кайтаруу.\n\nШифрлөөгө бир саат же көбүрөөк убакыт талап кылынышы мүмкүн. Ишти кубатталган батарея менен баштап, процесс аягына чейин чыкмайынча, телефонуңузду суурубай туруңуз. Эгер аны үзгүлтүккө учуратсаңыз, айрым дайындарыңызды же баарын жоготуп алышыңыз мүмкүн."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"Аккаунттарыңызды, жөндөөлөрүңүздү, жүктөп алынган колдонмолоруңузду жана алардын дайындарын, медиа жана башка файлдарды шифрлей аласыз. Планшетиңиз шифрленгенден кийин, экран кулпуланганда (башкача айтканда, үлгү же сандык PIN же сырсөз менен), планшетиңиз күйгүзүлгөн сайын, аны дешифрлөө үчүн экрандын кулпусун ачууга туура келет. Дешифрлөөнүн бирден-бир жалгыз жолу – бардык дайын-даректериңизди өчүрүү менен, планшетиңизди демейки абалга кайтаруу.\n\nШифрлөөгө бир саат же көбүрөөк убакыт талап кылынышы мүмкүн. Ишти кубатталган батарея менен баштап, процесс аягына чейин чыкмайынча, планшетиңизди суурубай туруңуз. Эгер аны үзгүлтүккө учуратсаңыз, айрым дайын-даректериңизди же баарын жоготуп алышыңыз мүмкүн."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"Аккаунттарыңызды, жөндөөлөрүңүздү, жүктөп алынган колдонмолоруңузду жана алардын дайындарын, медиа жана башка файлдарды шифрлей аласыз. Телефонуңуз шифрленгенден кийин, экран кулпуланганда (башкача айтканда, үлгү же сандык PIN же сырсөз менен), телефонуңуз күйгүзүлгөн сайын, аны дешифрлөө үчүн экрандын кулпусун ачууга туура келет. Дешифрлөөнүн бирден-бир жалгыз жолу – бардык дайын-даректериңизди өчүрүү менен, телефонуңузду демейки абалга кайтаруу.\n\nШифрлөөгө бир саат же көбүрөөк убакыт талап кылынышы мүмкүн. Ишти кубатталган батарея менен баштап, процесс аягына чейин чыкмайынча, телефонуңузду суурубай туруңуз. Эгер аны үзгүлтүккө учуратсаңыз, айрым дайын-даректериңизди же баарын жоготуп алышыңыз мүмкүн."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"Планшетти шифрлөө"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"Телефонду шифрлөө"</string>
     <string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"Батарейди дүрмөттөп, кайрадан аракет кылыңыз."</string>
-    <string name="crypt_keeper_unplugged_text" msgid="6597684068340036200">"Дүрмөттөөчү түзмөгүңүздү туташтырып, кайра аракет кылыңыз."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="6597684068340036200">"Дүрмөттөөчү түзмөгүңүздү туташтырып, кайталап көрүңүз."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="8532211509636340535">"Экран кулпусунун PIN коду же сырсөзү жок"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="1341590897367808702">"Шифрлөөнү баштаардан мурун, сиз экранды бөгөтөөчү PIN же сырсөз коюшуңуз керек."</string>
     <string name="crypt_keeper_confirm_title" msgid="8884417036062084547">"Шифрлейлиби?"</string>
@@ -599,35 +598,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="1843950215687159135">"Графикалык ачкычсыз түзмөктү коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8846957650251741548">"Графикалык ачкычыңызсыз түзмөгүңүздү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен, түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="6760473271034592796">"PIN кодсуз түзмөктү коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="4384632309103635233">"PIN кодуңузсуз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен, түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="854665587186358170">"Сырсөзүңүзсүз түзмөктү коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="218143910981979545">"Сырсөзүңүзсүз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алар менен телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="3570135744390201244">"Экраныңыздын кулпусусуз түзмөктү коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="5775815077478538855">"Экраныңыздын кулпусусуз түзмөктү коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн алынып салынат жана алардын жардамы менен түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул түзмөктөн өчүрүлөт жана алардын жардамы менен, түзмөгүңүздүн кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="2369992898062808499">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="8511105093090018735">"Графикалык ачкычыңызсыз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7114165651000498040">"PIN кодуңузсуз профилди коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="5118210431544156122">"PIN кодуңузсуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="3989497526180082037">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="8360485354164416198">"Сырсөзүңүзсүз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="4066001421137974082">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1201259228331105948">"Экраныңыздын кулпусусуз профилди коргоо функциялары иштебейт.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Сакталган манжа издериңиз да бул профилден алынып салынат жана алардын жардамы менен профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же каттоо эсебине кире албай каласыз."</string>
+</xliff:g>Сакталган манжа издериңиз да бул профилден өчүрүлөт жана алардын жардамы менен, профилиңиздин кулпусун ачып, ар кандай нерселерди сатып алып же аккаунтка кире албай каласыз."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"Ооба, өчүрүлсүн"</string>
     <string name="unlock_change_lock_pattern_title" msgid="7622476883851319877">"Кулпн ачуу үлгсн өзгрт"</string>
     <string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"Клпн ачуу PIN кдн өзгр"</string>
@@ -636,20 +635,20 @@
     <string name="unlock_footer_medium_complexity_requested" msgid="5004825329461874633">"<xliff:g id="APP_NAME">%1$s</xliff:g> колонмосу жаңы PIN кодду же сырсөздү сунуштайт, ансыз талапка ылайык иштебеши мүмкүн"</string>
     <string name="unlock_footer_low_complexity_requested" msgid="513212093196833566">"<xliff:g id="APP_NAME">%1$s</xliff:g> колонмосу жаңы графикалык ачкычты, PIN кодду же сырсөздү сунуштайт, ансыз талапка ылайык иштебеши мүмкүн"</string>
     <string name="unlock_footer_none_complexity_requested" msgid="1669550050597044896">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу экрандын жаңы кулпусун сунуштайт"</string>
-    <string name="lock_failed_attempts_before_wipe" msgid="7565412834122130877">"Кайра аракет кылыңыз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> аракеттен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
-    <string name="lock_last_attempt_before_wipe_warning_title" msgid="7853820095898368793">"Дайындарыңыз жок кылынат"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1021644947949306054">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
-    <string name="lock_last_pin_attempt_before_wipe_device" msgid="3823600293847594141">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
-    <string name="lock_last_password_attempt_before_wipe_device" msgid="3548966006264835462">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="5194192938934564218">"Эгер графикалык кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
-    <string name="lock_last_pin_attempt_before_wipe_user" msgid="7833852187363499906">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
-    <string name="lock_last_password_attempt_before_wipe_user" msgid="8979742220140001204">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
-    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="3877613047631174576">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
-    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="8132438288175428168">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
-    <string name="lock_last_password_attempt_before_wipe_profile" msgid="1535128774464384305">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
-    <string name="lock_failed_attempts_now_wiping_device" msgid="8662360098784762828">"Өтө көп жолу туура эмес аракет кылынды. Бул түзмөктүн дайындары жок кылынат."</string>
-    <string name="lock_failed_attempts_now_wiping_user" msgid="3793513796171561873">"Өтө көп жолу туура эмес аракет кылынды. Бул колдонуучу жок кылынат."</string>
-    <string name="lock_failed_attempts_now_wiping_profile" msgid="5347108525299038285">"Өтө көп жолу туура эмес аракет кылынды. Бул жумуш профили жана анын дайындары жок кылынат."</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="7565412834122130877">"Кайталап көрүңүз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> аракеттен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="7853820095898368793">"Дайын-даректериңиз өчүрүлөт"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="1021644947949306054">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары өчүрүлөт"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="3823600293847594141">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары өчүрүлөт"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="3548966006264835462">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары өчүрүлөт"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="5194192938934564218">"Эгер графикалык кийинки жолу туура эмес киргизсеңиз, бул колдонуучу өчүрүлөт"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="7833852187363499906">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул колдонуучу өчүрүлөт"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="8979742220140001204">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул колдонуучу өчүрүлөт"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="3877613047631174576">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары өчүрүлөт"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="8132438288175428168">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары өчүрүлөт"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="1535128774464384305">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары өчүрүлөт"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="8662360098784762828">"Өтө көп жолу туура эмес аракет кылынды. Бул түзмөктүн дайындары өчүрүлөт."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="3793513796171561873">"Өтө көп жолу туура эмес аракет кылынды. Бул колдонуучу өчүрүлөт."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="5347108525299038285">"Өтө көп жолу туура эмес аракет кылынды. Бул жумуш профили жана анын дайындары өчүрүлөт."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="3950582268749037318">"Этибарга албоо"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="694091983183310827">
       <item quantity="other">Кеминде <xliff:g id="COUNT_1">%d</xliff:g> символ болушу керек</item>
@@ -746,7 +745,7 @@
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Изделүүдө…"</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Түзмөктүн жөндөөлөрү"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Жупташкан түзмөк"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет туташуусу"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет байланышы"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Баскычтоп"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Байланыштар жана чалуу таржымалы"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Бул түзмөк менен жупташасызбы?"</string>
@@ -766,7 +765,7 @@
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"Bluetooth күйгүзүлгөндө түзмөгүңүз жакын арадагы башка Bluetooth түзмөктөрү менен байланыша алат."</string>
     <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"Bluetooth күйгүзүлгөндө түзмөгүңүз жакын жердеги башка Bluetooth түзмөктөрү менен байланышат.\n\nТүзмөктүн колдонулушун жакшыртуу максатында, колдонмолор менен кызматтар жакын жердеги түзмөктөрдү каалаган убакта, ошондой эле Bluetooth өчүрүлгөн учурда да издей беришет. Бул, мисалы, жайгашкан жердин тактыгын жана дайындардын негизинде көрсөтүлүүчү кызматтарды жакшыртуу үчүн колдонулушу мүмкүн. Бул функцияны "<annotation id="link">"издөө жөндөөлөрүнөн"</annotation>" өзгөртсөңүз болот."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"Кандайдыр бир жерди тагыраак аныктоо үчүн, тутум колдонмолору жана кызматтар жакын арадагы Bluetooth түзмөктөрүн издей берет. Бул функцияны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртсөңүз болот."</string>
-    <string name="bluetooth_connect_failed" msgid="1151234676456333786">"Туташпай калды. Кайра аракет кылыңыз."</string>
+    <string name="bluetooth_connect_failed" msgid="1151234676456333786">"Туташпай калды. Кайталап көрүңүз."</string>
     <string name="device_details_title" msgid="726517818032923222">"Түзмөктүн чоо-жайы"</string>
     <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Түзмөктүн Bluetooth дареги: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="3669848977755142047">"Түзмөк унутулсунбу?"</string>
@@ -788,7 +787,7 @@
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"Атын өзгөртүү"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"Кирүүчү файл өткөрүүгө уруксат"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"Интернетке мүмкүнчүлүк алуу үчүн түзмөккө туташты"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Жергиликтүү Интернет туташуусу түзмөк менен бөлүшүлүүдө"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Түзмөк модем катары иштөөдө"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"Докко орнотуунун жөндөөлөрү"</string>
     <string name="bluetooth_dock_settings_title" msgid="4444650787249778130">"Докту аудио үчүн колдонуу"</string>
     <string name="bluetooth_dock_settings_headset" msgid="6043070852100434218">"Катуу сүйлөткүч телефон катары"</string>
@@ -803,7 +802,7 @@
     <string name="wifi_display_status_connected" msgid="85692409327461403">"Туташкан"</string>
     <string name="wifi_display_status_in_use" msgid="7646114501132773174">"Колдонулууда"</string>
     <string name="wifi_display_status_not_available" msgid="5600448733204688205">"Жеткиликсиз"</string>
-    <string name="wifi_display_details" msgid="6379855523460749126">"Экран жөндөөлөрү"</string>
+    <string name="wifi_display_details" msgid="6379855523460749126">"Көрүнүш жөндөөлөрү"</string>
     <string name="wifi_display_options_title" msgid="4587264519668872213">"Зымсыз дисплейдин мүмкүнчүлүктөрү"</string>
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"Унутуу"</string>
     <string name="wifi_display_options_done" msgid="5922060890309265817">"Даяр"</string>
@@ -828,7 +827,7 @@
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="8068287225180474199">"Дайындар NFC аркылуу өткөрүлөт"</string>
     <string name="android_beam_off_summary" msgid="7365818039159364600">"Өчүк"</string>
-    <string name="nfc_disabled_summary" msgid="2181777971122724361">"NFC өчүк болгондуктан жеткиликсиз"</string>
+    <string name="nfc_disabled_summary" msgid="2181777971122724361">"NFC өчүк болгондуктан, жеткиликсиз"</string>
     <string name="android_beam_label" msgid="5340299879556025708">"Android Beam"</string>
     <string name="android_beam_explained" msgid="4501176353247859329">"Бул мүмкүнчүлүк жандырылганда, түзмөктөрдү бири-бирине тийиштирип, NFC аркылуу веб баракчалар, YouTube видеолору, байланыштар, шилтемелер, сүрөттөр сыяктуу дайындарды биринен экинчисине өткөрө аласыз.\n\nТүзмөктөрдү бири-бирине тийиштирип (арка жактарын), экраныңызды басып коюңуз. Эмне өткөрүлөөрүн колдонмо өзү аныктай алат."</string>
     <string name="wifi_quick_toggle_title" msgid="7935778388625246184">"Wi‑Fi"</string>
@@ -853,7 +852,7 @@
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="7067018832237903151">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
     <string name="wifi_poor_network_detection" msgid="7193423327400703073">"Начар байланыштарга кошулбоо"</string>
     <string name="wifi_poor_network_detection_summary" msgid="5539951465985614590">"Жакшы Интернет байланышы болмоюнча, Wi‑Fi тармагы колдонулбасын"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Интернет туташуусу туруктуу тармактар гана колдонулсун"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="1976503191780928104">"Интернет байланышы туруктуу тармактар гана колдонулат"</string>
     <string name="use_open_wifi_automatically_title" msgid="3084513215481454350">"Ачык тармактарга туташуу"</string>
     <string name="use_open_wifi_automatically_summary" msgid="8338020172673161754">"Байланыш сигналы күчтүү жалпыга ачык тармактарга автоматтык түрдө туташат"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
@@ -893,7 +892,7 @@
     <string name="wifi_setup_wps" msgid="6730131677695521321">"Автоматтык тууралоо (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="3593457187659922490">"Wi‑Fi издөөнү күйгүзөсүзбү?"</string>
     <string name="wifi_settings_scanning_required_summary" msgid="7469610959462708782">"Wi‑Fi тармактарына автоматтык түрдө туташуу үчүн, Wi-Fi издөө функциясын иштетишиңиз керек."</string>
-    <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"Бул функция аркылуу Интернет байланышы жок болсо да, колдонмолор менен кызматтар Wi-Fi тармактарын издей алышат. Жайгашкан жерди аныктоо функциясын жана кызматтарды жакшырткыңыз келсе, аны иштетиңиз."</string>
+    <string name="wifi_settings_scanning_required_info" msgid="5913535073390607386">"Бул функция аркылуу Интернет жок болсо да, колдонмолор менен кызматтар Wi-Fi тармактарын издей алышат. Жайгашкан жерди аныктоо функциясын жана кызматтарды жакшырткыңыз келсе, аны иштетиңиз."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="4327570180594277049">"Күйгүзүү"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="3336102100425307040">"Wi‑Fi\'ды издөө күйгүзүлдү"</string>
     <string name="wifi_show_advanced" msgid="8199779277168030597">"Өркүндөтүлгөн параметрлер"</string>
@@ -941,12 +940,12 @@
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4357387474444884759">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташып, сырсөз менен бөлүшүү үчүн, бул QR кодун скандаңыз"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="572011882416511818">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташуу үчүн, бул QR кодун скандаңыз"</string>
     <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="27667719861826438">"QR коду окулган жок. Кодду кайра киргизип, кайталаңыз"</string>
-    <string name="wifi_dpp_failure_authentication_or_configuration" msgid="9142051662156233679">"Кайра аракет кылыңыз. Эгер маселе чечилбесе, түзмөктү өндүрүүчүгө кайрылыңыз"</string>
+    <string name="wifi_dpp_failure_authentication_or_configuration" msgid="9142051662156233679">"Кайталап көрүңүз. Эгер маселе чечилбесе, түзмөктү өндүрүүчүгө кайрылыңыз"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4320027179973678283">"Бир жерден ката кетти"</string>
     <string name="wifi_dpp_failure_timeout" msgid="5060065168142109420">"Түзмөк розеткага сайылып, кубатталып жана күйүп турганын текшериңиз"</string>
     <string name="wifi_dpp_failure_generic" msgid="7840142544736640189">"Түзмөк розеткага сайылып, кубатталып жана күйүп турганын текшериңиз. Эгер маселе чечилбесе, түзмөктү өндүрүүчүгө кайрылыңыз"</string>
     <string name="wifi_dpp_failure_not_supported" msgid="111779621766171626">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагын бул түзмөккө кошууга болбойт"</string>
-    <string name="wifi_dpp_check_connection_try_again" msgid="7144663015219170999">"Туташууну текшерип, кайра аракет кылыңыз"</string>
+    <string name="wifi_dpp_check_connection_try_again" msgid="7144663015219170999">"Туташууну текшерип, кайталап көрүңүз"</string>
     <string name="wifi_dpp_choose_network" msgid="6251424431594491691">"Тармакты тандоо"</string>
     <string name="wifi_dpp_choose_network_to_connect_device" msgid="6385259857886784285">"Түзмөктү туташтыруу үчүн тармакты тандаңыз"</string>
     <string name="wifi_dpp_add_device_to_wifi" msgid="6454198064645462446">"Бул түзмөк \"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына кошулсунбу?"</string>
@@ -1065,7 +1064,7 @@
     <string name="wifi_hotspot_name_summary_connected" msgid="8387768642326756749">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"Байланыш түйүнүнүн сырсөзү"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"Wi-Fi жыштыктарынын диапазону"</string>
-    <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Байланыш түйүнү аркылуу Wi‑Fi тармагын түзүңүз. Анын жардамы менен башка түзмөктөр мобилдик Интернетке туташа алышат. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
+    <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"Байланыш түйүнү аркылуу Wi‑Fi тармагын түзүңүз. Анын жардамы менен, башка түзмөктөр мобилдик Интернетке туташа алышат. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор байланыш түйүнү болуп бере алышат."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"Байланыш түйүнү автоматтык түрдө өчөт"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"Бир дагы түзмөк туташпаса, Wi‑Fi байланыш түйүнү автоматтык түрдө өчүп калат"</string>
@@ -1091,8 +1090,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi‑Fi"</item>
+    <item msgid="4421333712484542489">"Мобилдик түзмөк"</item>
+    <item msgid="6007360612667098926">"Wi-Fi гана"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1111,7 +1113,7 @@
     <string name="wifi_calling_turn_on" msgid="1212277809455062043">"Wi-Fi аркылуу чалууну күйгүзүү"</string>
     <string name="wifi_calling_not_supported" msgid="216781767605669775">"%1$s байланыш операторунда Wi-Fi аркылуу чалууга болбойт"</string>
     <string name="carrier" msgid="3413463182542176886">"Байланыш оператору"</string>
-    <string name="display_settings_title" msgid="1243571562133261601">"Экран"</string>
+    <string name="display_settings_title" msgid="1243571562133261601">"Көрүнүш"</string>
     <string name="sound_settings" msgid="3306063041029638807">"Үн"</string>
     <string name="all_volume_title" msgid="1750261506951315423">"Үн бийиктиги"</string>
     <string name="musicfx_title" msgid="6456079041566773649">"Музыка эффектилери"</string>
@@ -1132,7 +1134,7 @@
     <string name="lock_sounds_enable_title" msgid="6456726219456531315">"Бөгөттөөчү көшөгөнүн үнү"</string>
     <string name="audio_record_proc_title" msgid="5772134576781468721">"Чуу басар"</string>
     <string name="volume_media_description" msgid="3659485559976891268">"Музыка, видео, оюндар, жана башка медиалар"</string>
-    <string name="volume_ring_description" msgid="1975431532517579212">"Рингтон жана эскертмелер"</string>
+    <string name="volume_ring_description" msgid="1975431532517579212">"Рингтон жана билдирмелер"</string>
     <string name="volume_notification_description" msgid="8871940450828766751">"Билдирмелер"</string>
     <string name="volume_alarm_description" msgid="3230692343946237658">"Ойготкучтар"</string>
     <string name="volume_ring_mute" msgid="6022038055768721847">"Шыңгырактын жана эскертмелердин үнүн басуу"</string>
@@ -1200,7 +1202,7 @@
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Screen aware"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Күйүк / Экранды карап турганда, ал өчүп калбайт"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Өчүк"</string>
-    <string name="adaptive_sleep_description" msgid="812673735459170009">"Экранды карап турганыңызда, анын өчүп калуусунун алдын алат."</string>
+    <string name="adaptive_sleep_description" msgid="812673735459170009">"Экранды карап турганда, ал өчүп калбайт."</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Screen aware экранды кимдир-бирөө карап жатканын текшерүү үчүн маңдайкы камераны колдонот. Ал түзмөктө иштеп, сүрөттөрдү эч качан сактап калбайт жана Google\'га жөнөтпөйт."</string>
     <string name="night_display_title" msgid="1305002424893349814">"Түнкү режим"</string>
     <string name="night_display_text" msgid="5330502493684652527">"Түнкү режимде экран сары түскө боёлот. Ушуну менен күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
@@ -1302,7 +1304,7 @@
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"Тутум жаңыртуулары"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
     <string name="firmware_version" msgid="547095584029938749">"Android версиясы"</string>
-    <string name="security_patch" msgid="483709031051932208">"Коопсуздук тутуму качан жаңыртылды"</string>
+    <string name="security_patch" msgid="483709031051932208">"Коопсуздук тутуму качан жаңырды"</string>
     <string name="model_info" msgid="1729765474260797594">"Үлгүсү"</string>
     <string name="model_summary" msgid="8781425868254352168">"Үлгүсү: %1$s"</string>
     <string name="hardware_info" msgid="174270144950621815">"Түзмөктүн үлгүсү/аппараттык камсыздалышы"</string>
@@ -1391,8 +1393,8 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"SD-картаны ажыратсаңыз, пайдаланылып жаткан кээ бир колдонмолор токтоп калат жана SD-картаны кайра орнотмоюнча жеткиликсиз болот."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="3132640848329117857"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB сактагычты ажыратуу мүмкүн эмес. Кийинчерээк кайталаңыз."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"SD-картаны ажыратуу мүмкүн эмес. Кийинчерээк кайталаңыз."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB сактагычты ажыратуу мүмкүн эмес. Бир аздан кийин кайталап көрүңүз."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="8243603872321575219">"SD-картаны ажыратуу мүмкүн эмес. Бир аздан кийин кайталап көрүңүз."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="2460118115494815052">"USB сактагыч ажыратылат."</string>
     <string name="unmount_inform_text" product="default" msgid="6467461731634304997">"SD карта ажыратылат."</string>
     <string name="sd_ejecting_title" msgid="595074246815112145">"Ажыратылууда"</string>
@@ -1451,7 +1453,7 @@
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> дегенди изилдөө"</string>
     <string name="storage_detail_dialog_other" msgid="5073511663616043370">"Колдонмолор аркылуу сакталган жалпыга ачык документтер, Интернеттен жүктөлүп алынган же Bluetooth, Android файлдары жана башкалар. \n\nБул <xliff:g id="NAME">^1</xliff:g> ичиндеги көрүнгөн мазмунду көрүү үчүн Изилдөө баскычын таптап коюңуз."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"Тутумда Android <xliff:g id="VERSION">%s</xliff:g> версиясында иштеген файлдар бар"</string>
-    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> сактагычта жалпы көлөмү <xliff:g id="SIZE">^2</xliff:g> болгон сүрөттөрдү, музыканы, колдонмолорду жана башка дайындарды сактап койгон окшойт. \n\nЧоо-жайын көрүү үчүн <xliff:g id="USER_1">^1</xliff:g> деген колдонуучунун каттоо эсебине кириңиз."</string>
+    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> сактагычта жалпы көлөмү <xliff:g id="SIZE">^2</xliff:g> болгон сүрөттөрдү, музыканы, колдонмолорду жана башка дайындарды сактап койгон окшойт. \n\nЧоо-жайын билгиңиз келсе, <xliff:g id="USER_1">^1</xliff:g> деген колдонуучунун аккаунтка кириңиз."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"<xliff:g id="NAME">^1</xliff:g> түзмөгүңүздү орнотуңуз"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"Ташыма эстутум катары колдонуу"</string>
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"Сүрөттөрдү жана башка медианы түзмөктөргө жылдыруу үчүн."</string>
@@ -1574,7 +1576,7 @@
     <string name="network_reset_not_available" msgid="6146655531868016281">"Бул колдонуучу тармакты баштапкы абалына келтире албайт"</string>
     <string name="reset_network_complete_toast" msgid="128225929536005495">"Тармак жөндөөлөрү баштапкы абалга келди"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"SIM карталар тазаланбай жатат"</string>
-    <string name="reset_esim_error_msg" msgid="4716366079119742235">"Жүктөлүп алынган SIM карталарды катадан улам тазалоого болбойт.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайра аракет кылыңыз."</string>
+    <string name="reset_esim_error_msg" msgid="4716366079119742235">"Жүктөлүп алынган SIM карталарды катадан улам тазалоого болбойт.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайталап көрүңүз."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"Бардык дайындарды тазалоо (баштапкы абалга келтирүү)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"Бардык дайындарды тазалоо"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
@@ -1592,8 +1594,8 @@
     <string name="erase_external_storage_description" product="default" msgid="5029355708082861798">"SD-картадагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
     <string name="master_clear_button_text" product="tablet" msgid="8000547818499182920">"Бардык маалыматты өчүрүү"</string>
     <string name="master_clear_button_text" product="default" msgid="8000547818499182920">"Бардык маалыматты өчүрүү"</string>
-    <string name="master_clear_final_desc" msgid="5189365498015339294">"Бардык жеке маалыматыңыз жана жүктөлүп алынган колдонмолор жок кылынат. Бул аракетти артка кайтара албайсыз."</string>
-    <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Бардык жеке маалыматыңыз, анын ичинде жүктөлүп алынган колдонмолор жана SIM карталар жок кылынат. Бул аракетти артка кайтара албайсыз."</string>
+    <string name="master_clear_final_desc" msgid="5189365498015339294">"Бардык жеке маалыматыңыз жана жүктөлүп алынган колдонмолор өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
+    <string name="master_clear_final_desc_esim" msgid="3058919823436953662">"Бардык жеке маалыматыңыз, анын ичинде жүктөлүп алынган колдонмолор жана SIM карталар өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
     <string name="master_clear_final_button_text" msgid="866772743886027768">"Баарын тазалоо"</string>
     <string name="master_clear_failed" msgid="7588397453984229892">"Тазалоо аткарылган жок, анткени System Clear кызматы жеткиликсиз."</string>
     <string name="master_clear_confirm_title" msgid="698328669893512402">"Бардык дайындар тазалансынбы?"</string>
@@ -1677,14 +1679,14 @@
     <string name="about_settings" product="device" msgid="1770438316234693655">"Түзмөк тууралуу"</string>
     <string name="about_settings" product="emulator" msgid="4497482494770487014">"Эмуляцияланган түзмөк жөнүндө"</string>
     <string name="about_settings_summary" msgid="4506081667462281647">"Юридикалык маалыматты, абалын, программа версиясын көрүү"</string>
-    <string name="legal_information" msgid="2374267257615182139">"Юридикалык маалыматтар"</string>
+    <string name="legal_information" msgid="2374267257615182139">"Юридикалык маалымат"</string>
     <string name="contributors_title" msgid="6800028420806884340">"Салым кошуучулар"</string>
     <string name="manual" msgid="5431859421432581357">"Нускама"</string>
     <string name="regulatory_labels" msgid="380968489247381025">"Тастыктама энбелгилери"</string>
     <string name="safety_and_regulatory_info" msgid="7113766428000920132">"Коопсуздук жана стандарттарга жооп берүү"</string>
     <string name="copyright_title" msgid="3847703367689932190">"Автордук укук"</string>
     <string name="license_title" msgid="7582145947873528540">"Уруксаттама"</string>
-    <string name="terms_title" msgid="1804549588198223771">"Шарттар жана жоболор"</string>
+    <string name="terms_title" msgid="1804549588198223771">"Пайдалануу шарттары"</string>
     <string name="webview_license_title" msgid="8244960025549725051">"WebView тутум уруксаттамасы"</string>
     <string name="wallpaper_attributions" msgid="2941987966332943253">"Тушкагаздар"</string>
     <string name="wallpaper_attributions_values" msgid="4461979853894606323">"Спутник сүрөттөрү:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
@@ -1764,7 +1766,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Кулпуну ачуу үлгүсүн коюу"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Кулпуну ачуу үлгүсүн кантип тартыш керек"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"Туура эмес аракеттер өтө көп болду. <xliff:g id="NUMBER">%d</xliff:g> секунддан кийин кайра аракет кылыңыз."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"Туура эмес аракеттер өтө көп болду. <xliff:g id="NUMBER">%d</xliff:g> секунддан кийин кайталап көрүңүз."</string>
     <string name="activity_not_found" msgid="3492413375341165453">"Колдонмо сиздин телефонуңузда орнотулган эмес."</string>
     <string name="lock_settings_profile_title" msgid="3928992050074556160">"Жумуш профилинин коопсуздугу"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="285267471459162203">"Жумуш профилинин экран кулпусу"</string>
@@ -1785,9 +1787,9 @@
     <string name="install_applications_title" msgid="8164828577588659496">"Бардк колднмо булактрна урукст"</string>
     <string name="recent_app_category_title" msgid="7688788038277126727">"Акыркы ачылган колдонмолор"</string>
     <string name="see_all_apps_title" msgid="6435061912110347474">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
-    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
-    <string name="install_all_warning" product="default" msgid="7445839116997296358">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
-    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Түзмөгүңүз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам түзмөгүңүзгө кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"Планшетиңиз жана жеке дайын-даректериңиз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайын-даректериңизды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="default" msgid="7445839116997296358">"Телефонуңуз жана жеке дайын-даректериңиз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайын-даректериңизды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <string name="install_all_warning" product="device" msgid="9141585291103603515">"Түзмөгүңүз жана жеке дайын-даректериңиз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуп, түзмөгүңүзгө кандайдыр бир зыян келтирип алсаңыз же дайын-даректериңизди жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"Өркүндөтүлгөн жөндөөлөр"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"Көбүрөөк тууралоо опцияларын көрсөтүү"</string>
     <string name="application_info_label" msgid="3886253474964599105">"Колдонмо тууралуу"</string>
@@ -1873,8 +1875,8 @@
     <string name="insufficient_storage" msgid="7089626244018569405">"Сактагычта орун жетишсиз."</string>
     <string name="does_not_exist" msgid="4821267479183197109">"Мындай колдонмо жок."</string>
     <string name="invalid_location" msgid="8057409982223429673">"Орнотуу орду жараксыз."</string>
-    <string name="system_package" msgid="1824541892695233351">"Системдин жаңыртуулары сырткы сактагычка орнотулбайт."</string>
-    <string name="move_error_device_admin" msgid="6640501923867066901">"Түзмөктү башкарган колдонмо сырткы сактагычка орнотулбайт"</string>
+    <string name="system_package" msgid="1824541892695233351">"Системдин жаңыртуулары тышкы сактагычка орнотулбайт."</string>
+    <string name="move_error_device_admin" msgid="6640501923867066901">"Түзмөктү башкарган колдонмо тышкы сактагычка орнотулбайт"</string>
     <string name="force_stop_dlg_title" msgid="8822779487097246675">"Токтотулсунбу?"</string>
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"Колдонмону токтотсоңуз, ал туура эмес иштеп калышы мүмкүн."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"Орнотууга тандалган жер"</string>
@@ -2151,8 +2153,8 @@
     <string name="captioning_window_opacity" msgid="4315586548781763353">"Субтитр терезесинин тунук эместиги"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Тексттин түсү"</string>
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Тексттин тунук эместиги"</string>
-    <string name="captioning_edge_color" msgid="4330622137047993780">"Кырдын түсү"</string>
-    <string name="captioning_edge_type" msgid="4414946407430588162">"Кырдын түрү"</string>
+    <string name="captioning_edge_color" msgid="4330622137047993780">"Контурдун түсү"</string>
+    <string name="captioning_edge_type" msgid="4414946407430588162">"Контур түрү"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Тамга түрү"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Коштомо жазуулар ушундай көрүнөт"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Өө"</string>
@@ -2260,7 +2262,7 @@
     <string name="controls_subtitle" msgid="6920199888882834620">"Кубат сарпталышын тууралоо"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"Камтылган топтомдор"</string>
     <string name="battery_tip_summary_title" msgid="2750922152518825526">"Колдонмолор туура иштеп жатат"</string>
-    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"Телефон фондо батареяны адаттагыдай колдонууда"</string>
+    <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"Телефон батареяны адаттагыдай керектөөдө"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"Планшет фондо батареяны адаттагыдай колдонууда"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"Түзмөк фондо батареяны адаттагыдай колдонууда"</string>
     <string name="battery_tip_low_battery_title" msgid="6784043681672161175">"Батарея азыр отуруп калат"</string>
@@ -2272,7 +2274,7 @@
     <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Батареяны үнөмдөгүч режимин күйгүзүү"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"Батарея адаттагыдан эртерээк отуруп калышы мүмкүн"</string>
     <string name="battery_tip_early_heads_up_done_title" msgid="112550885882648429">"Батареяны үнөмдөгүч режими күйүк"</string>
-    <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"Айрым функциялар чектелген болушу мүмкүн"</string>
+    <string name="battery_tip_early_heads_up_done_summary" msgid="8692257022962771181">"Айрым кызматтардын функциялары чектелиши мүмкүн"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="4103005178310487352">"Телефон адаттагыдан көбүрөөк колдонулду"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="1019583260005768965">"Планшет адаттагыдан көбүрөөк колдонулду"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="8304138287288309490">"Түзмөк адаттагыдан көбүрөөк колдонулду"</string>
@@ -2301,9 +2303,9 @@
       <item quantity="other">%1$d колдонмо чектелсинби?</item>
       <item quantity="one">Колдонмо чектелсинби?</item>
     </plurals>
-    <string name="battery_tip_restrict_app_dialog_message" msgid="6905822297507947381">"Батареяны үнөмдөө максатында, <xliff:g id="APP">%1$s</xliff:g> колдонмосунун фондо иштөөсүн токтотуп койсоңуз болот. Колдонмо талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
-    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"Батареяны үнөмдөө максатында, бул колдонмолордун фондо иштөөсүн токтотуп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн.\n\nКолдонмолор:"</string>
-    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"Батареяны үнөмдөө максатында, бул колдонмолордун фондо иштөөсүн токтотуп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн.\n\nКолдонмолор:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
+    <string name="battery_tip_restrict_app_dialog_message" msgid="6905822297507947381">"Батареяны үнөмдөө максатында, <xliff:g id="APP">%1$s</xliff:g> колдонмосунун фондо иштөөсүн токтотуп койсоңуз болот. Колдонмо талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
+    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"Батареяны үнөмдөө максатында, бул колдонмолордун фондо иштөөсүн токтотуп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн.\n\nКолдонмолор:"</string>
+    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"Батареяны үнөмдөө максатында, бул колдонмолордун фондо иштөөсүн токтотуп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн.\n\nКолдонмолор:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
     <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"Чектөө"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"Чектөөлөр өчүрүлсүнбү?"</string>
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"Бул колдонмо батареяны фондо колдоно берет. Батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн."</string>
@@ -2315,16 +2317,16 @@
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="4919670408532804351">"Колдонмолорду автоматтык түрдө башкаруу"</string>
     <string name="smart_battery_summary" msgid="640027046471198174">"Сейрек колдонулган колдонмолор чектелген режимде иштешет"</string>
-    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"Battery Manager колдонмолор батареяны тез сарптап жатканын аныктаганда, ошол колдонмолорду чектеп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
-    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"Battery Manager колдонмолор батареяны тез сарптап жатканын аныктаганда, ошол колдонмолорду чектеп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
-    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"Battery Manager колдонмолор батареяны тез сарптап жатканын аныктаганда, ошол колдонмолорду чектеп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
+    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"Battery Manager колдонмолор батареяны тез сарптап жатканын аныктаганда, ошол колдонмолорду чектеп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
+    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"Battery Manager колдонмолор батареяны тез сарптап жатканын аныктаганда, ошол колдонмолорду чектеп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
+    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"Battery Manager колдонмолор батареяны тез сарптап жатканын аныктаганда, ошол колдонмолорду чектеп койсоңуз болот. Чектелген колдонмолор талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
     <string name="restricted_app_title" msgid="4957644700640127606">"Чектелген колдонмолор"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="7609538735465186040">
       <item quantity="other">%1$d колдонмо батареяны чектелген режимде колдонуп жатат</item>
       <item quantity="one">%1$d колдонмо батареяны чектелген режимде колдонуп жатат</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="5205881852523135226">"<xliff:g id="TIME">%1$s</xliff:g> чектелди"</string>
-    <string name="restricted_app_detail_footer" msgid="482460517275754465">"Бул колдонмолор батареяны фондо колдонуп жатат. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
+    <string name="restricted_app_detail_footer" msgid="482460517275754465">"Бул колдонмолор батареяны фондо колдонуп жатат. Чектелген колдонмолор талаптагыдай иштебей, билдирмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"Battery Manager\'ди колдонуу"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"Колдонмолордун батареяны тез сарптаганы аныкталсын"</string>
     <string name="battery_manager_on" msgid="5626982529932239656">"Күйүк / Колдонмолордун батареяны тез сарптаганы аныкталууда"</string>
@@ -2493,7 +2495,7 @@
     <string name="menu_proc_stats_type_cached" msgid="8238824117399683217">"Кэштелген"</string>
     <string name="voice_input_output_settings" msgid="2180337183089517667">"Үн киргизүү жана чыгаруу"</string>
     <string name="voice_input_output_settings_title" msgid="7080213653518526025">"Үн киргизүү жана чыгаруунун жөндөөлөрү"</string>
-    <string name="voice_search_settings_title" msgid="4999026024622014272">"Үн менен издөө"</string>
+    <string name="voice_search_settings_title" msgid="4999026024622014272">"Айтып издөө"</string>
     <string name="keyboard_settings_title" msgid="2056233617644581410">"Android тергичи"</string>
     <string name="voice_input_settings" msgid="4983011614890521505">"Айтып киргизүү жөндөөлөрү"</string>
     <string name="voice_input_settings_title" msgid="6865032806501269306">"Айтып киргизүү"</string>
@@ -2554,7 +2556,7 @@
     <string name="backup_configure_account_default_summary" msgid="5718298066335006412">"Камдык көчүрмөлөр сакталган бир дагы аккаунт табылган жок"</string>
     <string name="backup_erase_dialog_title" msgid="8178424339104463014"></string>
     <string name="backup_erase_dialog_message" msgid="8767843355330070902">"Колдонмолордун берилиштерин, Wi-Fi сырсөздөрүн, бүктөмөлөрдү, жана башка тууралоолорду, колдономолордун берилиштерин Google\'дун серверине сактоо токтотулуп, бардык көчүрмөлөр жок кылынсынбы?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр жок кылынат. Уланта бересизби?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2588536036471144070">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр өчүрүлөт. Уланта бересизби?"</string>
     <string name="fullbackup_data_summary" msgid="406274198094268556">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү алыстан автоматтык түрдө сакталат.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
     <string name="device_admin_settings_title" msgid="2074319456047334589">"Түзмөктү башкарган колдонмонун жөндөөлөрү"</string>
     <string name="active_device_admin_msg" msgid="6929247869516924549">"Түзмөктү башкарган колдонмо"</string>
@@ -2574,7 +2576,7 @@
     <string name="device_admin_warning" msgid="4421817419326480449">"Түзмөктү башкаруучу колдонмо иштетилгенде, <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу төмөнкү аракеттерди аткарат:"</string>
     <string name="device_admin_status" msgid="5424944611789040723">"Администратордун колдонмосу иштетилген жана <xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосуна төмөнкү аракеттерди аткарууга уруксат берет:"</string>
     <string name="profile_owner_add_title" msgid="735805919754362791">"Профиль башкаргычы жандырылсынбы?"</string>
-    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"Улантсаңыз, профилиңизди администратор башкарып, ал жеке дайындарыңыз менен кошо башка тийиштүү дайындарды да сактап турат.\n\nАдминистратор бул колдонуучунун жөндөөлөрүн, кирүү мүмкүнчүлүгүн, колдонмолорду жана дайындарды, ошондой эле тармактагы аракеттер менен түзмөгүңүздүн жайгашкан жери тууралуу маалыматты көзөмөлдөп, башкара алат."</string>
+    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"Улантсаңыз, профилиңизди администратор башкарып, ал жеке дайын-даректериңиз менен кошо башка тийиштүү дайындарды да сактап турат.\n\nАдминистратор бул колдонуучунун жөндөөлөрүн, кирүү мүмкүнчүлүгүн, колдонмолорду жана дайындарды, ошондой эле тармактагы аракеттер менен түзмөгүңүздүн жайгашкан жери тууралуу маалыматты көзөмөлдөп, башкара алат."</string>
     <string name="admin_disabled_other_options" msgid="8097063307730025707">"Башка параметрлер администратор тарабынан өчүрүлгөн"</string>
     <string name="admin_more_details" msgid="1719819589822345585">"Көбүрөөк маалымат"</string>
     <string name="notification_log_title" msgid="4200467765474474753">"Билдирмелер таржымалы"</string>
@@ -2592,7 +2594,7 @@
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"Жумуш профили азырынча жеткиликтүү эмес"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"Жумуш профили"</string>
     <string name="work_mode_on_summary" msgid="1682781113156323592">"Уюмуңуз тарабынан башкарылат"</string>
-    <string name="work_mode_off_summary" msgid="1688885392211178315">"Колдонмолор менен эскертмелер өчүк"</string>
+    <string name="work_mode_off_summary" msgid="1688885392211178315">"Колдонмолор менен билдирмелер өчүк"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"Жумуш профилин алып салуу"</string>
     <string name="background_data" msgid="8275750862371471171">"Фондук дайындар"</string>
     <string name="background_data_summary" msgid="799640633948841990">"Колдонмолордо каалаган убакта синхрондошуу, берилиштерди жөнөтүп, кабыл алуу мүмкүнчүлүгү бар"</string>
@@ -2639,7 +2641,7 @@
     <string name="misc_files" msgid="1012397035001764693">"Башка файлдар"</string>
     <string name="misc_files_selected_count" msgid="1434146080729502726">"<xliff:g id="TOTAL">%2$d</xliff:g> ичинен <xliff:g id="NUMBER">%1$d</xliff:g> тандалды"</string>
     <string name="misc_files_selected_count_bytes" msgid="3752262902203465861">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="select_all" msgid="452240217913675728">"Бардыгын тандоо"</string>
+    <string name="select_all" msgid="452240217913675728">"Баарын тандоо"</string>
     <string name="data_usage_summary_title" msgid="7288431048564861043">"Дайындардын өткөрүлүшү"</string>
     <string name="data_usage_app_summary_title" msgid="8277327968906074983">"Мобилдик Интернет жана Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="4681642832010140640">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
@@ -2810,7 +2812,7 @@
     <string name="one_cacrt" msgid="4757720453112732485">"бир CA тастыктамасы"</string>
     <string name="n_cacrts" msgid="7539893176217891549">"%d CA тастыктамасы"</string>
     <string name="user_credential_title" msgid="6237611303219831419">"Эсептик дайындардын чоо-жайы"</string>
-    <string name="user_credential_removed" msgid="6243576567538844852">"Эсептик дайындар алынып салынды: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_removed" msgid="6243576567538844852">"Эсептик дайындар өчүрүлдү: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="4129252817676332368">"Бир да колдонуучунун каттоо маалыматы сактала элек"</string>
     <string name="spellcheckers_settings_title" msgid="1687210427248364327">"Орфографияны текшергич"</string>
     <string name="spellcheckers_settings_for_work_title" msgid="7461318390801573022">"Жумуш үчүн орфографияны текшергич"</string>
@@ -2884,7 +2886,7 @@
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"Сиз бул планшеттеги мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"Сиз бул телефондогу мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
     <string name="user_confirm_remove_message" msgid="5202150470271756013">"Бардык колдонмолор жана дайындар жоголот."</string>
-    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"Эгер улантсаңыз бул профилдеги колдонмолор менен дайындардын баары жок кылынат."</string>
+    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"Эгер улантсаңыз бул профилдеги колдонмолор менен дайындардын баары өчүрүлөт."</string>
     <string name="user_profile_confirm_remove_message" msgid="8376289888144561545">"Бардык колдонмолор жана дайындар жоголот."</string>
     <string name="user_adding_new_user" msgid="381717945749193417">"Жаңы колдонуучу кошулууда…"</string>
     <string name="user_delete_user_description" msgid="3627684990761268859">"Колдонуучуну жок кылуу"</string>
@@ -2892,7 +2894,7 @@
     <string name="user_guest" msgid="6226240869459683235">"Конок"</string>
     <string name="user_exit_guest_title" msgid="7279886200373071797">"Конокту алып салуу"</string>
     <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"Конокту алып саласызбы?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"Бул сеанстагы бардык колдонмолор жана дайындар жок кылынат."</string>
+    <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"Бул сеанстагы бардык колдонмолор жана дайындар өчүрүлөт."</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"Алып салуу"</string>
     <string name="user_enable_calling" msgid="864760054792249503">"Телефон чалууларын иштетүү"</string>
     <string name="user_enable_calling_sms" msgid="3450252891736718793">"Чалуулар менен SMS иштетүү"</string>
@@ -3107,7 +3109,7 @@
     <string name="keywords_display_adaptive_sleep" msgid="1695357782432822811">"экранды бүдөмүктөтүү, уйку режими, батарея, экрандын өчүү убакыты, көңүл буруу, дисплей, экран, аракетсиздик"</string>
     <string name="keywords_auto_rotate" msgid="4320791369951647513">"буруу, көрсөтүү, айлануу, тигинен, туурасынан, багыт, вертикалдык, горизонталдык"</string>
     <string name="keywords_system_update_settings" msgid="4419971277998986067">"кийинки версияга көтөрүү, android"</string>
-    <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"та, график, эскертмелер, бөгөттөө, үнүн басуу, дирилдөө, уйку режими, жумуш, фокустоо, добуш, үнсүз, күн, иш күнү, дем алыш, иш күндөрүнүн кечтери, окуя"</string>
+    <string name="keywords_zen_mode_settings" msgid="4103819458182535493">"та, график, билдирмелер, бөгөттөө, үнүн басуу, дирилдөө, уйку режими, жумуш, фокустоо, добуш, үнсүз, күн, иш күнү, дем алыш, иш күндөрүнүн кечтери, окуя"</string>
     <string name="keywords_screen_timeout" msgid="4328381362313993666">"экран, кулпулоо убакыты, таймаут, кулпуланган экран"</string>
     <string name="keywords_storage_settings" msgid="6422454520424236476">"эстутум, кеш, дайындар, жок кылуу, тазалоо, акысыз, орун"</string>
     <string name="keywords_bluetooth_settings" msgid="1152229891590622822">"туташкан, түзмөк, гарнитура, гарнитура, динамик, зымсыз, жупташтыруу, кулаккаптар, музыка, медиа"</string>
@@ -3184,7 +3186,7 @@
     <string name="zen_mode_option_alarms" msgid="4843278125235203076">"Ойготкуч гана"</string>
     <string name="zen_mode_option_no_interruptions" msgid="4723700274519260852">"Тымтырс"</string>
     <string name="zen_mode_summary_combination" msgid="6960111215170691605">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="8378266552787406849">"Визуалдык эскертмелерди бөгөттөө"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="8378266552787406849">"Визуалдык билдирмелерди бөгөттөө"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6608239691864638854">"Визуалдык сигнал иштетилсин"</string>
     <string name="zen_mode_settings_category" msgid="5601680733422424922">"\"Тынчымды алба\" режими күйүп турганда"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="7486753018073540477">"Билдирмелерди чектөө"</string>
@@ -3193,7 +3195,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="3049522809520549054">"Билдирмелер келгенде телефонуңуздун үнү чыкпайт же дирилдебейт."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="3296933643539682552">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"Билдирмелерди көрбөйсүз да, укпайсыз"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Жаңы же учурдагы билдирмелер көрүнбөйт, телефондун үнү чыкпайт же дирилдебейт. Бирок телефондун негизги функцияларынын иштеши үчүн зарыл болгон маанилүү билдирмелерди ала бересиңер.\n\n\"Тынчымды алба\" режими өчүрүлгөндөн кийин, жашырылган билдирмелерди көрүү үчүн экранды ылдый сүрүп коюңуз."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"Жаңы же учурдагы билдирмелер көрүнбөйт, телефондун үнү чыкпайт же дирилдебейт. Бирок телефондун негизги функцияларынын иштеши үчүн керектүү маанилүү билдирмелерди ала бересиңер.\n\n\"Тынчымды алба\" режими өчүрүлгөндөн кийин, жашырылган билдирмелерди көрүү үчүн экранды ылдый сүрүп коюңуз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"Ыңгайлаштырылган"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"Ыңгайлаштырылган жөндөөнү иштетүү"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"Ыңгайлаштырылган жөндөөнү алып салуу"</string>
@@ -3290,7 +3292,7 @@
     <string name="recent_notifications" msgid="8125865995065032049">"Акыркы жолу билдирмелерди жөнөткөн колдонмолор"</string>
     <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Акыркы 7 күндөгү бардык колдонмолорду көрүү"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"Өркүндөтүлгөн"</string>
-    <string name="profile_section_header" msgid="5471479005472037417">"Жумуш боюнча эскертмелер"</string>
+    <string name="profile_section_header" msgid="5471479005472037417">"Жумуш боюнча билдирмелер"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Автоматтык түрдө артыкчылыктуу билдирмелерди тизмелөө"</string>
     <string name="asst_capability_prioritizer_summary" msgid="3525640645743790796">"Анча маанилүү эмес билдирмелердин үнү автоматтык түрдө өчүрүлөт же акырындатылат"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="3929395108744251338">"Акылдуу аракеттер жана жооптор"</string>
@@ -3320,8 +3322,8 @@
     <string name="lock_screen_notifications_interstitial_title" msgid="2832587379332443505">"Билдирмелер"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="8908775469657073273">"Жумуш эскертмесин толугу менен көрсөтүү"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="7898086300511010591">"Купуя жумуш мазмунду жашыруу"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="3324187664458600354">"Түзмөгүңүз кулпуланып турганда, профиль эскертмелери кандайча көрсөтүлсүн?"</string>
-    <string name="lock_screen_notifications_interstitial_title_profile" msgid="4043621508889929254">"Профиль эскертмелери"</string>
+    <string name="lock_screen_notifications_interstitial_message_profile" msgid="3324187664458600354">"Түзмөгүңүз кулпуланып турганда, профиль билдирмелери кандайча көрсөтүлсүн?"</string>
+    <string name="lock_screen_notifications_interstitial_title_profile" msgid="4043621508889929254">"Профиль билдирмелери"</string>
     <string name="notifications_title" msgid="8334011924253810654">"Билдирмелер"</string>
     <string name="app_notifications_title" msgid="1141791221581312325">"Колдонмолор"</string>
     <string name="notification_channel_title" msgid="6637705960909690229">"Билдирменин категориясы"</string>
@@ -3354,10 +3356,10 @@
     <string name="notifications_sent_never" msgid="237997329598144638">"Эч качан"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"Билдирмелерди иштетүү"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"Жумуш профилинин эскертмелерине кирүү бөгөттөлгөн"</string>
-    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"Колдонмолор эскертмелерди окуй алышпайт"</string>
+    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"Колдонмолор билдирмелерди окуй алышпайт"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
-      <item quantity="other">%d колдонмо эскертмелерди окуй алат</item>
-      <item quantity="one">%d колдонмо эскертмелерди окуй алат</item>
+      <item quantity="other">%d колдонмо билдирмелерди окуй алат</item>
+      <item quantity="one">%d колдонмо билдирмелерди окуй алат</item>
     </plurals>
     <string name="notification_assistant_title" msgid="8216604031352764011">"Билдирме жардамчысы"</string>
     <string name="no_notification_assistant" msgid="9140123568386413264">"Жардамчы тандалган жок"</string>
@@ -3365,7 +3367,7 @@
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> кызматына билдирмелерди пайдаланууга уруксат бересизби?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> колдонмосу билдирмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алат. Мындан тышкары, ал бул билдирмелерди өзгөртүп, жок кылып же алар сунуштаган аракеттерди аткара алат. \n\nУшуну менен колдонмо \"Тынчымды алба\" режимин иштетип же өчүрүү, ошондой эле анын жөндөөлөрүн өзгөртүү мүмкүнчүлүгүнө ээ болот."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> колдонмосу үчүн билдирмелерди иштетесизби?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> колдонмосу эскертмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алат. Мындан тышкары, ал бул эскертмелерди жок кылып же алардагы баскычтарды баса алат. \n\nУшуну менен колдонмо \"Тынчымды алба\" режимин иштетип же өчүрүү, ошондой эле анын жөндөөлөрүн өзгөртүү мүмкүнчүлүгүнө ээ болот."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> колдонмосу билдирмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алат. Мындан тышкары, ал бул билдирмелерди жок кылып же алардагы баскычтарды баса алат. \n\nУшуну менен колдонмо \"Тынчымды алба\" режимин иштетип же өчүрүү, ошондой эле анын жөндөөлөрүн өзгөртүү мүмкүнчүлүгүнө ээ болот."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"Эгер <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> үчүн эскертмеге мүмкүнчүлүктү өчүрсөңүз, \"Тынчымды алба\" режимине мүмкүнчүлүк да өчүрүлүшү мүмкүн."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"Өчүрүү"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"Жок"</string>
@@ -3403,13 +3405,13 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> колдонмо үчүн өчүк</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="7741359084299446208">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категория жок кылынды</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категория жок кылынды</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категория өчүрүлдү</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категория өчүрүлдү</item>
     </plurals>
     <string name="notification_toggle_on" msgid="5119816745741139542">"Күйүк"</string>
     <string name="notification_toggle_off" msgid="5289843670514922751">"Өчүк"</string>
     <string name="app_notification_block_title" msgid="7898269373875294367">"Баарын бөгөттөө"</string>
-    <string name="app_notification_block_summary" msgid="4502146897785692336">"Бул эскертмелер эч качан көрсөтүлбөсүн"</string>
+    <string name="app_notification_block_summary" msgid="4502146897785692336">"Бул билдирмелер эч качан көрсөтүлбөсүн"</string>
     <string name="notification_content_block_title" msgid="2805138591864484587">"Билдирмелер"</string>
     <string name="notification_content_block_summary" msgid="2743896875255591743">"Билдирмелер эч качан фондо же тышкы түзмөктөрдө көрүнбөсүн"</string>
     <string name="notification_badge_title" msgid="8989086619255666442">"Билдирмелер белгиси көрүнсүн"</string>
@@ -3536,10 +3538,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> чейин \"Ойготкучтар гана\" режимин иштетүү"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"Экран күйүп турганда"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер экранга калкып чыгып, абал тилкесинде көрсөтүлсүн"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн билдирмелер экранга калкып чыгып, абал тилкесинде көрсөтүлсүн"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"Экран өчүп турганда"</string>
-    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер алынганда экран же жарык индикатору күйсүн"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн эскертмелер алынганда экран күйсүн"</string>
+    <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн билдирмелер алынганда экран же жарык индикатору күйсүн"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"\"Тынчымды алба\" режиминде үнү өчүрүлгөн билдирмелер алынганда экран күйсүн"</string>
     <string name="notification_app_settings_button" msgid="3651180424198580907">"Эскертме жөндөөлөрү"</string>
     <string name="suggestion_button_text" msgid="5783566542423813847">"Жарайт"</string>
     <string name="device_feedback" msgid="4042352891448769818">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
@@ -3557,15 +3559,15 @@
     <string name="experimental_preference" msgid="5903223408406906322">"(Сынамык)"</string>
     <string name="encryption_interstitial_header" msgid="3298397268731647519">"Коопсуз баштоо"</string>
     <string name="encryption_continue_button" msgid="2808797091460167842">"Улантуу"</string>
-    <string name="encryption_interstitial_message_pin" msgid="6592265582286340307">"Түзмөгүңүздү коргоо үчүн PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. PIN кодду коёсузбу?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="5620724295995735120">"Түзмөгүңүздү коргоо үчүн аны графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Графикалык ачкычты коёсузбу?"</string>
-    <string name="encryption_interstitial_message_password" msgid="7236688467386126401">"Түзмөгүңүздү коргоо үчүн аны сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3706009740537484517">"Түзмөгүңүздү коргоо үчүн аны манжа изи же PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. PIN кодду коёсузбу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="5230877866699023998">"Түзмөгүңүздү коргоо үчүн аны манжа изи же графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Графикалык ачкычты коёсузбу?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="8451977276748128814">"Түзмөгүңүздү коргоо үчүн аны манжа изи же сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
-    <string name="encryption_interstitial_message_pin_for_face" msgid="7469243836881325172">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн PIN код коёсузбу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_face" msgid="9221235885895441797">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн графикалык ачкыч коёсузбу?"</string>
-    <string name="encryption_interstitial_message_password_for_face" msgid="5559223480280120457">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн сырсөз коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="6592265582286340307">"Түзмөгүңүздү коргоо үчүн PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. PIN кодду коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="5620724295995735120">"Түзмөгүңүздү коргоо үчүн аны графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Графикалык ачкычты коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7236688467386126401">"Түзмөгүңүздү коргоо үчүн аны сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3706009740537484517">"Түзмөгүңүздү коргоо үчүн аны манжа изи же PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. PIN кодду коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="5230877866699023998">"Түзмөгүңүздү коргоо үчүн аны манжа изи же графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Графикалык ачкычты коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="8451977276748128814">"Түзмөгүңүздү коргоо үчүн аны манжа изи же сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Сырсөздү коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pin_for_face" msgid="7469243836881325172">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн PIN код коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_face" msgid="9221235885895441797">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн графикалык ачкыч коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password_for_face" msgid="5559223480280120457">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн сырсөз коёсузбу?"</string>
     <string name="encryption_interstitial_yes" msgid="1839339586101502601">"Ооба"</string>
     <string name="encryption_interstitial_no" msgid="6517277668879344227">"Жок"</string>
     <string name="restricted_true_label" msgid="1545180379083441282">"Чектелген"</string>
@@ -3622,7 +3624,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> кошумча уруксат</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Эч уруксат берилген жок"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Эч уруксат суралган жок"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Колдонмо уруксат сурай элек"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"Бардык колдонмолор"</string>
     <string name="filter_enabled_apps" msgid="5888459261768538489">"Орнотулган колдонмолор"</string>
     <string name="filter_instant_apps" msgid="8087483282854072366">"Ыкчам ачылуучу колдонмолор"</string>
@@ -3674,7 +3676,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Колдонуу мүмкүнчүлүгүнө уруксат берүү"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Колдонмону пайдалануунун жеке жөндөөлөрү"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Түзмөктү колдонуу убакыты"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Колдонуу мүмкүнчүлүгү колдонмонун башка кандай колдонмолорду жана канча ирет пайдаланып жатканыңызга, ошондой эле операторуңуз, тил жөндөөлөрү жана башка маалыматтарга көз салышына жол ачат."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Колдонуу таржымалы аркылуу кайсы колдонмолор канчалык көп колдонула турганын, ошондой эле байланыш операторуңузду, тил жөндөөлөрүн жана башка параметрлерди көрө аласыз."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Эстутум"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Эстутумдун чоо-жайы"</string>
     <string name="always_running" msgid="5320183445080208766">"Ар дайым иштетилүүдө (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3704,7 +3706,7 @@
     <string name="high_power_system" msgid="739584574711292753">"Кубатты үнөмдөөнү иштетүү мүмкүн эмес"</string>
     <string name="high_power_desc" msgid="333756885680362741">"Батареянын кубаты үнөмдөлбөсүн. Батареяңыз тез эле отуруп калышы мүмкүн."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"Колдонмо фондо тынымсыз иштей берсинби?"</string>
-    <string name="high_power_prompt_body" msgid="8067395096053552289">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу фондо тынымсыз иштей берсе, батареянын кубаты тез сарпталышы мүмкүн. \n\nАны кийинчерээк Жөндөөлөр, Колдонмолор жана эскертмелер бөлүмүнөн өзгөртсөңүз болот."</string>
+    <string name="high_power_prompt_body" msgid="8067395096053552289">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу фондо тынымсыз иштей берсе, батареянын кубаты тез сарпталышы мүмкүн. \n\nАны кийинчерээк Жөндөөлөр, Колдонмолор жана билдирмелер бөлүмүнөн өзгөртсөңүз болот."</string>
     <string name="battery_summary" msgid="4345690800899981339">"Акыркы жолу толук кубатталгандан бери <xliff:g id="PERCENTAGE">%1$s</xliff:g> сарпталды"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"Батареянын кубатын башкаруу"</string>
     <string name="no_battery_summary" msgid="4105932628367471314">"Акыркы жолу толук кубатталгандан бери батарея керектеле элек"</string>
@@ -3782,7 +3784,7 @@
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"Бул колдонмо \"Тынчымды алба\" режимин күйгүзүп/өчүрүп, тийиштүү жөндөөлөрдү өзгөртө алат."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"Эскертмелерге уруксат берилгендиктен, күйүп турушу керек"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> колдонмосуна \"Тынчымды алба\" функциясын пайдалануу мүмкүнчүлүгү калыбына келтирилсинби?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Бул колдонмо тарабынан түзүлгөн \"Тынчымды алба\" эрежелеринин баары жок кылынат."</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"Бул колдонмо тарабынан түзүлгөн \"Тынчымды алба\" эрежелеринин баары өчүрүлөт."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"Үнөмдөлбөсүн"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"Үнөмдөө"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"Батареяңыз тез эле отуруп калышы мүмкүн. Мындан ары колдонмонун батареяны фондо сарптоосу чектелбейт."</string>
@@ -3814,7 +3816,7 @@
     <string name="write_settings_title" msgid="5852614614193830632">"Тутум жөндөөлөрүн өзгөртө алат"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Тутум жөндөөлөрүн өзгөртүү"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Тутум жөндөөлөрүн өзгөртүүгө уруксат берүү"</string>
-    <string name="write_settings_description" msgid="2536706293042882500">"Мындай уруксат колдонмого тутум жөндөөлөрүн өзгөртүү мүмкүнчүлүгүн берет."</string>
+    <string name="write_settings_description" msgid="2536706293042882500">"Колдонмо тутум жөндөөлөрүн өзгөртө алат."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"Ооба"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"Жок"</string>
     <string name="external_source_switch_title" msgid="5947220058496373178">"Бул булактан алынган колдонмолорго ишеним көрсөтүү"</string>
@@ -3839,7 +3841,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="816265985618121370">"Шй. 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="7346540212221792932">"Шй. 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="1452374487089625022">"Шй. 18:03"</string>
-    <string name="disconnected" msgid="4088439352761747084">"Туташкан жок"</string>
+    <string name="disconnected" msgid="4088439352761747084">"Интернет жок"</string>
     <string name="keyboard_disconnected" msgid="3068615097201531871">"Туташкан жок"</string>
     <string name="data_usage_summary_format" msgid="7788095271598602797">"Дайындардын <xliff:g id="AMOUNT">%1$s</xliff:g> колдонулду"</string>
     <string name="data_usage_wifi_format" msgid="9028934101966264710">"Wi‑Fi\'да <xliff:g id="AMOUNT">^1</xliff:g> колдонулду"</string>
@@ -3861,7 +3863,7 @@
     <string name="users_summary" msgid="6693338169439092387">"<xliff:g id="USER_NAME">%1$s</xliff:g> катары кирдиңиз"</string>
     <string name="payment_summary" msgid="1381646849276543242">"<xliff:g id="APP_NAME">%1$s</xliff:g> демейки колдонмо"</string>
     <string name="backup_disabled" msgid="6941165814784765643">"Камдык көчүрмө өчүрүлгөн"</string>
-    <string name="android_version_summary" msgid="2192751442789395445">"Android <xliff:g id="VERSION">%1$s</xliff:g> версиясына жаңыртылды"</string>
+    <string name="android_version_summary" msgid="2192751442789395445">"Android <xliff:g id="VERSION">%1$s</xliff:g> версиясына жаңырды"</string>
     <string name="android_version_pending_update_summary" msgid="3554543810520655076">"Жаңы версия бар"</string>
     <string name="disabled_by_policy_title" msgid="1238318274952958846">"Аракетке уруксат жок"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7094547090629203316">"Үнү өзгөртүлбөйт"</string>
@@ -3971,10 +3973,10 @@
     </plurals>
     <string name="billing_cycle_none_left" msgid="1329748082366602901">"Убакыт калган жок"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="855800570587142182">"1 күнгө жетпеген убакыт калды"</string>
-    <string name="carrier_and_update_text" msgid="4100603877929297103">"<xliff:g id="ID_1">^1</xliff:g> тарабынан <xliff:g id="ID_2">^2</xliff:g> мурда жаңыртылды"</string>
-    <string name="no_carrier_update_text" msgid="8797522203060970532">"<xliff:g id="ID_1">^2</xliff:g> мурда жаңыртылды"</string>
-    <string name="carrier_and_update_now_text" msgid="7619705504438908034">"<xliff:g id="ID_1">^1</xliff:g> тарабынан жаңы эле жаңыртылды"</string>
-    <string name="no_carrier_update_now_text" msgid="4405472895804759042">"Азыр эле жаңыртылды"</string>
+    <string name="carrier_and_update_text" msgid="4100603877929297103">"<xliff:g id="ID_1">^1</xliff:g> тарабынан <xliff:g id="ID_2">^2</xliff:g> мурда жаңырды"</string>
+    <string name="no_carrier_update_text" msgid="8797522203060970532">"<xliff:g id="ID_1">^2</xliff:g> мурда жаңырды"</string>
+    <string name="carrier_and_update_now_text" msgid="7619705504438908034">"<xliff:g id="ID_1">^1</xliff:g> тарабынан жаңы эле жаңырды"</string>
+    <string name="no_carrier_update_now_text" msgid="4405472895804759042">"Азыр эле жаңырды"</string>
     <string name="launch_mdp_app_text" msgid="9186559496664208252">"Планды көрүү"</string>
     <string name="launch_wifi_text" msgid="317820210431682605">"Кеңири маалымат"</string>
     <string name="data_saver_title" msgid="7903308134514179256">"Трафикти үнөмдөө"</string>
@@ -3988,9 +3990,9 @@
     <string name="home_app" msgid="3695063566006954160">"Башкы колдонмо"</string>
     <string name="no_default_home" msgid="1518949210961918497">"Демейки башкы бет жок"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="63693894094570367">"Коопсуз баштоо"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="2330543541999937953">"Түзмөгүңүздү күйгүзүү үчүн графикалык ачкыч талап кылынат. Түзмөк өчүп турганда чалуулар, билдирүүлөр, эскертмелер же сигналдар алынбайт."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1058173991832208485">"Түзмөгүңүздү күйгүзүү үчүн PIN код талап кылынат. Түзмөк өчүп турганда чалуулар, билдирүүлөр, эскертмелер же сигналдар алынбайт."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="1266300087760553585">"Түзмөгүңүздү күйгүзүү үчүн сырсөз талап кылынат. Түзмөк өчүп турганда чалуулар, билдирүүлөр, эскертмелер же сигналдар алынбайт."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="2330543541999937953">"Түзмөгүңүздү күйгүзүү үчүн графикалык ачкыч талап кылынат. Түзмөк өчүп турганда чалуулар, билдирүүлөр, билдирмелер же сигналдар алынбайт."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1058173991832208485">"Түзмөгүңүздү күйгүзүү үчүн PIN код талап кылынат. Түзмөк өчүп турганда чалуулар, билдирүүлөр, билдирмелер же сигналдар алынбайт."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="1266300087760553585">"Түзмөгүңүздү күйгүзүү үчүн сырсөз талап кылынат. Түзмөк өчүп турганда чалуулар, билдирүүлөр, билдирмелер же сигналдар алынбайт."</string>
     <string name="suggestion_additional_fingerprints" msgid="3434467207282466411">"Дагы бир манжа изин кошуңуз"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="1916547587832484196">"Кулпуну башка манжа менен ачуу"</string>
     <string name="battery_saver_on_summary" msgid="6841062406467435672">"Күйүк"</string>
@@ -4123,9 +4125,9 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн планшетиңизди колуңузга алыңыз."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Телефонду текшерүү үчүн таптап коюңуз"</string>
-    <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Планшетти текшерүү үчүн таптап коюңуз"</string>
-    <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Түзмөктү текшерүү үчүн таптап коюңуз"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Телефонду текшерүү үчүн басып коюу"</string>
+    <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Планшетти текшерүү үчүн басып коюу"</string>
+    <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Түзмөктү текшерүү үчүн басып коюу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн экранды таптап коюңуз."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="3676002930672489760">"Билдирмелерди манжа изинин сенсору менен көрүү"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8638932855807473479">"Манжа изинин сканери"</string>
@@ -4200,8 +4202,8 @@
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="1533125067038409945">"Администратор түзмөктү кулпулап, сырсөздү баштапкы абалга келтире алат"</string>
     <string name="enterprise_privacy_wipe_device" msgid="7555287990273929922">"Администратор түзмөктүн бардык дайындарын жок кыла алат"</string>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="4101502079202483156">"Сырсөздү бир нече жолу ката киргизгенден кийин түзмөктөгү бардык дайындар жок кылынат"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2881646286634693392">"Сырсөздү бир нече жолу ката киргизгенден кийин жумуш профилиндеги бардык дайындар жок кылынат"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="4101502079202483156">"Сырсөздү бир нече жолу ката киргизгенден кийин түзмөктөгү бардык дайындар өчүрүлөт"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2881646286634693392">"Сырсөздү бир нече жолу ката киргизгенден кийин жумуш профилиндеги бардык дайындар өчүрүлөт"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="562550414712223382">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> аракет</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> аракет</item>
@@ -4235,7 +4237,7 @@
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
     <string name="storage_percent_full" msgid="6924662861545958442">"колдонулду"</string>
-    <string name="clear_instant_app_data" msgid="3673669086522890405">"Колдонмонун дайындарын тазалоо"</string>
+    <string name="clear_instant_app_data" msgid="3673669086522890405">"Колдонмонун дайын-даректерин тазалоо"</string>
     <string name="clear_instant_app_confirmation" msgid="1778553115373698061">"Бул ыкчам ачылуучу колдонмо алынып салынсынбы?"</string>
     <string name="launch_instant_app" msgid="5251693061228352333">"Ачуу"</string>
     <string name="game_storage_settings" msgid="6856911551799175914">"Оюндар"</string>
@@ -4271,6 +4273,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ал функция телефондун иштешин жайлатат"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GNSS көрсөткүчтөрүнө толук көз салууну иштетүү"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Иштөө цикли өчүрүлүп, бардык GNSS топторуна жана жыштыктарга көз салынат"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Колдонуучуну которгучтагы мүчүлүштүктөрдү оңдоо"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Колдонуучуну которуу учурундагы толук маалыматты көрсөтүү"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Фондогу аракеттерге уруксат берүү"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Бардык фондогу аракеттерге уруксат берет"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Ката диалогун ар дайым көрсөтүү"</string>
@@ -4333,7 +4337,7 @@
     <string name="network_connecting" msgid="8798611458457547110">"Туташууда…"</string>
     <string name="network_could_not_connect" msgid="552874922030763713">"Туташпай койду"</string>
     <string name="empty_networks_list" msgid="5170020017144403884">"Эч тармак табылган жок."</string>
-    <string name="network_query_error" msgid="525635151099480463">"Тармактар табылбай койду. Кайра аракет кылыңыз."</string>
+    <string name="network_query_error" msgid="525635151099480463">"Тармактар табылбай койду. Кайталап көрүңүз."</string>
     <string name="forbidden_network" msgid="8493827960968261182">"(тыюу салынган)"</string>
     <string name="no_sim_card" msgid="3708682108324275635">"SIM-карта жок"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="6899270534608086704">"Тандалган тармак режими: WCDMA тандалган"</string>
@@ -4369,7 +4373,7 @@
     <string name="load_networks_progress" msgid="8155227447618984212">"Издөөдө…"</string>
     <string name="register_on_network" msgid="423929472895070205">"<xliff:g id="NETWORK">%s</xliff:g> тармагына катталууда…"</string>
     <string name="not_allowed" msgid="3047048893776257915">"Сиздин SIM-картаңыз менен бул тармакка туташууга болбойт."</string>
-    <string name="connect_later" msgid="4742215038190504328">"Бул тармакка азыр кошулуу мүмкүн эмес. Кийинчерээк кайра аракет кылыңыз."</string>
+    <string name="connect_later" msgid="4742215038190504328">"Бул тармакка азыр кошулуу мүмкүн эмес. Бир аздан кийин кайталап көрүңүз."</string>
     <string name="registration_done" msgid="8635020229073784432">"Тармакка катталды."</string>
     <string name="select_automatically" msgid="3421552364854534865">"Тармак автоматтык түрдө тандалат"</string>
     <string name="carrier_settings_title" msgid="7989949967020825268">"Оператордун жөндөөлөрү"</string>
@@ -4408,11 +4412,11 @@
     <string name="mobile_network_esim_swap_confirm_ok" msgid="4253442720111626242">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которулуу"</string>
     <string name="mobile_network_erase_sim" msgid="7813251003613841044">"SIM картаны тазалоо"</string>
     <string name="mobile_network_erase_sim_dialog_title" msgid="3796268164204467499">"Бул жүктөлүп алынган SIM карта тазалансынбы?"</string>
-    <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Бул SIM картаны өчүрсөңүз, түзмөктөн <xliff:g id="CARRIER_0">%1$s</xliff:g> кызматы жок кылынат.\n\n<xliff:g id="CARRIER_1">%2$s</xliff:g> кызматтары жок кылынбайт."</string>
+    <string name="mobile_network_erase_sim_dialog_body" msgid="1923189407958581450">"Бул SIM картаны өчүрсөңүз, түзмөктөн <xliff:g id="CARRIER_0">%1$s</xliff:g> кызматы өчүрүлөт.\n\n<xliff:g id="CARRIER_1">%2$s</xliff:g> кызматтары жок кылынбайт."</string>
     <string name="mobile_network_erase_sim_dialog_ok" msgid="7133484721717815447">"Тазалоо"</string>
     <string name="mobile_network_erase_sim_dialog_progress" msgid="4881754030959536493">"SIM карта тазаланууда…"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="9026625253242102706">"SIM карта тазаланбай жатат"</string>
-    <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Катадан улам SIM картаны тазалоого болбойт.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайра аракет кылыңыз."</string>
+    <string name="mobile_network_erase_sim_error_dialog_body" msgid="5955463559366034787">"Катадан улам SIM картаны тазалоого болбойт.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайталап көрүңүз."</string>
     <string name="preferred_network_mode_title" msgid="8324526359482124770">"Тандалган тармактын түрү"</string>
     <string name="preferred_network_mode_summary" msgid="388957154320426335">"Тармактын иштөө режимин өзгөртүңүз"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="5448698073828567428">"Тармактын түрү"</string>
@@ -4510,5 +4514,5 @@
     <string name="automatic_system_heap_dump_summary" msgid="4962129546638974661">"Android тутуму өтө көп эстутумун колдоногондо, автоматтык түрдө анын үймө дампын тартып алуу"</string>
     <string name="wifi_disconnect_button_text" msgid="787688024070426706">"Ажыратуу"</string>
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="26884532087670844">"Шашылыш чалуулар"</string>
-    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Операторуңуз Wi‑Fi аркылуу шашылыш чалууларды колдоого албайт.\nТүзмөгүңүз шашылыш чалууну аткаруу үчүн автоматтык түрдө мобилдик тармакка которулат.\nШашылык чалууларды мобилдик тармак иштеген аймактарда гана аткарууга болот."</string>
+    <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="8726152486964822599">"Операторуңузда кырсыктаганда Wi‑Fi аркылуу чалуу мүмкүнчүлүгү каралган эмес.\nКырсыктаганда жардамга келчү кызматтарга чалганыңызда, түзмөгүңүз автоматтык түрдө мобилдик тармакка которулат.\nМындай кырдаалдарда мобилдик тармак кармаган аймактарда гана чала аласыз."</string>
 </resources>
diff --git a/tests/CarDeveloperOptions/res/values-lo-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-lo-nokeys/strings.xml
new file mode 100644
index 0000000..76da305
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-lo-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ຈັດການແອັບພລິເຄຊັນ"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-lo/arrays.xml b/tests/CarDeveloperOptions/res/values-lo/arrays.xml
new file mode 100644
index 0000000..0dabc66
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-lo/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"ອາ​ເມລິ​ກາ"</item>
+    <item msgid="4791956477275129121">"ຢູໂຣບ"</item>
+    <item msgid="3812126832016254559">"ອາ​ຟຣິກ​ກາ"</item>
+    <item msgid="2765816300353408280">"ເອເຊຍ"</item>
+    <item msgid="6683489385344409742">"ອອສເຕຣເລຍ"</item>
+    <item msgid="5194868215515664953">"ແປຊິຟິກ"</item>
+    <item msgid="7044520255415007865">"ທັງໝົດ"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 ວິນາທີ"</item>
+    <item msgid="772029947136115322">"30 ວິນາທີ"</item>
+    <item msgid="8743663928349474087">"1 ນາທີ"</item>
+    <item msgid="1506508631223164814">"2 ນາທີ"</item>
+    <item msgid="8664703938127907662">"5 ນາ​ທີ"</item>
+    <item msgid="5827960506924849753">"10 ນາ​ທີ"</item>
+    <item msgid="6677424950124253938">"30 ນາ​ທີ"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"ບໍ່ມີກຳນົດ"</item>
+    <item msgid="2517785806387977252">"15 ວິນາທີ"</item>
+    <item msgid="6347954399441173672">"30 ວິນາທີ"</item>
+    <item msgid="4858305253279921789">"1 ນາທີ"</item>
+    <item msgid="8109273437140044073">"2 ນາທີ"</item>
+    <item msgid="2788593551142462622">"5 ນາ​ທີ"</item>
+    <item msgid="8012672183888404961">"10 ນາທີ"</item>
+    <item msgid="8271452751594598661">"30 ນາ​ທີ"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ທັນທີ"</item>
+    <item msgid="2038544972632026612">"5 ວິນາທີ"</item>
+    <item msgid="5558060663472279597">"15 ວິ​ນາ​ທີ"</item>
+    <item msgid="45341168505452037">"30 ວິນາທີ"</item>
+    <item msgid="227647485917789272">"1 ນາທີ"</item>
+    <item msgid="3367011891231217504">"2 ນາທີ"</item>
+    <item msgid="4376575879222393045">"5 ນາທີ"</item>
+    <item msgid="811192536981678974">"10 ນາທີ"</item>
+    <item msgid="7258394417241706272">"30 ນາທີ"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"ຂະໜາດນ້ອຍ"</item>
+    <item msgid="591935967183159581">"ຄ່າເລີ່ມຕົ້ນ"</item>
+    <item msgid="1714184661981538355">"ຂະໜາດໃຫຍ່"</item>
+    <item msgid="6195563047686707484">"ໃຫຍ່ທີ່ສຸດ"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"ກຳລັງສະແກນ..."</item>
+    <item msgid="5597394826455877834">"ກຳລັງເຊື່ອມຕໍ່..."</item>
+    <item msgid="5848277343965362748">"ກຳລັງພິສູດຮັບຮອງ..."</item>
+    <item msgid="3391238031431440676">"ກຳລັງຂໍທີ່ຢູ່ IP..."</item>
+    <item msgid="5257597310494000224">"ເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="8472497592913050396">"ຖືກລະງັບແລ້ວ"</item>
+    <item msgid="1228072488815999109">"ກຳລັງຢຸດການເຊື່ອມຕໍ່..."</item>
+    <item msgid="7253087004422991731">"ປິດການເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="4169850917304751227">"ບໍ່ສຳເລັດ"</item>
+    <item msgid="6266658166690831131">"ບລັອກ​ແລ້ວ"</item>
+    <item msgid="4517230805854909775">"ຫຼີກເວັ້ນການເຊື່ອມຕໍ່ຊົ່ວຄາວຫາກສັນຍານບໍ່ແຮງພໍ"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"ກຳລັງສະແກນ..."</item>
+    <item msgid="8058143476674427024">"ກຳລັງເຊື່ອມຕໍ່ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"ກຳລັງກວດສອບສິດທິກັບ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"ກຳລັງຂໍທີ່ຢູ່ IP ຈາກ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"ເຊື່ອມ​ຕໍ່​ກັບ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ແລ້ວ"</item>
+    <item msgid="6600156231416890902">"ຖືກລະງັບແລ້ວ"</item>
+    <item msgid="4133290864821295785">"ກຳລັງຕັດການເຊື່ອມຕໍ່ຈາກ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"ປິດການເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="2847316776634969068">"ບໍ່ສຳເລັດ"</item>
+    <item msgid="4390990424746035383">"ບລັອກ​ແລ້ວ"</item>
+    <item msgid="3618248791367063949">"ຫຼີກເວັ້ນການເຊື່ອມຕໍ່ເຄືອຂ່າຍສັນຍານອ່ອນຊົ່ວຄາວ"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"ປຸ່ມກົດ"</item>
+    <item msgid="7401896200768713930">"PIN ຈາກອຸປະກອນທີ່ເຊື່ອມຕໍ່ກັນ"</item>
+    <item msgid="4526848028011846710">"PIN ຈາກ​ອຸ​ປະ​ກອນ​ນີ້"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"ເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="983792611851499732">"ເຊີນແລ້ວ"</item>
+    <item msgid="5438273405428201793">"ບໍ່ສຳເລັດ"</item>
+    <item msgid="4646663015449312554">"ສາມາດໃຊ້ໄດ້"</item>
+    <item msgid="3230556734162006146">"ຢູ່ນອກໄລຍະສັນຍານ"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 ນາທີ"</item>
+    <item msgid="2759776603549270587">"5 ນາທີ"</item>
+    <item msgid="167772676068860015">"1 ຊົ່ວໂມງ"</item>
+    <item msgid="5985477119043628504">"ບໍ່ມີໝົດເວລາ"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ໃຊ້ຄ່າເລີ່ມຕົ້ນຂອງລະບົບ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"ອ່ອນ"</item>
+    <item msgid="7882129634982603782">"ບໍ່ດີ"</item>
+    <item msgid="6457357501905996224">"ພໍໃຊ້"</item>
+    <item msgid="405271628162918841">"ດີ"</item>
+    <item msgid="999948812884919584">"ດີ​ເລີດ"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 ມື້ທີ່ຜ່ານມາ"</item>
+    <item msgid="3211287705232736964">"ຕັ້ງ​ຮອບ​ການ​ນຳ​ໃຊ້..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ເວລາການນຳໃຊ້"</item>
+    <item msgid="2784401352592276015">"ໃຊ້​ເທື່ອ​ສຸດ​ທ້າຍ"</item>
+    <item msgid="249854287216326349">"ຊື່ແອັບຯ"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ບໍ່ມີ"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ບໍ່ມີ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ບໍ່ມີ"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"ຄົງທີ່"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ບໍ່ມີ"</item>
+    <item msgid="1464741437353223198">"ຄູ່​ມື"</item>
+    <item msgid="5793600062487886090">"ຕັ້ງຄ່າ​ພຣັອກ​ຊີ​ອັດຕະໂນມັດ"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ບໍ່ມີ"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ຫຼື CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ບໍ່ລະບຸ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ບໍ່ມີ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍໃນອຸປະກອນ"</item>
+    <item msgid="3186681694079967527">"SD card ທີ່ສາມາດຖອດໄດ້"</item>
+    <item msgid="6902033473986647035">"ໃຫ້ລະບົບຕັດສິນໃຈ"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ສະຖານທີ່"</item>
+    <item msgid="6842381562497597649">"​ສ່ວນ​ໂຕ"</item>
+    <item msgid="3966700236695683444">"ຂໍ້ຄວາມ"</item>
+    <item msgid="8563996233342430477">"ສື່"</item>
+    <item msgid="5323851085993963783">"ອຸປະກອນ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ຕຳແໜ່ງໂດຍປະມານ"</item>
+    <item msgid="1830619568689922920">"fine location"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ສັ່ນເຕືອນ"</item>
+    <item msgid="8632513128515114092">"ອ່ານລາຍຊື່ຜູ່ຕິດຕໍ່"</item>
+    <item msgid="3741042113569620272">"ແກ້ໄຂລາຍຊື່ຜູ່ຕິດຕໍ່"</item>
+    <item msgid="4204420969709009931">"ອ່ານບັນທຶກການໂທ"</item>
+    <item msgid="2260380357119423209">"ແກ້ໄຂບັນທຶກການໂທ"</item>
+    <item msgid="6550710385014530934">"ອ່ານ​ປະ​ຕິ​ທິນ"</item>
+    <item msgid="3575906174264853951">"ແກ້ໄຂປະຕິທິນ"</item>
+    <item msgid="4319843242568057174">"ສະແກນ Wi​-Fi"</item>
+    <item msgid="2981791890467303819">"ການແຈ້ງເຕືອນ"</item>
+    <item msgid="6617825156152476692">"ສະແກນສະຖານີມືຖື"</item>
+    <item msgid="8865260890611559753">"ໂທລະສັບ"</item>
+    <item msgid="3254999273961542982">"ອ່ານ SMS"</item>
+    <item msgid="7711446453028825171">"ຂຽນ SMS"</item>
+    <item msgid="6123238544099198034">"ຮັບ SMS"</item>
+    <item msgid="838342167431596036">"ຮັບ SMS ສຸກເສີນ"</item>
+    <item msgid="8554432731560956686">"ຮັບ SMS"</item>
+    <item msgid="7464863464299515059">"ຮັບ WAP push"</item>
+    <item msgid="310463075729606765">"ສົ່ງ​ SMS"</item>
+    <item msgid="7338021933527689514">"ອ່ານ ICC SMS"</item>
+    <item msgid="6130369335466613036">"ຂຽນ​ ICC SMS"</item>
+    <item msgid="6536865581421670942">"ແກ້ໄຂການຕັ້ງຄ່າ"</item>
+    <item msgid="4547203129183558973">"ແຕ້ມໃສ່ເທິງສຸດ"</item>
+    <item msgid="9080347512916542840">"ເຂົ້າເຖິງການແຈ້ງເຕືອນ"</item>
+    <item msgid="5332718516635907742">"ກ້ອງຖ່າຍຮູບ"</item>
+    <item msgid="6098422447246167852">"ບັນທຶກສຽງ"</item>
+    <item msgid="9182794235292595296">"ຫຼິ້ນສຽງ"</item>
+    <item msgid="8760743229597702019">"ອ່ານຄລິບບອດ"</item>
+    <item msgid="2266923698240538544">"ແກ້ໄຂຄລິບບອດ"</item>
+    <item msgid="1801619438618539275">"ປຸ່ມ​ມີເດຍ"</item>
+    <item msgid="31588119965784465">"audio focus"</item>
+    <item msgid="7565226799008076833">"ລະດັບສຽງຫຼັກ"</item>
+    <item msgid="5420704980305018295">"ລະດັບສຽງເວົ້າ"</item>
+    <item msgid="5797363115508970204">"ລະດັບສຽງເຕືອນ"</item>
+    <item msgid="8233154098550715999">"ລະດັບສຽງມີເດຍ"</item>
+    <item msgid="5196715605078153950">"ລະດັບສຽງໂມງປຸກ"</item>
+    <item msgid="394030698764284577">"ລະດັບສຽງແຈ້ງເຕືອນ"</item>
+    <item msgid="8952898972491680178">"ລະດັບສຽງ Bluetooth"</item>
+    <item msgid="8506227454543690851">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
+    <item msgid="1108160036049727420">"ຕຳແໜ່ງ​ຕິດ​ຕາມ"</item>
+    <item msgid="1496205959751719491">"ຕິດຕາມສະຖານທີ່ທີ່ມີພະລັງງານສູງ"</item>
+    <item msgid="3776296279910987380">"ໂຫຼດ​ສະ​ຖິ​ຕິ​ການ​ນຳ​ໃຊ້"</item>
+    <item msgid="8827100324471975602">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
+    <item msgid="6880736730520126864">"ສະແດງຂໍ້ຄວາມປາກົດຂຶ້ນຊົ່ວຄາວ"</item>
+    <item msgid="4933375960222609935">"​ໂປ​ຣ​ເຈັກ​ມີ​ເດຍ"</item>
+    <item msgid="8357907018938895462">"ເປີດນຳໃຊ້ VPN"</item>
+    <item msgid="8143812849911310973">"ຂຽນຮູບພື້ນຫຼັງ"</item>
+    <item msgid="6266277260961066535">"ໂຄງຮ່າງຊ່ວຍ"</item>
+    <item msgid="7715498149883482300">"ຮູບຖ່າຍໜ້າຈໍຊ່ວຍ"</item>
+    <item msgid="4046679376726313293">"ອ່ານສະຖານະໂທລະສັບ"</item>
+    <item msgid="6329507266039719587">"ເພີ່ມຂໍ້ຄວາມສຽງ"</item>
+    <item msgid="7692440726415391408">"ໃຊ້ sip"</item>
+    <item msgid="8572453398128326267">"ດຳເນີນການໂທອອກ"</item>
+    <item msgid="7775674394089376306">"ລາຍນີ້ວມື"</item>
+    <item msgid="3182815133441738779">"ເຊັນເຊີຮ່າງກາຍ"</item>
+    <item msgid="2793100005496829513">"ອ່ານປະກາດຜ່ານເຄືອຂ່າຍ"</item>
+    <item msgid="2633626056029384366">"ສະຖານທີ່ຈຳລອງ"</item>
+    <item msgid="8356842191824684631">"ອ່ານພື້ນທີ່ຈັດເກັບ"</item>
+    <item msgid="5671906070163291500">"ຂຽນພື້ນທີ່ຈັດເກັບ"</item>
+    <item msgid="2791955098549340418">"ເປີດໜ້າຈໍ"</item>
+    <item msgid="5599435119609178367">"ຮັບບັນຊີ"</item>
+    <item msgid="1165623660533024666">"ນຳໃຊ້ໃນພື້ນຫຼັງ"</item>
+    <item msgid="6423861043647911030">"accessibility volume"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"ສັ້ນ"</item>
+    <item msgid="4816511817309094890">"ປານກາງ"</item>
+    <item msgid="8305084671259331134">"ຍາວ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ຄ່າເລີ່ມຕົ້ນ"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"ສະ​ບາຍໆ"</item>
+    <item msgid="4627069151979553527">"ຂຽນເຄືອ"</item>
+    <item msgid="6896773537705206194">"ໂຕພິມນ້ອຍ"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ນ້ອຍຫຼາຍ"</item>
+    <item msgid="5091603983404027034">"ນ້ອຍ"</item>
+    <item msgid="176844712416932112">"ປານກາງ"</item>
+    <item msgid="2784236342175159295">"ຂະໜາດໃຫຍ່"</item>
+    <item msgid="218913203203160606">"ໃຫຍ່ຫຼາຍ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ຄ່າເລີ່ມຕົ້ນ"</item>
+    <item msgid="6488643537808152001">"ບໍ່ມີ"</item>
+    <item msgid="552332815156010137">"ເສັ້ນຂອບ"</item>
+    <item msgid="7187891159463789272">"ເງົາ"</item>
+    <item msgid="8019330250538856521">"Raised"</item>
+    <item msgid="8987385315647049787">"ຫຼຸດຕ່ຳ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25​%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75​%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"ໃຊ້​ຄ່າ​ເລີ່ມ​ຕົ້ນ​ຂອງ​ແອັບ"</item>
+    <item msgid="8611890312638868524">"ສີຂາວພື້ນດຳ"</item>
+    <item msgid="5891360837786277638">"ສີດຳພື້ນຂາວ"</item>
+    <item msgid="2798457065945456853">"ສີເຫຼືອງພື້ນດຳ"</item>
+    <item msgid="5799049811524553967">"ສີເຫຼືອງພື້ນຟ້າ"</item>
+    <item msgid="3673930830658169860">"ກຳນົດເອງ"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN ທີ່ມີກະແຈທີ່ແບ່ງປັນລ່ວງໜ້າ"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN ພ້ອມໃບຮັບຮອງ"</item>
+    <item msgid="312397853907741968">"IPSec VPN ທີ່ມີກະແຈທີ່ແບ່ງປັນລ່ວງໜ້າ ແລະການພິສູດຢືນຢັນແບບ Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN ພ້ອມໃບຮັບຮອງ ແລະການກວດສອບສິດ Xauth"</item>
+    <item msgid="8258927774145391041">"L2TP/IPSec VPN ພ້ອມໃບຮັບຮອງ ແລະການພິສູດຢືນຢັນແບບປະສົມ"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ບໍ່ມີ"</item>
+    <item msgid="1157046369795346308">"ຄູ່​ມື"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"ປິດການເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="8754480102834556765">"ກຳລັງເລີ່ມຕົ້ນ…"</item>
+    <item msgid="3351334355574270250">"ກຳລັງເຊື່ອມຕໍ່..."</item>
+    <item msgid="8303882153995748352">"ເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="9135049670787351881">"ໄລຍະໝົດເວລາ"</item>
+    <item msgid="2124868417182583926">"ບໍ່ສຳເລັດ"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ຖາມ"</item>
+    <item msgid="7718817231348607934">"ບໍ່ອະນຸຍາດ"</item>
+    <item msgid="8184570120217958741">"ອະນຸຍາດສະເໝີ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ໜຽວແໜ້ນ"</item>
+    <item msgid="167418068739176448">"​ການເຄື່ອນ​ໄຫວ​ສູງ​ສຸດ"</item>
+    <item msgid="4760813290195199773">"​ສຳ​ຄັນ (​ເບື້ອງ​ໜ້າ)"</item>
+    <item msgid="2328684826817647595">"​ສຳ​ຄັນ (​ເບື້ອງຫຼັງ)"</item>
+    <item msgid="7746406490652867365">"ສຳຮອງຂໍ້ມູນ"</item>
+    <item msgid="5597404364389196754">"​ນ້ຳ​ໜັກ​ສູງ"</item>
+    <item msgid="1290888779300174556">"​​ການບໍ​ລິ​ການ (​ກຳ​ລັງ​ເຮັດ​ວຽກ)"</item>
+    <item msgid="7241098542073939046">"​​ການບໍ​ລິ​ການ (​ກຳ​ລັງ​ເລີ່ມ​ຕົ້ນ​ໃໝ່)"</item>
+    <item msgid="6610439017684111046">"​ຕົວ​ຮັບ​ຂໍ້​ມູນ"</item>
+    <item msgid="7367606086319921117">"ໜ້າຫຼັກ"</item>
+    <item msgid="3344660712396741826">"​ການ​ເຄື່ອນ​ໄຫວຫຼ້າ​ສຸດ"</item>
+    <item msgid="5006559348883303865">"Cached (​ການ​ເຄື່ອນ​ໄຫວ)"</item>
+    <item msgid="8633480732468137525">"Cached (​ການ​ເຄື່ອນ​ໄຫວ​ລູກ​ຂ່າຍ)"</item>
+    <item msgid="6248998242443333892">"Cached (​ຫວ່າງ​ເປົ່າ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ສີຂຽວອົມຟ້າ"</item>
+    <item msgid="3228505970082457852">"ຟ້າ"</item>
+    <item msgid="6590260735734795647">"​ສີມ່ວງ​ເຂັ້ມ"</item>
+    <item msgid="3521763377357218577">"ສີມ່ວງ"</item>
+    <item msgid="5932337981182999919">"ບົວ"</item>
+    <item msgid="5642914536624000094">"ແດງ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"ເກີນ 30 ມື້ແລ້ວ"</item>
+    <item msgid="8699273238891265610">"ເກີນ 60 ມື້ແລ້ວ"</item>
+    <item msgid="8346279419423837266">"ເກີນ 90 ມື້ແລ້ວ"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ກວດສອບອັດຕະໂນມັດ"</item>
+    <item msgid="773943026484148895">"ໃຊ້ແບບວັດແທກປະລິມານ"</item>
+    <item msgid="1008268820118852416">"ໃຊ້ແບບບໍ່ວັດແທກປະລິມານ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ໃຊ້ MAC ແບບສຸ່ມ (ຄ່າເລີ່ມຕົ້ນ)"</item>
+    <item msgid="214234417308375326">"ໃຊ້ MAC ອຸປະກອນ"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ບໍ່"</item>
+    <item msgid="1930581185557754880">"ແມ່ນແລ້ວ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ມືດ"</item>
+    <item msgid="5079453644557603349">"ແຈ້ງ"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ປິດ"</item>
+    <item msgid="4072198137051566919">"ດີບັກ"</item>
+    <item msgid="2473005316958868509">"ບັນທຶກລະອຽດ"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ເຄືອຂ່າຍພາຍໃນເທົ່ານັ້ນ"</item>
+    <item msgid="1161026694891024702">"ອັດຕະໂນມັດ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"ຕ້ອງການ GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"GSM ເທົ່ານັ້ນ"</item>
+    <item msgid="8579197487913425819">"WCDMA ເທົ່ານັ້ນ"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ອັດຕະໂນມັດ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ອັດຕະໂນມັດ"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"CDMA ເທົ່ານັ້ນ"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ທົ່ວໂລກ"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA ເທົ່ານັ້ນ"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ທົ່ວໂລກ"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-lo/strings.xml b/tests/CarDeveloperOptions/res/values-lo/strings.xml
index af1dad3..380f9ea 100644
--- a/tests/CarDeveloperOptions/res/values-lo/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lo/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ປົກປ້ອງແທັບເລັດຂອງທ່ານດ້ວຍຕົວເລືອກການລັອກໜ້າຈໍເພື່ອບໍ່ໃຫ້ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັອກ. ທ່ານອາດຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນໃບໜ້ານຳ. ແຕະໃສ່ຍົກເລີກ, ຈາກນັ້ນຕັ້ງລະຫັດ PIN ຫຼື ເລືອກຕົວເລືອກການລັອກໜ້າຈໍແບບອື່ນ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ປົກປ້ອງອຸປະກອນຂອງທ່ານດ້ວຍຕົວເລືອກການລັອກໜ້າຈໍເພື່ອບໍ່ໃຫ້ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັອກ. ທ່ານອາດຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນໃບໜ້ານຳ. ແຕະໃສ່ຍົກເລີກ, ຈາກນັ້ນຕັ້ງລະຫັດ PIN ຫຼື ເລືອກຕົວເລືອກການລັອກໜ້າຈໍແບບອື່ນ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ປົກປ້ອງໂທລະສັບຂອງທ່ານດ້ວຍຕົວເລືອກການລັອກໜ້າຈໍເພື່ອບໍ່ໃຫ້ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັອກ. ທ່ານອາດຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍເພື່ອຕັ້ງຄ່າການພິສູດຢືນຢັນໃບໜ້ານຳ. ແຕະໃສ່ຍົກເລີກ, ຈາກນັ້ນຕັ້ງລະຫັດ PIN ຫຼື ເລືອກຕົວເລືອກການລັອກໜ້າຈໍແບບອື່ນ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ຂ້າມການຕັ້ງລະຫັດ PIN ບໍ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ຂ້າມການຕັ້ງລະຫັດບໍ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ຂ້າມການຕັ້ງຮູບແບບປົດລັອກບໍ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ຕັ້ງຄ່າການລັອກໜ້າຈໍ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ມືຖື"</item>
+    <item msgid="6007360612667098926">"Wi-Fi ເທົ່ານັ້ນ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ມັນຈະເຮັດໃຫ້ໂທລະສັບໜ່ວຍນີ້ຊ້າລົງ"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"ບັງຄັບການກວດສອບ GNSS ເຕັມຮູບແບບ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ຕິດຕາມກຸ່ມ ແລະ ຄວາມຖີ່ GNSS ທັງໝົດໂດຍບໍ່ມີຮອບຕາມພັນທະ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ດີບັກບັນຫາການປ່ຽນຜູ້ໃຊ້"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ສະແດງຂໍ້ມູນລະອຽດໃນລະຫວ່າງການປ່ຽນຜູ້ໃຊ້"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"ອະນຸຍາດໃຫ້ການເຄື່ອນໄຫວໃນພື້ນຫຼັງເລີ່ມຕົ້ນ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"ອະນຸຍາດໃຫ້ການເຄື່ອນໄຫວໃນພື້ນຫຼັງທັງໝົດເລີ່ມຕົ້ນ"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ສະແດງກ່ອງຂໍ້ຄວາມການເຮັດວຽກລົ້ມເຫລວທຸກເທື່ອ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-lt-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-lt-nokeys/strings.xml
new file mode 100644
index 0000000..00f2876
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-lt-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Valdyti programas"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-lt/arrays.xml b/tests/CarDeveloperOptions/res/values-lt/arrays.xml
new file mode 100644
index 0000000..18c51ce
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-lt/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Azija"</item>
+    <item msgid="6683489385344409742">"Australija"</item>
+    <item msgid="5194868215515664953">"Ramiojo vandenyno"</item>
+    <item msgid="7044520255415007865">"Viskas"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sek."</item>
+    <item msgid="772029947136115322">"30 sek."</item>
+    <item msgid="8743663928349474087">"1 min."</item>
+    <item msgid="1506508631223164814">"2 min."</item>
+    <item msgid="8664703938127907662">"5 min."</item>
+    <item msgid="5827960506924849753">"10 min."</item>
+    <item msgid="6677424950124253938">"30 min."</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Niekada"</item>
+    <item msgid="2517785806387977252">"15 sek."</item>
+    <item msgid="6347954399441173672">"30 sek."</item>
+    <item msgid="4858305253279921789">"1 min."</item>
+    <item msgid="8109273437140044073">"2 min."</item>
+    <item msgid="2788593551142462622">"5 min."</item>
+    <item msgid="8012672183888404961">"10 min."</item>
+    <item msgid="8271452751594598661">"30 min."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Nedelsiant"</item>
+    <item msgid="2038544972632026612">"5 sek."</item>
+    <item msgid="5558060663472279597">"15 sek."</item>
+    <item msgid="45341168505452037">"30 sek."</item>
+    <item msgid="227647485917789272">"1 min."</item>
+    <item msgid="3367011891231217504">"2 min."</item>
+    <item msgid="4376575879222393045">"5 min."</item>
+    <item msgid="811192536981678974">"10 min."</item>
+    <item msgid="7258394417241706272">"30 min."</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Mažas"</item>
+    <item msgid="591935967183159581">"Numatytasis"</item>
+    <item msgid="1714184661981538355">"Didelis"</item>
+    <item msgid="6195563047686707484">"Didžiausias"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Nuskaitoma..."</item>
+    <item msgid="5597394826455877834">"Prisijungiama…"</item>
+    <item msgid="5848277343965362748">"Autentifikuojama..."</item>
+    <item msgid="3391238031431440676">"Gaunamas IP adresas..."</item>
+    <item msgid="5257597310494000224">"Prisijungta"</item>
+    <item msgid="8472497592913050396">"Pristabdyta"</item>
+    <item msgid="1228072488815999109">"Atjungiama..."</item>
+    <item msgid="7253087004422991731">"Atsijungęs (-usi)"</item>
+    <item msgid="4169850917304751227">"Nesėkminga"</item>
+    <item msgid="6266658166690831131">"Užblokuotas"</item>
+    <item msgid="4517230805854909775">"Laikinai vengiama prasto ryšio"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Nuskaitoma..."</item>
+    <item msgid="8058143476674427024">"Prijungiama prie <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Autentifikuojama <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Gaunamas IP adresas iš <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Prijungta prie <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Pristabdyta"</item>
+    <item msgid="4133290864821295785">"Atjungiama nuo <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Atsijungęs (-usi)"</item>
+    <item msgid="2847316776634969068">"Nesėkminga"</item>
+    <item msgid="4390990424746035383">"Užblokuotas"</item>
+    <item msgid="3618248791367063949">"Laikinai vengiama prasto ryšio"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Mygtuko paspaudimas"</item>
+    <item msgid="7401896200768713930">"PIN kodas iš susieto įrenginio"</item>
+    <item msgid="4526848028011846710">"Šio įreng. PIN kodas"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Prisijungta"</item>
+    <item msgid="983792611851499732">"Pakviestas"</item>
+    <item msgid="5438273405428201793">"Nesėkminga"</item>
+    <item msgid="4646663015449312554">"Pasiekiama"</item>
+    <item msgid="3230556734162006146">"Nepasiekiama"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 min."</item>
+    <item msgid="2759776603549270587">"5 min."</item>
+    <item msgid="167772676068860015">"1 val."</item>
+    <item msgid="5985477119043628504">"Nėra skirtojo laiko pabaigos"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Naudoti numatytuosius sistemos nustatymus: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Prastas"</item>
+    <item msgid="7882129634982603782">"Prastas"</item>
+    <item msgid="6457357501905996224">"Neblogas"</item>
+    <item msgid="405271628162918841">"Geras"</item>
+    <item msgid="999948812884919584">"Puikus"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Pastarosios 30 dienų"</item>
+    <item msgid="3211287705232736964">"Nustatyti naudojimo ciklą..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Naudojimo laikas"</item>
+    <item msgid="2784401352592276015">"Paskutinį kartą naudota"</item>
+    <item msgid="249854287216326349">"Programos pavadinimas"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Nėra"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nėra"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Nėra"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statinis"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Nėra"</item>
+    <item msgid="1464741437353223198">"Neautomatiškai"</item>
+    <item msgid="5793600062487886090">"Aut. tarp. serv. konfig."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Nėra"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP arba CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4 / IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nenurodyta"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Jokių"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Vidinė įrenginio saugykla"</item>
+    <item msgid="3186681694079967527">"Keičiama SD kortelė"</item>
+    <item msgid="6902033473986647035">"Leisti nuspręsti sistemai"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Vietovė"</item>
+    <item msgid="6842381562497597649">"Asmeninės parinktys"</item>
+    <item msgid="3966700236695683444">"Susirašinėjimas"</item>
+    <item msgid="8563996233342430477">"Medija"</item>
+    <item msgid="5323851085993963783">"Įrenginys"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"apytikslė vietovė"</item>
+    <item msgid="1830619568689922920">"tiksli vietovė"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibruoti"</item>
+    <item msgid="8632513128515114092">"skaityti kontaktus"</item>
+    <item msgid="3741042113569620272">"keisti kontaktus"</item>
+    <item msgid="4204420969709009931">"skaityti skambučių žurnalą"</item>
+    <item msgid="2260380357119423209">"keisti skambučių žurnalą"</item>
+    <item msgid="6550710385014530934">"skaityti kalendorių"</item>
+    <item msgid="3575906174264853951">"keisti kalendorių"</item>
+    <item msgid="4319843242568057174">"„Wi-Fi“ žvalgymas"</item>
+    <item msgid="2981791890467303819">"pranešimas"</item>
+    <item msgid="6617825156152476692">"mobiliųjų telefonų žvalgymas"</item>
+    <item msgid="8865260890611559753">"skambinti į telefoną"</item>
+    <item msgid="3254999273961542982">"skaityti SMS"</item>
+    <item msgid="7711446453028825171">"rašyti SMS"</item>
+    <item msgid="6123238544099198034">"gauti SMS"</item>
+    <item msgid="838342167431596036">"gauti nepaprastosios padėties SMS"</item>
+    <item msgid="8554432731560956686">"gauti MMS"</item>
+    <item msgid="7464863464299515059">"gauti „WAP Push“ pranešimus"</item>
+    <item msgid="310463075729606765">"siųsti SMS"</item>
+    <item msgid="7338021933527689514">"skaityti ICC SMS"</item>
+    <item msgid="6130369335466613036">"rašyti ICC SMS"</item>
+    <item msgid="6536865581421670942">"keisti nustatymus"</item>
+    <item msgid="4547203129183558973">"piešti viršuje"</item>
+    <item msgid="9080347512916542840">"pasiekti pranešimus"</item>
+    <item msgid="5332718516635907742">"fotoaparatas"</item>
+    <item msgid="6098422447246167852">"įrašyti garso įrašą"</item>
+    <item msgid="9182794235292595296">"leisti garso įrašą"</item>
+    <item msgid="8760743229597702019">"skaityti iškarpinę"</item>
+    <item msgid="2266923698240538544">"keisti iškarpinę"</item>
+    <item msgid="1801619438618539275">"medijos mygtukai"</item>
+    <item msgid="31588119965784465">"garso sutelktis"</item>
+    <item msgid="7565226799008076833">"pagrindinis garsumas"</item>
+    <item msgid="5420704980305018295">"balso garsumas"</item>
+    <item msgid="5797363115508970204">"skambučio garsumas"</item>
+    <item msgid="8233154098550715999">"medijos garsumas"</item>
+    <item msgid="5196715605078153950">"signalo garsumas"</item>
+    <item msgid="394030698764284577">"pranešimų garsumas"</item>
+    <item msgid="8952898972491680178">"„Bluetooth“ garsumas"</item>
+    <item msgid="8506227454543690851">"neužmigdyti"</item>
+    <item msgid="1108160036049727420">"stebėti vietovę"</item>
+    <item msgid="1496205959751719491">"stebėti didelė galia vietovė"</item>
+    <item msgid="3776296279910987380">"gauti naudojimo statistiką"</item>
+    <item msgid="8827100324471975602">"nutildyti / įjungti mikrofono garsą"</item>
+    <item msgid="6880736730520126864">"rodyti pranešimą"</item>
+    <item msgid="4933375960222609935">"projektuoti mediją"</item>
+    <item msgid="8357907018938895462">"suaktyvinti VPN"</item>
+    <item msgid="8143812849911310973">"rašyti ekrano foną"</item>
+    <item msgid="6266277260961066535">"pagalbinė struktūra"</item>
+    <item msgid="7715498149883482300">"pagalbinė ekrano kopija"</item>
+    <item msgid="4046679376726313293">"skaityti telefono būseną"</item>
+    <item msgid="6329507266039719587">"pridėti balso pašto pranešimą"</item>
+    <item msgid="7692440726415391408">"naudoti SIP"</item>
+    <item msgid="8572453398128326267">"apdoroti siunčiamąjį skambutį"</item>
+    <item msgid="7775674394089376306">"piršto antspaudas"</item>
+    <item msgid="3182815133441738779">"kūno jutikliai"</item>
+    <item msgid="2793100005496829513">"skaityti transliacijas mobiliuoju"</item>
+    <item msgid="2633626056029384366">"imituoti vietovę"</item>
+    <item msgid="8356842191824684631">"skaityti saugyklą"</item>
+    <item msgid="5671906070163291500">"rašyti į saugyklą"</item>
+    <item msgid="2791955098549340418">"įjungti ekraną"</item>
+    <item msgid="5599435119609178367">"gauti paskyras"</item>
+    <item msgid="1165623660533024666">"vykdyti fone"</item>
+    <item msgid="6423861043647911030">"pritaikymo neįgaliesiems garsas"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Trumpa"</item>
+    <item msgid="4816511817309094890">"Vidutinis"</item>
+    <item msgid="8305084671259331134">"Ilga"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Numatytasis"</item>
+    <item msgid="4147246073737933622">"Be užraitų"</item>
+    <item msgid="3117680749167407907">"Be užraitų, glaustas"</item>
+    <item msgid="6529379119163117545">"Be užraitų, lygiaplotis"</item>
+    <item msgid="1487203730637617924">"Su užraitais"</item>
+    <item msgid="4937790671987480464">"Su užraitais, lygiaplotis"</item>
+    <item msgid="4448481989108928248">"Paprastas"</item>
+    <item msgid="4627069151979553527">"Rankraštinis"</item>
+    <item msgid="6896773537705206194">"Sumažintos didžiosios raidės"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Labai mažas"</item>
+    <item msgid="5091603983404027034">"Mažas"</item>
+    <item msgid="176844712416932112">"Normalus"</item>
+    <item msgid="2784236342175159295">"Didelis"</item>
+    <item msgid="218913203203160606">"Labai didelis"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Numatytasis"</item>
+    <item msgid="6488643537808152001">"Nėra"</item>
+    <item msgid="552332815156010137">"Kontūras"</item>
+    <item msgid="7187891159463789272">"Krintantis šešėlis"</item>
+    <item msgid="8019330250538856521">"Iškilus"</item>
+    <item msgid="8987385315647049787">"Įdubęs"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Naudoti programos numatytuosius nustatymus"</item>
+    <item msgid="8611890312638868524">"Baltas ant juodo"</item>
+    <item msgid="5891360837786277638">"Juodas ant balto"</item>
+    <item msgid="2798457065945456853">"Geltonas ant juodo"</item>
+    <item msgid="5799049811524553967">"Geltonas ant mėlyno"</item>
+    <item msgid="3673930830658169860">"Tinkintas garsas"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP / „IPSec“ VPN su iš anksto bendrinamais raktais"</item>
+    <item msgid="6128519070545038358">"L2TP / „IPSec“ VPN su sertifikatais"</item>
+    <item msgid="312397853907741968">"„IPSec“ VPN su iš anksto bendrinamais raktais ir „Xauth“ autentifikavimu"</item>
+    <item msgid="3319427315593649917">"„IPSec“ VPN su sertifikatais ir „Xauth“ autentifikavimu"</item>
+    <item msgid="8258927774145391041">"„IPSec“ VPN su sertifikatu ir hibridiniu autentifikavimu"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nėra"</item>
+    <item msgid="1157046369795346308">"Neautomatiškai"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Atsijungęs (-usi)"</item>
+    <item msgid="8754480102834556765">"Inicijuojama..."</item>
+    <item msgid="3351334355574270250">"Prisijungiama…"</item>
+    <item msgid="8303882153995748352">"Prisijungta"</item>
+    <item msgid="9135049670787351881">"Baigėsi laikas"</item>
+    <item msgid="2124868417182583926">"Nesėkminga"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Klausti"</item>
+    <item msgid="7718817231348607934">"Niekada neleisti"</item>
+    <item msgid="8184570120217958741">"Visada leisti"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Nuolatinė"</item>
+    <item msgid="167418068739176448">"Populiariausia veikla"</item>
+    <item msgid="4760813290195199773">"Svarbu (priekinis planas)"</item>
+    <item msgid="2328684826817647595">"Svarbu (antrasis planas)"</item>
+    <item msgid="7746406490652867365">"Atsarginė kopija"</item>
+    <item msgid="5597404364389196754">"Sunkus"</item>
+    <item msgid="1290888779300174556">"Paslauga (veikia)"</item>
+    <item msgid="7241098542073939046">"Paslauga (paleidžiama iš naujo)"</item>
+    <item msgid="6610439017684111046">"Imtuvas"</item>
+    <item msgid="7367606086319921117">"Pagrindinis"</item>
+    <item msgid="3344660712396741826">"Pastaroji veikla"</item>
+    <item msgid="5006559348883303865">"Išsaugota talpykloje (veikla)"</item>
+    <item msgid="8633480732468137525">"Išsaugota talpykloje (veiklos kliento programa)"</item>
+    <item msgid="6248998242443333892">"Išsaugota talpykloje (tuščia)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Žalsvai mėlyna"</item>
+    <item msgid="3228505970082457852">"Mėlyna"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Purpurinė"</item>
+    <item msgid="5932337981182999919">"Rožinė"</item>
+    <item msgid="5642914536624000094">"Raudona"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Daugiau nei 30 dienų"</item>
+    <item msgid="8699273238891265610">"Daugiau nei 60 dienų"</item>
+    <item msgid="8346279419423837266">"Daugiau nei 90 dienų"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Aptikti automatiškai"</item>
+    <item msgid="773943026484148895">"Laikyti matuojamu"</item>
+    <item msgid="1008268820118852416">"Laikyti nematuojamu"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Naudoti atsitiktine tvarka parinktą MAC (numatyta)"</item>
+    <item msgid="214234417308375326">"Naudoti įrenginio MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ne"</item>
+    <item msgid="1930581185557754880">"Taip"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tamsi"</item>
+    <item msgid="5079453644557603349">"Šviesi"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Išjungta"</item>
+    <item msgid="4072198137051566919">"Derinti"</item>
+    <item msgid="2473005316958868509">"Daugiažodis"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Tik pagrindinis"</item>
+    <item msgid="1161026694891024702">"Automatinis"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Pageidaujamas GSM / WCDMA"</item>
+    <item msgid="7581481130337402578">"Tik GSM"</item>
+    <item msgid="8579197487913425819">"Tik WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM / WCDMA automatinis"</item>
+    <item msgid="9107479914166352132">"CDMA / „EvDo“ automatinis"</item>
+    <item msgid="4219607161971472471">"CDMA be „EvDo“"</item>
+    <item msgid="7278975240951052041">"Tik „EvDo“"</item>
+    <item msgid="2295969832276827854">"CDMA / „EvDo“ / GSM / WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA ir LTE / „EvDo“"</item>
+    <item msgid="463168068025354541">"GSM / WCDMA / LTE"</item>
+    <item msgid="1770755308983338311">"Visuotinis"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"Tik TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA / WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE / TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA / GSM"</item>
+    <item msgid="5874623229495009031">"LTE / TDSCDMA / GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA / GSM / WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE / TDSCDMA / WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE / TDSCDMA / GSM / WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA / CDMA / EVDO / GSM / WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE / TDSCDMA / CDMA / EVDO / GSM / WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM / SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Visuotinis"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-lt/strings.xml b/tests/CarDeveloperOptions/res/values-lt/strings.xml
index 223ed52..4d5754b 100644
--- a/tests/CarDeveloperOptions/res/values-lt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lt/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Pasirinkę ekrano užrakto parinktį apsaugokite planšetinį kompiuterį, kad jo niekas negalėtų naudoti, jei pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti veido autentifikavimą. Palieskite „Atšaukti“, tada nustatykite PIN kodą arba pasirinkite kitą ekrano užrakto parinktį."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Pasirinkę ekrano užrakto parinktį apsaugokite įrenginį, kad jo niekas negalėtų naudoti, jei pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti veido autentifikavimą. Palieskite „Atšaukti“, tada nustatykite PIN kodą arba pasirinkite kitą ekrano užrakto parinktį."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Pasirinkę ekrano užrakto parinktį apsaugokite telefoną, kad jo niekas negalėtų naudoti, jei pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti veido autentifikavimą. Palieskite „Atšaukti“, tada nustatykite PIN kodą arba pasirinkite kitą ekrano užrakto parinktį."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Praleisti PIN kodo sąranką?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Praleisti slaptažod. sąranką?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Praleisti atr. pieš. sąranką?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nustatyti ekrano užraktą"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"„Wi-Fi“ ryšys"</item>
+    <item msgid="4421333712484542489">"Mobiliojo ryšio tinklas"</item>
+    <item msgid="6007360612667098926">"Tik „Wi-Fi“ ryšys"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4262,7 +4264,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, paimkite telefoną."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, paimkite planšetinį kompiuterį."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, paimkite įrenginį."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Palieskite, kad patikrintumėte telefoną"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Telefono tikrinimas palietus"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Palieskite, kad patikrintumėte planšetinį kompiuterį"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Palieskite, kad patikrintumėte įrenginį"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, palieskite ekraną."</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ją įjungus telefonas veiks lėčiau"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Priversti vykdyti visus GNSS matavimus"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Stebėti visas GNSS konferencijas ir visus dažnius netaikant darbo ciklų"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Derinti naudotojų perjungimą"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Rodyti išsamią informaciją perjungiant naudotojus"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Leisti pradėti veiklą fone"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Leidžiama pradėti bet kokią veiklą fone"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Visada rodyti strigčių dialogo langą"</string>
diff --git a/tests/CarDeveloperOptions/res/values-lv-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-lv-nokeys/strings.xml
new file mode 100644
index 0000000..8d17a95
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-lv-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Lietojumprogrammu pārvaldība"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-lv/arrays.xml b/tests/CarDeveloperOptions/res/values-lv/arrays.xml
new file mode 100644
index 0000000..32d2fbc
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-lv/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Eiropa"</item>
+    <item msgid="3812126832016254559">"Āfrika"</item>
+    <item msgid="2765816300353408280">"Āzija"</item>
+    <item msgid="6683489385344409742">"Austrālija"</item>
+    <item msgid="5194868215515664953">"Klusais okeāns"</item>
+    <item msgid="7044520255415007865">"Visas"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekundes"</item>
+    <item msgid="772029947136115322">"30 sekundes"</item>
+    <item msgid="8743663928349474087">"1 minūte"</item>
+    <item msgid="1506508631223164814">"2 minūtes"</item>
+    <item msgid="8664703938127907662">"5 minūtes"</item>
+    <item msgid="5827960506924849753">"10 minūtes"</item>
+    <item msgid="6677424950124253938">"30 minūtes"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nekad"</item>
+    <item msgid="2517785806387977252">"15 sekundes"</item>
+    <item msgid="6347954399441173672">"30 sekundes"</item>
+    <item msgid="4858305253279921789">"1 minūte"</item>
+    <item msgid="8109273437140044073">"2 minūtes"</item>
+    <item msgid="2788593551142462622">"5 minūtes"</item>
+    <item msgid="8012672183888404961">"10 minūtes"</item>
+    <item msgid="8271452751594598661">"30 minūtes"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Nekavējoties"</item>
+    <item msgid="2038544972632026612">"5 sekundes"</item>
+    <item msgid="5558060663472279597">"15 sekundes"</item>
+    <item msgid="45341168505452037">"30 sekundes"</item>
+    <item msgid="227647485917789272">"1 minūte"</item>
+    <item msgid="3367011891231217504">"2 minūtes"</item>
+    <item msgid="4376575879222393045">"5 minūtes"</item>
+    <item msgid="811192536981678974">"10 minūtes"</item>
+    <item msgid="7258394417241706272">"30 minūtes"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Mazs"</item>
+    <item msgid="591935967183159581">"Noklusējums"</item>
+    <item msgid="1714184661981538355">"Liels"</item>
+    <item msgid="6195563047686707484">"Vislielākais"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Notiek skenēšana..."</item>
+    <item msgid="5597394826455877834">"Notiek savienojuma izveide..."</item>
+    <item msgid="5848277343965362748">"Notiek autentificēšana..."</item>
+    <item msgid="3391238031431440676">"Notiek IP adreses iegūšana…"</item>
+    <item msgid="5257597310494000224">"Izveidots savienojums"</item>
+    <item msgid="8472497592913050396">"Atlikts"</item>
+    <item msgid="1228072488815999109">"Notiek atvienošana..."</item>
+    <item msgid="7253087004422991731">"Atvienots"</item>
+    <item msgid="4169850917304751227">"Neizdevās"</item>
+    <item msgid="6266658166690831131">"Bloķēti"</item>
+    <item msgid="4517230805854909775">"Pagaidām netiek izmantots vājš savienojums."</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Notiek meklēšana..."</item>
+    <item msgid="8058143476674427024">"Notiek savienojuma izveide ar <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Notiek autentificēšana tīklā <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Notiek IP adreses iegūšana no tīkla <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Savienots ar <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Atlikts"</item>
+    <item msgid="4133290864821295785">"Notiek atvienošana no <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Atvienots"</item>
+    <item msgid="2847316776634969068">"Neizdevās"</item>
+    <item msgid="4390990424746035383">"Bloķēti"</item>
+    <item msgid="3618248791367063949">"Pagaidām netiek izmantots vājš savienojums."</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Spiedpoga"</item>
+    <item msgid="7401896200768713930">"Vienādranga ierīces PIN kods"</item>
+    <item msgid="4526848028011846710">"Šīs ierīces PIN kods"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Izveidots savienojums"</item>
+    <item msgid="983792611851499732">"Ielūgts"</item>
+    <item msgid="5438273405428201793">"Neizdevās"</item>
+    <item msgid="4646663015449312554">"Pieejama"</item>
+    <item msgid="3230556734162006146">"Ārpus sasniedzamības zonas"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minūtes"</item>
+    <item msgid="2759776603549270587">"5 minūtes"</item>
+    <item msgid="167772676068860015">"1 stunda"</item>
+    <item msgid="5985477119043628504">"Nekad ar noildzi"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Izmantot sistēmas noklusējuma iestatījumu: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1."</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Vājš"</item>
+    <item msgid="7882129634982603782">"Vājš"</item>
+    <item msgid="6457357501905996224">"Viduvējs"</item>
+    <item msgid="405271628162918841">"Labs"</item>
+    <item msgid="999948812884919584">"Teicams"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Pēdējās 30 dienas"</item>
+    <item msgid="3211287705232736964">"Iestatīt lietojuma ciklu…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Lietojuma laiks"</item>
+    <item msgid="2784401352592276015">"Pēdējo reizi izmantots"</item>
+    <item msgid="249854287216326349">"Lietotnes nosaukums"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Neviens"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nav"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Neviens"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statisks"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Neviens"</item>
+    <item msgid="1464741437353223198">"Rokasgrāmata"</item>
+    <item msgid="5793600062487886090">"Starpniekserv. aut. konf."</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Neviens"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP vai CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nav noteikts"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nav"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Iekšējā ierīces krātuve"</item>
+    <item msgid="3186681694079967527">"Izņemama SD karte"</item>
+    <item msgid="6902033473986647035">"Ļaut sistēmai izlemt"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Atrašanās vieta"</item>
+    <item msgid="6842381562497597649">"Personiski"</item>
+    <item msgid="3966700236695683444">"Ziņojumapmaiņa"</item>
+    <item msgid="8563996233342430477">"Multivide"</item>
+    <item msgid="5323851085993963783">"Ierīce"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"aptuvena atrašanās vieta"</item>
+    <item msgid="1830619568689922920">"precīza atrašanās vieta"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrozvans"</item>
+    <item msgid="8632513128515114092">"lasīt kontaktpersonas"</item>
+    <item msgid="3741042113569620272">"mainīt kontaktpersonu informāciju"</item>
+    <item msgid="4204420969709009931">"nolasīt zvanu žurnālu"</item>
+    <item msgid="2260380357119423209">"modificēt zvanu žurnālu"</item>
+    <item msgid="6550710385014530934">"lasīt kalendāru"</item>
+    <item msgid="3575906174264853951">"modificēt kalendāru"</item>
+    <item msgid="4319843242568057174">"Wi-Fi meklēšana"</item>
+    <item msgid="2981791890467303819">"paziņojums"</item>
+    <item msgid="6617825156152476692">"mobilā tālruņa meklēšana"</item>
+    <item msgid="8865260890611559753">"zvanīt uz tālruņa numuru"</item>
+    <item msgid="3254999273961542982">"lasīt īsziņu"</item>
+    <item msgid="7711446453028825171">"rakstīt īsziņu"</item>
+    <item msgid="6123238544099198034">"saņemt īsziņu"</item>
+    <item msgid="838342167431596036">"saņemt ārkārtas īsziņu"</item>
+    <item msgid="8554432731560956686">"saņemt multiziņu"</item>
+    <item msgid="7464863464299515059">"saņemt WAP push ziņojumu"</item>
+    <item msgid="310463075729606765">"sūtīt īsziņu"</item>
+    <item msgid="7338021933527689514">"lasīt ICC īsziņu"</item>
+    <item msgid="6130369335466613036">"rakstīt ICC īsziņu"</item>
+    <item msgid="6536865581421670942">"modificēt iestatījumus"</item>
+    <item msgid="4547203129183558973">"zīmēt augšdaļā"</item>
+    <item msgid="9080347512916542840">"piekļūt paziņojumiem"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"ierakstīt audio"</item>
+    <item msgid="9182794235292595296">"atskaņot audio"</item>
+    <item msgid="8760743229597702019">"lasīt starpliktuvi"</item>
+    <item msgid="2266923698240538544">"modificēt starpliktuvi"</item>
+    <item msgid="1801619438618539275">"multivides pogas"</item>
+    <item msgid="31588119965784465">"audio uzsvars"</item>
+    <item msgid="7565226799008076833">"galvenais skaļums"</item>
+    <item msgid="5420704980305018295">"balss skaļums"</item>
+    <item msgid="5797363115508970204">"zvana skaļums"</item>
+    <item msgid="8233154098550715999">"multivides skaļums"</item>
+    <item msgid="5196715605078153950">"signāla skaļums"</item>
+    <item msgid="394030698764284577">"paziņojumu skaļums"</item>
+    <item msgid="8952898972491680178">"Bluetooth apjoms"</item>
+    <item msgid="8506227454543690851">"neļaut pāriet miega rež."</item>
+    <item msgid="1108160036049727420">"pārraudzīt atrašanās vietu"</item>
+    <item msgid="1496205959751719491">"pārraudzīt lieljaudas atrašanās vietu"</item>
+    <item msgid="3776296279910987380">"iegūt lietojuma statistiku"</item>
+    <item msgid="8827100324471975602">"izslēgt/ieslēgt mikrofonu"</item>
+    <item msgid="6880736730520126864">"rādīt paziņojumu"</item>
+    <item msgid="4933375960222609935">"projicēt saturu"</item>
+    <item msgid="8357907018938895462">"aktivizēt VPN"</item>
+    <item msgid="8143812849911310973">"izveidot fona tapeti"</item>
+    <item msgid="6266277260961066535">"palīdzīga struktūra"</item>
+    <item msgid="7715498149883482300">"palīdzīgs ekrānuzņēmums"</item>
+    <item msgid="4046679376726313293">"lasīt tālruņa stāvokļa datus"</item>
+    <item msgid="6329507266039719587">"pievienot balss pastu"</item>
+    <item msgid="7692440726415391408">"izmantot SIP"</item>
+    <item msgid="8572453398128326267">"apstrādāt izejošo zvanu"</item>
+    <item msgid="7775674394089376306">"pirksta nospiedums"</item>
+    <item msgid="3182815133441738779">"ķermeņa sensori"</item>
+    <item msgid="2793100005496829513">"lasīt šūnu apraides"</item>
+    <item msgid="2633626056029384366">"neīsta atrašanās vieta"</item>
+    <item msgid="8356842191824684631">"lasīt krātuves datus"</item>
+    <item msgid="5671906070163291500">"rakstīt krātuves datus"</item>
+    <item msgid="2791955098549340418">"ieslēgt ekrānu"</item>
+    <item msgid="5599435119609178367">"iegūt kontus"</item>
+    <item msgid="1165623660533024666">"darbināt fonā"</item>
+    <item msgid="6423861043647911030">"pieejamības paziņojumu skaļums"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Īss"</item>
+    <item msgid="4816511817309094890">"Vidēji svarīgs"</item>
+    <item msgid="8305084671259331134">"Ilgs"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Noklusējums"</item>
+    <item msgid="4147246073737933622">"Bezserifa"</item>
+    <item msgid="3117680749167407907">"Saspiests, bezserifa"</item>
+    <item msgid="6529379119163117545">"Vienplatuma Sans Serif"</item>
+    <item msgid="1487203730637617924">"Serifa"</item>
+    <item msgid="4937790671987480464">"Vienplatuma Serif"</item>
+    <item msgid="4448481989108928248">"Parasts"</item>
+    <item msgid="4627069151979553527">"Kursīvs"</item>
+    <item msgid="6896773537705206194">"Kapiteļi"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Ļoti mazs"</item>
+    <item msgid="5091603983404027034">"Mazs"</item>
+    <item msgid="176844712416932112">"Parasts"</item>
+    <item msgid="2784236342175159295">"Liels"</item>
+    <item msgid="218913203203160606">"Ļoti liels"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Noklusējums"</item>
+    <item msgid="6488643537808152001">"Neviens"</item>
+    <item msgid="552332815156010137">"Kontūra"</item>
+    <item msgid="7187891159463789272">"Krītoša ēna"</item>
+    <item msgid="8019330250538856521">"Pacelts"</item>
+    <item msgid="8987385315647049787">"Pazemināta"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Pēc noklusējuma"</item>
+    <item msgid="8611890312638868524">"Balts uz melna"</item>
+    <item msgid="5891360837786277638">"Melns uz balta"</item>
+    <item msgid="2798457065945456853">"Dzeltens uz melna"</item>
+    <item msgid="5799049811524553967">"Dzeltens uz zila"</item>
+    <item msgid="3673930830658169860">"Pielāgotas"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"Otrā slāņa tunelēšanas protokola/protokola IPsec VPN ar iepriekš kopīgotām atslēgām"</item>
+    <item msgid="6128519070545038358">"Otrā slāņa tunelēšanas protokola/protokola IPsec VPN ar sertifikātiem"</item>
+    <item msgid="312397853907741968">"Protokola IPsec VPN ar iepriekš kopīgotām atslēgām un autentifikāciju Xauth"</item>
+    <item msgid="3319427315593649917">"Protokola IPsec VPN ar sertifikātiem un autentifikāciju Xauth"</item>
+    <item msgid="8258927774145391041">"Protokola IPsec VPN ar sertifikātiem un hibrīdautentifikāciju"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nav"</item>
+    <item msgid="1157046369795346308">"Rokasgrāmata"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Atvienots"</item>
+    <item msgid="8754480102834556765">"Notiek inicializēšana..."</item>
+    <item msgid="3351334355574270250">"Notiek savienojuma izveide..."</item>
+    <item msgid="8303882153995748352">"Izveidots savienojums"</item>
+    <item msgid="9135049670787351881">"Noildze"</item>
+    <item msgid="2124868417182583926">"Neizdevās"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Vaicāt"</item>
+    <item msgid="7718817231348607934">"Neatļaut nekad"</item>
+    <item msgid="8184570120217958741">"Vienmēr atļaut"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Pastāvīgs"</item>
+    <item msgid="167418068739176448">"Biežākā darbība"</item>
+    <item msgid="4760813290195199773">"Svarīgi (priekšplānā)"</item>
+    <item msgid="2328684826817647595">"Svarīgi (fonā)"</item>
+    <item msgid="7746406490652867365">"Dublēšana"</item>
+    <item msgid="5597404364389196754">"Smagsvars"</item>
+    <item msgid="1290888779300174556">"Pakalpojums (darbojas)"</item>
+    <item msgid="7241098542073939046">"Pakalpojums (tiek palaists atkārtoti)"</item>
+    <item msgid="6610439017684111046">"Saņēmējs"</item>
+    <item msgid="7367606086319921117">"Sākums"</item>
+    <item msgid="3344660712396741826">"Pēdējā darbība"</item>
+    <item msgid="5006559348883303865">"Saglabāts kešatmiņā (darbība)"</item>
+    <item msgid="8633480732468137525">"Saglabāts kešatmiņā (darbības klients)"</item>
+    <item msgid="6248998242443333892">"Saglabāts kešatmiņā (tukša)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Zilganzaļa"</item>
+    <item msgid="3228505970082457852">"Zila"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Violeta"</item>
+    <item msgid="5932337981182999919">"Rozā"</item>
+    <item msgid="5642914536624000094">"Sarkana"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Vecāki par 30 dienām"</item>
+    <item msgid="8699273238891265610">"Vecāki par 60 dienām"</item>
+    <item msgid="8346279419423837266">"Vecāki par 90 dienām"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1."</item>
+    <item msgid="3118234477029486741">"0."</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Noteikt automātiski"</item>
+    <item msgid="773943026484148895">"Maksas"</item>
+    <item msgid="1008268820118852416">"Bezmaksas"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Izmantot nejaušā secībā atlasītu MAC adresi (noklusējums)"</item>
+    <item msgid="214234417308375326">"Izmantot ierīces MAC adresi"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nē"</item>
+    <item msgid="1930581185557754880">"Jā"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tumšs"</item>
+    <item msgid="5079453644557603349">"Gaišs"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Izslēgts"</item>
+    <item msgid="4072198137051566919">"Atkļūdošana"</item>
+    <item msgid="2473005316958868509">"Izvērsta informācija"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Tikai mājās"</item>
+    <item msgid="1161026694891024702">"Automātiski"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Ieteicamais režīms: GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Tikai GSM"</item>
+    <item msgid="8579197487913425819">"Tikai WCDMA"</item>
+    <item msgid="8465243227505412498">"Automātiskais režīms: GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automātiskais režīms: CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA bez EvDo"</item>
+    <item msgid="7278975240951052041">"Tikai EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA un LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Vispārējie"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Tikai TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Vispārējie"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-lv/strings.xml b/tests/CarDeveloperOptions/res/values-lv/strings.xml
index dee86a5..9eef33e 100644
--- a/tests/CarDeveloperOptions/res/values-lv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lv/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Aizsargājiet planšetdatoru, izmantojot ekrāna bloķēšanas iespēju, lai neviens nevarētu lietot planšetdatoru, ja tas tiks nozagts vai pazaudēts. Ekrāna bloķēšanas iespēja ir nepieciešama arī sejas autentifikācijas iestatīšanai. Pieskarieties vienumam Atcelt un pēc tam iestatiet PIN vai izvēlēties citu ekrāna bloķēšanas iespēju."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Aizsargājiet ierīci, izmantojot ekrāna bloķēšanas iespēju, lai neviens nevarētu lietot ierīci, ja tā tiks nozagta vai pazaudēta. Ekrāna bloķēšanas iespēja ir nepieciešama arī sejas autentifikācijas iestatīšanai. Pieskarieties vienumam Atcelt un pēc tam iestatiet PIN vai izvēlēties citu ekrāna bloķēšanas iespēju."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Aizsargājiet tālruni, izmantojot ekrāna bloķēšanas iespēju, lai neviens nevarētu lietot tālruni, ja tas tiks nozagts vai pazaudēts. Ekrāna bloķēšanas iespēja ir nepieciešama arī sejas autentifikācijas iestatīšanai. Pieskarieties vienumam Atcelt un pēc tam iestatiet PIN vai izvēlēties citu ekrāna bloķēšanas iespēju."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Vai izlaist PIN iestatīšanu?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Izlaist paroles iestatīšanu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Vai neiestatīt kombināciju?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Iestatīt ekrāna bloķēšanu"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilie dati"</item>
+    <item msgid="6007360612667098926">"Tikai Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4348,6 +4350,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Tiks palēnināts šī tālruņa darbības ātrums."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Veikt pilnus GNSS mērījumus"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Izsekot visas GNSS konstelācijas un frekvences bez darba cikliem"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Atkļūdošanas informācija, pārslēdzot lietotājus"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Rādīt detalizētu informāciju lietotāju pārslēgšanas laikā"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Atļaut darbību sākšanu fonā"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Tiek atļauta visu darbību sākšana fonā"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vienmēr rādīt avārijas dialoglodziņu"</string>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-af/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-af/strings.xml
new file mode 100644
index 0000000..9fb5120
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-af/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Jy kan nie noodoproepe met Wi-Fi-oproepe maak nie. As jy probeer om \'n noodoproep te maak, sal jou toestel outomaties die mobiele netwerk gebruik. Noodoproepe kan net gemaak word in gebiede met selnetwerkdekking."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-am/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-am/strings.xml
new file mode 100644
index 0000000..b0a6384
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-am/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"በWi-Fi ጥሪ ማድረጊያ በኩል የአደጋ ጥሪዎችን ማድረግ አይችሉም።  የአደጋ ጥሪ ለማድረግ ከሞከሩ የእርስዎ መሣሪያ በራስሰር የሞባይል አውታረመረቡን ይጠቀማል። የአደጋ ጥሪዎች የሞባይል አውታረ መረብ ሽፋን ባለባቸው አካባቢዎች ብቻ ይደረጋሉ።"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ar/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ar/strings.xml
new file mode 100644
index 0000000..19c7915
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ar/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"لا يمكنك إجراء مكالمات الطوارئ من خلال الاتصال عبر Wi-Fi. إذا حاولت إجراء مكالمة طوارئ، سيستخدم جهازك تلقائيًا شبكة الجوّال. يمكن إجراء مكالمات الطوارئ فقط في المناطق التي تشتمل على تغطية لشبكة الجوّال."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-as/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-as/strings.xml
new file mode 100644
index 0000000..d4952a8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-as/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"আপুনি ৱাই-ফাই কলিং ব্যৱহাৰ কৰি জৰুৰীকালীন কল কৰিব নোৱাৰে। যদিহে আপুনি তেনে কল কৰিবলৈ চেষ্টা কৰে, তেন্তে আপোনাৰ ডিভাইচটৱে স্বয়ংক্ৰিয়ভাৱে ম’বাইল নেটৱৰ্ক ব্যৱহাৰ কৰিব। জৰুৰীকালীন কল কেৱল ম’বাইল নেটৱৰ্ক উপলব্ধ থকা ঠাইতহে কৰিব পৰা যায়।"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-az/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-az/strings.xml
new file mode 100644
index 0000000..14d7f61
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-az/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi vasitəsilə təcili zənglər edə bilməzsiniz. Əgər təcili zəng etməyə çalışsanız, cihaz avtomatik olaraq mobil şəbəkədən istifadə edəcək. Təcili zənglər təkcə mobil şəbəkə əhatəsində olan ərazilərdə edilə bilər."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..d7af2e2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko Wi-Fi-ja. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-be/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-be/strings.xml
new file mode 100644
index 0000000..4ea0ad9
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-be/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Вы не можаце рабіць экстранныя выклікі з дапамогай Wi-Fi-тэлефаніі. Калі вы паспрабуеце зрабіць экстранны выклік, ваша прылада аўтаматычна выкарыстае мабільную сетку. Экстранныя выклікі можна рабіць толькі ў зонах пакрыцця мабільнай сеткі."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bg/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bg/strings.xml
new file mode 100644
index 0000000..7e37cae
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bg/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не можете да извършвате спешни обаждания чрез функцията Обаждания през Wi-Fi. Ако опитате да го направите, устройството ви автоматично ще използва мобилната мрежа. Спешните обаждания могат да бъдат осъществявани само в райони с покритие за мобилна мрежа."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bn/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bn/strings.xml
new file mode 100644
index 0000000..b0ea179
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরি কল করা যাবে না। জরুরি কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরি কল করা যাবে।"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bs/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bs/strings.xml
new file mode 100644
index 0000000..c804d2d
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-bs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ne možete upućivati hitne pozive putem WiFi pozivanja. Ukoliko pokušate uputiti hitan poziv, vaš uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi se mogu obavljati isključivo u području pokrivenom mobilnom mrežom."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ca/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ca/strings.xml
new file mode 100644
index 0000000..027e1b3
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ca/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"No pots fer trucades d\'emergència per Wi-Fi. Si proves de fer-ho, el dispositiu utilitzarà automàticament la xarxa mòbil. Les trucades d\'emergència només es poden fer en zones amb cobertura de telefonia mòbil."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-cs/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-cs/strings.xml
new file mode 100644
index 0000000..44e984f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-cs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Prostřednictvím volání přes Wi-Fi nelze uskutečňovat tísňová volání. Pokud se pokusíte zavolat na tísňovou linku, zařízení automaticky použije mobilní síť. Tísňová volání lze uskutečňovat jen v oblastech pokrytých mobilní sítí."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-da/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-da/strings.xml
new file mode 100644
index 0000000..2829cc9
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-da/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Du kan ikke foretage nødopkald med Opkald via Wi-Fi. Hvis du prøver at foretage et nødopkald, anvender enheden automatisk dit mobilnetværk. Nødopkald kan kun foretages i områder med dækning af dit mobilnetværk."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-de/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-de/strings.xml
new file mode 100644
index 0000000..9f4eca2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-de/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Du kannst von deinem Gerät via \"WLAN-Telefonie\" keine Notrufe tätigen. Wenn du versuchst, den Notruf zu erreichen, nutzt dein Gerät automatisch das Mobilfunknetz. Notrufe sind nur an Orten mit Mobilfunkabdeckung möglich."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-el/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-el/strings.xml
new file mode 100644
index 0000000..51d54e0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-el/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Δεν μπορείτε να πραγματοποιείτε κλήσεις έκτακτης ανάγκης μέσω της Κλήσης Wi-Fi. Εάν προσπαθήσετε να πραγματοποιήσετε μια κλήση έκτακτης ανάγκης, η συσκευή σας θα χρησιμοποιήσει αυτόματα το δίκτυο κινητής τηλεφωνίας. Οι κλήσεις έκτακτης ανάγκης μπορούν να πραγματοποιηθούν μόνο σε περιοχές με κάλυψη δικτύου κινητής τηλεφωνίας."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rAU/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rAU/strings.xml
new file mode 100644
index 0000000..eaee6e8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rCA/strings.xml
new file mode 100644
index 0000000..eaee6e8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rGB/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rGB/strings.xml
new file mode 100644
index 0000000..eaee6e8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rIN/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rIN/strings.xml
new file mode 100644
index 0000000..eaee6e8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-es-rUS/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-es-rUS/strings.xml
new file mode 100644
index 0000000..e373811
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"No puedes usar las llamadas por Wi-Fi para hacer llamadas de emergencia. Si lo intentas, el dispositivo se conectará automáticamente a la red móvil. Solo puedes hacer este tipo de llamadas en zonas con cobertura de red móvil."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-es/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-es/strings.xml
new file mode 100644
index 0000000..352502b
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-es/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"No puedes utilizar las llamadas por Wi-Fi para hacer llamadas de emergencia. Si lo intentas, el dispositivo se conectará automáticamente a la red móvil. Solo puedes hacer este tipo de llamadas en zonas con cobertura de red móvil."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-et/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-et/strings.xml
new file mode 100644
index 0000000..ed1faa7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-et/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Te ei saa WiFi-kõnede kaudu hädaabikõnesid teha. Kui proovite teha hädaabikõnet, kasutab seade automaatselt mobiilsidevõrku. Hädaabikõnesid saab teha ainult mobiilsidevõrgu katvusega piirkondades."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml
new file mode 100644
index 0000000..22232c1
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-eu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ezin duzu egin larrialdi-deirik Wi-Fi bidez. Larrialdi-dei bat egiten saiatzen bazara, gailua sare mugikorrera aldatuko da automatikoki. Sare mugikorren estaldura-eremuetan bakarrik egin daitezke larrialdi-deiak."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fa/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fa/strings.xml
new file mode 100644
index 0000000..33f67e6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"نمی‌توانید با تماس ازطریق Wi-Fi، تماس‌های اضطراری برقرار کنید. اگر در تلاشید تماس اضطراری برقرار کنید، دستگاه شما به‌طور خودکار از شبکه دستگاه همراه استفاده می‌کند. فقط در مناطقی که پوشش شبکه دستگاه همراه دارند می‌توان تماس‌های اضطراری برقرار کرد."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fi/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fi/strings.xml
new file mode 100644
index 0000000..022d6b9
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Hätäpuheluja ei voi soittaa Wi-Fi-verkossa. Laite käyttää hätäpuhelun soittamiseen automaattisesti mobiiliverkkoa. Hätäpuhelun soittaminen on mahdollista vain mobiiliverkon peittoalueella."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fr-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fr-rCA/strings.xml
new file mode 100644
index 0000000..9dd3c6c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Vous ne pouvez pas effectuer d\'appels d\'urgence à l\'aide des appels Wi-Fi. Si vous essayez de faire un appel d\'urgence, votre appareil utilisera automatiquement le réseau cellulaire. Les appels d\'urgence ne sont possibles que dans les zones disposant d\'une couverture réseau cellulaire."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fr/strings.xml
new file mode 100644
index 0000000..3b3ad5f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Vous ne pouvez pas effectuer d\'appels d\'urgence via les appels Wi-Fi. Si vous essayez de passer un appel d\'urgence, votre appareil utilisera automatiquement le réseau mobile. Les appels d\'urgence ne sont possibles que dans les zones disposant d\'une couverture réseau mobile."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gl/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gl/strings.xml
new file mode 100644
index 0000000..d5ff04f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Non podes facer chamadas de emerxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de emerxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de emerxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
new file mode 100644
index 0000000..54222b5
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-gu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"તમે વાઇ-ફાઇ કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hi/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hi/strings.xml
new file mode 100644
index 0000000..74b1cc6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"आप वाई-फ़ाई कॉलिंग के ज़रिए आपातकालीन कॉल नहीं कर सकते हैं. अगर आप आपातकालीन कॉल करने की कोशिश कर रहे हैं, तो आपका डिवाइस अपने आप मोबाइल नेटवर्क का उपयोग करेगा. आपातकालीन कॉल केवल मोबाइल नेटवर्क कवरेज वाले क्षेत्रों से किए जा सकते हैं."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hr/strings.xml
new file mode 100644
index 0000000..244735a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi pozivi ne mogu se upotrebljavati za hitne pozive. Ako pokušate uputiti hitni poziv, uređaj će automatski prijeći na mobilnu mrežu. Hitni se pozivi mogu upućivati samo u područjima pokrivenim mobilnom mrežom."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hu/strings.xml
new file mode 100644
index 0000000..4964cd7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi-hívással nem tud segélyhívást kezdeményezni. Segélyhívás kezdeményezéséhez eszköze automatikusan mobilhálózatra vált. Segélyhívást csak hálózatilag lefedett helyekről indíthat."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hy/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hy/strings.xml
new file mode 100644
index 0000000..26138c5
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-hy/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Դուք չեք կարող կատարել շտապ կանչեր` զանգելով Wi-Fi կապ միջոցով: Շտապ կանչի զանգ կատարելու փորձի դեպքում ձեր հեռախոսն ավտոմատ կերպով կմիանա բջջային ցանցին: Շտապ կանչերը կարող են կատարվել միայն բջջային ցանցի ծածկույթում:"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-in/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-in/strings.xml
new file mode 100644
index 0000000..d77c572
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-in/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Anda tidak dapat melakukan panggilan darurat melalui panggilan Wi-Fi. Jika mencoba melakukan panggilan darurat, perangkat akan otomatis menggunakan jaringan seluler. Panggilan darurat hanya dapat dilakukan di area dengan cakupan jaringan seluler."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-is/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-is/strings.xml
new file mode 100644
index 0000000..eac33fa
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-is/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ekki er hægt að hringja neyðarsímtöl með Wi-Fi símtölum. Ef þú hringir neyðarsímtal mun tækið notast sjálfkrafa við farsímakerfið. Eingöngu er hægt að hringja neyðarsímtöl á svæðum með tengingu við farsímakerfi."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-it/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-it/strings.xml
new file mode 100644
index 0000000..543dc70
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-it/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Non puoi fare chiamate di emergenza tramite la funzione Chiamate Wi-Fi. Se provi a fare una chiamata di emergenza, il dispositivo userà automaticamente la rete mobile. È possibile fare chiamate di emergenza soltanto nelle zone coperte dalla rete mobile."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-iw/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-iw/strings.xml
new file mode 100644
index 0000000..8b5998e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-iw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"לא ניתן לבצע שיחות חירום באמצעות שיחות Wi-Fi. אם תנסה לבצע שיחת חירום, המכשיר ישתמש באופן אוטומטי ברשת הסלולרית. ניתן לבצע שיחות חירום רק באזורים עם כיסוי רשת סלולרית."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ja/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ja/strings.xml
new file mode 100644
index 0000000..52b050f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ja/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi 通話で緊急通報を行うことはできません。緊急通報を試みると、デバイスは自動的にモバイル ネットワークを使用します。緊急通報は、モバイル ネットワーク対応のエリア内でのみ行えます。"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ka/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ka/strings.xml
new file mode 100644
index 0000000..0c7ed8d
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ka/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"გადაუდებელი ზარების Wi-Fi-ს მეშვეობით განხორციელება ვერ მოხერხდება. თუ გადაუდებელი ზარის გაშვებას ეცდებით, თქვენი მოწყობილობა ავტომატურად გამოიყენებს მობილურ ქსელს. გადაუდებელი ზარების განხორციელება მხოლოდ იმ ტერიტორიებზეა შესაძლებელი, რომელზეც მობილური ქსელის დაფარვა ვრცელდება."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-kk/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-kk/strings.xml
new file mode 100644
index 0000000..8b11138
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-kk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Сіз Wi-Fi қоңырауы арқылы жедел қызметке қоңырау шала алмайсыз. Егер жедел қызметке қоңырау шалғыңыз келсе, құрылғыңыз автоматты түрде мобильдік желіні қолданады. Тек мобильдік желі бар аймақтарда ғана жедел қызметке қоңырау шалуға болады."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-km/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-km/strings.xml
new file mode 100644
index 0000000..fd3bcea
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-km/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"អ្នកមិនអាចធ្វើការហៅបន្ទាន់តាមរយៈការហៅទូរសព្ទដោយប្រើ Wi-Fi បានទេ។ ប្រសិនបើអ្នកព្យាយាមធ្វើការហៅបន្ទាន់ ឧបករណ៍របស់អ្នកនឹងប្រើបណ្ដាញ​ទូរសព្ទ​ចល័តដោយស្វ័យប្រវត្តិ។ ការហៅបន្ទាន់អាចធ្វើបានតែក្នុងតំបន់ដែលមានការគ្របដណ្តប់បណ្តាញ​ទូរសព្ទ​ចល័តតែប៉ុណ្ណោះ។"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-kn/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-kn/strings.xml
new file mode 100644
index 0000000..3967a98
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-kn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"ನೀವು ವೈ-ಫೈ ಕರೆಯ ಮೂಲಕ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ತುರ್ತು ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದರೆ, ನಿಮ್ಮ ಸಾಧನ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸುತ್ತದೆ. ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯ ಇರುವಲ್ಲಿ ಮಾತ್ರ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಬಹುದು."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ko/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ko/strings.xml
new file mode 100644
index 0000000..118215a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ko/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi 통화로는 긴급 전화를 걸 수 없습니다. 긴급 전화를 걸 경우 기기에서 자동으로 모바일 네트워크가 사용됩니다. 긴급 전화는 모바일 네트워크가 제공되는 지역에서만 걸 수 있습니다."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ky/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ky/strings.xml
new file mode 100644
index 0000000..a7fc2a3
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ky/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n" Кырсыктаганда Wi-Fi аркылуу чала албайсыз. Мындай кырдаалдарда чалууга аракет кылганыңызда, түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланып, мобилдик тармак кармаган аймактарда гана чала аласыз."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lo/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lo/strings.xml
new file mode 100644
index 0000000..ccf0001
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lo/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"ທ່ານບໍ່ສາມາດໂທສຸກເສີນຜ່ານການໂທ Wi-Fi ໄດ້. ຫາກທ່ານລອງໂທສຸກເສີນ, ອຸປະກອນຂອງທ່ານຈະໃຊ້ເຄືອຂ່າຍມືຖືໂດຍອັດຕະໂນມັດ. ການໂທສຸກເສີນຈະເກີດຂຶ້ນຜ່ານເຄືອຂ່າຍມືຖືໄດ້ເທົ່ານັ້ນ."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lt/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lt/strings.xml
new file mode 100644
index 0000000..7cfc0c8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Negalite atlikti skambučių pagalbos numeriais naudodami „Wi-Fi“ skambinimą. Jei bandysite atlikti skambutį pagalbos numeriu, įrenginys automatiškai naudos mobiliojo ryšio tinklą. Skambučius pagalbos numeriais galite atlikti tik tose srityse, kuriose veikia mobiliojo ryšio tinklas."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lv/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lv/strings.xml
new file mode 100644
index 0000000..9490af3
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-lv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Jūs nevarat veikt ārkārtas izsaukumus, izmantojot Wi-Fi zvanus. Ja mēģināsiet veikt ārkārtas izsaukumu, jūsu ierīcē tiks automātiski izmantots mobilais tīkls. Ārkārtas izsaukumus var veikt tikai apgabalos ar mobilā tīkla pārklājumu."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mk/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mk/strings.xml
new file mode 100644
index 0000000..d78cebf
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не може да воспоставите итни повици преку Wi-Fi. Ако се обидете да воспоставите итен повик, уредот автоматски ќе ја користи мобилната мрежа. Итните повици може да се воспостават само во области покриени со мобилна мрежа."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ml/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ml/strings.xml
new file mode 100644
index 0000000..d9979ad
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ml/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"വൈഫൈ കോളിംഗിലൂടെ നിങ്ങൾക്ക് അടിയന്തിര കോളുകൾ വിളിക്കാനാകില്ല. നിങ്ങൾ ഒരു അടിയന്തിര കോൾ ചെയ്യാൻ ശ്രമിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം സ്വയമേവ മൊബൈല്‍ നെറ്റ്‍വര്‍ക്ക് ഉപയോഗിക്കും. മൊബൈല്‍ നെറ്റ്‍വര്‍ക്കുള്ള സ്ഥലങ്ങളിൽ മാത്രമേ അടിയന്തിര കോളുകൾ ചെയ്യാനാവൂ."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mn/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mn/strings.xml
new file mode 100644
index 0000000..e9a42fd
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Та Wi-Fi дуудлагаар яаралтай дуудлага хийх боломжгүй. Хэрэв та яаралтай дуудлага хийвэл таны төхөөрөмж мобайл сүлжээг автоматаар ашиглана. Яаралтай дуудлагыг зөвхөн мобайл сүлжээтэй газар хийх боломжтой."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mr/strings.xml
new file mode 100644
index 0000000..40d0271
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-mr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"वाय-फाय कॉलिंगने तुम्ही आपत्कालीन कॉल करू शकत नाही. तुम्ही आपत्कालीन कॉल करण्याचा प्रयत्न करत असल्यास, तुमचे डिव्हाइस आपोआप मोबाइल नेटवर्कचा वापर करेल. आपत्कालीन कॉल फक्त मोबाइल नेटवर्क कव्हरेज असलेल्या क्षेत्रात केले जाऊ शकतात."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ms/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ms/strings.xml
new file mode 100644
index 0000000..71462f0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Anda tidak dapat membuat panggilan kecemasan melalui panggilan Wi-Fi. Jika anda cuba membuat panggilan kecemasan, peranti anda akan menggunakan rangkaian mudah alih secara automatik. Panggilan kecemasan hanya dapat dibuat di kawasan yang terdapat liputan rangkaian mudah alih."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-my/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-my/strings.xml
new file mode 100644
index 0000000..f3c8e8a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-my/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi ခေါ်ဆိုမှုမှတစ်ဆင့် အရေးပေါ်ဖုန်းဆက်၍မရပါ။ အရေးပေါ်ဖုန်းခေါ်ဆိုမှုတစ်ခု ပြုလုပ်ရန်ကြိုးပမ်းပါက သင်၏စက်ပစ္စည်းသည် မိုဘိုင်းကွန်ရက်ကို အလိုအလျောက် အသုံးပြုပါလိမ့်မည်။ မိုဘိုင်းကွန်ရက်လိုင်းဆွဲအားရှိသော နေရာများတွင်သာ အရေးပေါ်ဖုန်းခေါ်ဆိုမှုများကိုပြုလုပ်နိုင်ပါသည်။"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-nb/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-nb/strings.xml
new file mode 100644
index 0000000..7bb6de2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-nb/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Du kan ikke ringe nødnumre via Wi-Fi-anrop. Hvis du prøver å ringe et nødnummer, bruker enheten automatisk mobilnettverket. Du kan bare ringe nødnumre i områder med mobildekning."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
new file mode 100644
index 0000000..51ca01e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ne/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपतकालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपतकालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्ने छ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपतकालीन कलहरू गर्न सकिन्छ।"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-nl/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-nl/strings.xml
new file mode 100644
index 0000000..e9fe6c6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Je kunt geen noodoproepen plaatsen met \'Bellen via wifi\'. Als je een noodoproep probeert te plaatsen, maakt je apparaat automatisch gebruik van het mobiele netwerk. Noodoproepen kunnen alleen worden geplaatst in gebieden met mobiele netwerkdekking."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-or/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-or/strings.xml
new file mode 100644
index 0000000..70ddd53
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-or/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"ୱାଇ-ଫାଇ କଲିଙ୍ଗ ମାଧ୍ୟମରେ ଜରୁରୀକାଳୀନ କଲ୍‍ କରିହେବ ନାହିଁ। ଯଦି ଜରୁରୀକାଳୀନ କଲ୍‍ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତି, ତେବେ ଆପଣଙ୍କର ଡିଭାଇସ୍ ସ୍ୱଚାଳିତ ଭାବେ ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କ ବ୍ୟବହାର କରିବ। ଜରୁରୀକାଳୀନ କଲ୍‌ଗୁଡ଼ିକ କେବଳ ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ କଭରେଜ୍‌ କ୍ଷେତ୍ରଗୁଡ଼ିକରେ ହିଁ କରିହେବ।"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pa/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pa/strings.xml
new file mode 100644
index 0000000..f7859b0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pl/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pl/strings.xml
new file mode 100644
index 0000000..a8f8cda
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Nie możesz wykonywać połączeń alarmowych przez Wi-Fi. Przy próbie wykonania takiego połączenia urządzenie automatycznie skorzysta z sieci komórkowej. Połączenia alarmowe są możliwe tylko w zasięgu sieci komórkowej."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pt-rPT/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pt-rPT/strings.xml
new file mode 100644
index 0000000..8589657
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Não pode fazer chamadas de emergência através das Chamadas Wi-Fi. Se tentar fazer uma chamada de emergência, o dispositivo utiliza automaticamente a rede móvel. Apenas é possível fazer chamadas de emergência em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pt/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pt/strings.xml
new file mode 100644
index 0000000..86d4f61
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Não é possível fazer chamadas de emergência por Wi-Fi. Se você tentar fazer isso, seu dispositivo usará automaticamente a rede móvel. Chamadas de emergência só podem ser feitas em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ro/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ro/strings.xml
new file mode 100644
index 0000000..901022d
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Nu puteți să inițiați apeluri de urgență folosind Apelarea prin Wi-Fi. Dacă încercați să inițiați un apel de urgență, dispozitivul va folosi automat rețeaua mobilă. Apelurile de urgență pot fi inițiate numai în zonele în care funcționează rețeaua mobilă."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ru/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ru/strings.xml
new file mode 100644
index 0000000..f5401f2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ru/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Вы не можете совершать экстренные вызовы по Wi-Fi. Для экстренного вызова устройство будет автоматически использовать мобильную сеть. Экстренные вызовы доступны только в зонах покрытия мобильной сети."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-si/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-si/strings.xml
new file mode 100644
index 0000000..d0586c2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-si/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"ඔබට Wi-Fi ඇමතීම හරහා හදිසි අවස්ථා ඇමතුම් සිදු කළ නොහැකිය. ඔබ හදිසි අවස්ථා ඇමතුමක් සිදු කිරීමට උත්සාහ ක‍ළහොත්, ඔබේ උපාංගය ස්වයංක්‍රියව ජංගම ජාලය භාවිත කරනු ඇත. හදිසි අවස්ථා ඇමතුම් ජංගම ජාල ආවරණය ඇති ප්‍රදේශවල පමණක් සිදු කළ හැකිය."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sk/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sk/strings.xml
new file mode 100644
index 0000000..edb3af6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Tiesňové volania môžete uskutočniť prostredníctvom funkcie volania cez Wi‑Fi. Ak sa pokúsite uskutočniť tiesňové volanie, zariadenie automaticky použije mobilnú sieť. Tiesňové volania je možné uskutočniť iba v oblastiach s mobilným pokrytím."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sl/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sl/strings.xml
new file mode 100644
index 0000000..8e270b0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Klicanje v sili prek Wi-Fi-ja ni mogoče. Če poskusite opraviti klic v sili, bo naprava samodejno uporabila mobilno omrežje. Klice v sili lahko opravite samo na območjih s signalom mobilnega omrežja."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sq/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sq/strings.xml
new file mode 100644
index 0000000..88315f0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sq/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Nuk mund të kryesh telefonata urgjence përmes telefonatave me Wi-Fi. Nëse përpiqesh të kryesh një telefonatë urgjence, pajisja do të përdorë automatikisht rrjetin celular. Telefonatat e urgjencës mund të kryhen vetëm në zona që kanë mbulim me rrjet celular."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
new file mode 100644
index 0000000..e1618bd
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко Wi-Fi-ја. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sv/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sv/strings.xml
new file mode 100644
index 0000000..eb88d75
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Det går inte att ringa nödsamtal via Wi-Fi. Om du ringer ett nödnummer på enheten används mobilnätverket automatiskt. Det går bara att ringa nödsamtal där mobilnätet har täckning."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sw/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sw/strings.xml
new file mode 100644
index 0000000..7d75451
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-sw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Huwezi kupiga simu za dharura ukitumia huduma ya Kupiga simu kupitia Wi-Fi. Ukijaribu kupiga simu za dharura, moja kwa moja kifaa chako kitatumia mtandao wa simu. Unaweza tu kupiga simu za dharura ukiwa mahali ambapo mtandao wa simu unapatikana."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ta/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ta/strings.xml
new file mode 100644
index 0000000..aa0f561
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ta/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"வைஃபை அழைப்பு மூலம் அவசர அழைப்புகளைச் செய்ய முடியாது. அவசர அழைப்பைச் செய்ய முயன்றால், உங்கள் சாதனம் தானாகவே மொபைல் நெட்வொர்க்கைப் பயன்படுத்தும். மொபைல் நெட்வொர்க் கவரேஜ் உள்ள பகுதிகளில் மட்டுமே அவசர அழைப்புகளைச் செய்ய முடியும்."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-te/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-te/strings.xml
new file mode 100644
index 0000000..4317f90
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-te/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"మీరు Wi-Fi కాలింగ్ ద్వారా అత్యవసర కాల్‌లను చేయలేరు. అత్యవసర కాల్ చేయడానికి ప్రయత్నిస్తే, మీ పరికరం స్వయంచాలకంగా మొబైల్ నెట్‌వర్క్‌ని ఉపయోగిస్తుంది. మొబైల్ నెట్‌వర్క్‌ కవరేజ్ ఉన్న ప్రాంతాల్లో మాత్రమే అత్యవసర కాల్‌లు చేయబడతాయి."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-th/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-th/strings.xml
new file mode 100644
index 0000000..0fdf4ea
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-th/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"คุณไม่สามารถโทรฉุกเฉินด้วยการโทรผ่าน Wi-Fi หากคุณพยายามโทรฉุกเฉิน อุปกรณ์จะใช้เครือข่ายมือถือโดยอัตโนมัติ การโทรฉุกเฉินสามารถใช้งานได้ในบริเวณที่มีสัญญาณเครือข่ายมือถือเท่านั้น"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-tl/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-tl/strings.xml
new file mode 100644
index 0000000..489657e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-tl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Hindi ka makakapagsagawa ng mga emergency na tawag sa pamamagitan ng pagtawag gamit ang Wi-Fi. Kung susubukan mong magsagawa ng emergency na tawag, awtomatikong gagamitin ng iyong device ang mobile network. Makakapagsagawa lang ng mga emergency na tawag sa mga lugar na nasasaklawan ng mobile network."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-tr/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-tr/strings.xml
new file mode 100644
index 0000000..83dbe01
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-tr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Kablosuz çağrı ile acil durum aramaları yapamazsınız. Acil durum araması yapmaya çalışırsanız cihazınız otomatik olarak mobil ağa geçecektir. Acil durum aramaları yalnızca mobil ağ kapsamında olan yerlerden yapılabilir."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-uk/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-uk/strings.xml
new file mode 100644
index 0000000..0395b78
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-uk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ви не можете здійснювати екстрені виклики через Wi-Fi. Якщо ви спробуєте здійснити екстрений виклик, пристрій автоматично використовуватиме мобільну мережу. Екстрені виклики доступні лише в місцевостях із мобільним покриттям."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ur/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ur/strings.xml
new file mode 100644
index 0000000..214816a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-ur/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"آپ Wi-Fi کالنگ کے ذریعے ایمرجنسی کالز نہیں کر سکتے۔ اگر آپ کوئی ایمرجنسی کال کرنے کی کوشش کرتے ہیں، تو آپ کا آلہ خودکار طور پر موبائل نیٹ ورک کا استعمال کرے گا۔ ایمرجنسی کللز صرف موبائل نیٹ ورک کوریج کے ساتھ ہی کی جا سکتی ہیں۔"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-uz/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-uz/strings.xml
new file mode 100644
index 0000000..85f850a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-uz/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi chaqiruv orqali favqulodda chaqiruvlarni amalga oshirib bo‘lmaydi. Agar favqulodda chaqirishni boshlasangiz, qurilmangiz avtomatik ravishda mobil tarmoqdan foydalanadi. Favqulodda chaqiruvlar faqat mobil tarmoq doirasidagina ishlaydi."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-vi/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-vi/strings.xml
new file mode 100644
index 0000000..e9be889
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-vi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Bạn không thể thực hiện cuộc gọi khẩn cấp thông qua tính năng Gọi qua Wi-Fi. Nếu bạn cố gắng thực hiện cuộc gọi khẩn cấp, thiết bị của bạn sẽ tự động sử dụng mạng di động. Chỉ có thể thực hiện cuộc gọi khẩn cấp ở những khu vực có phủ sóng mạng di động."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rCN/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rCN/strings.xml
new file mode 100644
index 0000000..a7081cc
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"您无法通过 WLAN 通话功能拨打紧急呼救电话。如果您尝试拨打紧急呼救电话，您的设备将自动使用移动网络。您只能在有移动网络的地方拨打紧急呼救电话。"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rHK/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rHK/strings.xml
new file mode 100644
index 0000000..1e96994
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"您不可透過 Wi-Fi 通話撥打緊急電話。如果您嘗試撥打緊急電話，裝置會自動使用流動網絡。您只可在有流動網絡覆蓋的地方撥打緊急電話。"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rTW/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rTW/strings.xml
new file mode 100644
index 0000000..bd93898
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Wi-Fi 通話功能無法用來撥打緊急電話。如果你嘗試撥打緊急電話，裝置將自動使用行動網路。在行動網路覆蓋的區域中才能撥打緊急電話。"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zu/strings.xml b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zu/strings.xml
new file mode 100644
index 0000000..d557c6f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mcc262-mnc02-zu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="4142074253083399456">\n\n"Ungenza amakholi aphuthumayo ngokushaya kwe-Wi-Fi. Uma uzama ukwenza ikholi ephuthumayo, idivayisi yakho izosebenzisa ngokuzenzakalela inethiwekhi yeselula. Amakholi aphuthumayo angenziwa kuphela ezindaweni ezinenethiweki yeselula."</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mk-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-mk-nokeys/strings.xml
new file mode 100644
index 0000000..99e5260
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mk-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Управувај со апликации"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mk/arrays.xml b/tests/CarDeveloperOptions/res/values-mk/arrays.xml
new file mode 100644
index 0000000..872a655
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mk/arrays.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америка"</item>
+    <item msgid="4791956477275129121">"Европа"</item>
+    <item msgid="3812126832016254559">"Африка"</item>
+    <item msgid="2765816300353408280">"Азија"</item>
+    <item msgid="6683489385344409742">"Австралија"</item>
+    <item msgid="5194868215515664953">"Пацифик"</item>
+    <item msgid="7044520255415007865">"Сите"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Веднаш"</item>
+    <item msgid="2038544972632026612">"5 секунди"</item>
+    <item msgid="5558060663472279597">"15 секунди"</item>
+    <item msgid="45341168505452037">"30 секунди"</item>
+    <item msgid="227647485917789272">"1 минута"</item>
+    <item msgid="3367011891231217504">"2 минути"</item>
+    <item msgid="4376575879222393045">"5 минути"</item>
+    <item msgid="811192536981678974">"10 минути"</item>
+    <item msgid="7258394417241706272">"30 минути"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Поврзана"</item>
+    <item msgid="983792611851499732">"Покането"</item>
+    <item msgid="5438273405428201793">"Неуспешно"</item>
+    <item msgid="4646663015449312554">"Достапна"</item>
+    <item msgid="3230556734162006146">"Надвор од опсег"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Користи ја стандардната поставка на системот: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Минатите 30 дена"</item>
+    <item msgid="3211287705232736964">"Пост. цикл. на корист...."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Време на употреба"</item>
+    <item msgid="2784401352592276015">"Користено последен пат"</item>
+    <item msgid="249854287216326349">"Име на апликација"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ниедна"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ниеден"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ниедна"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ниедна"</item>
+    <item msgid="1464741437353223198">"Упатство"</item>
+    <item msgid="5793600062487886090">"Прокси автоконфигурација"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ниедна"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP или CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Неодреден"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ниедна"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Внатрешен капацитет"</item>
+    <item msgid="3186681694079967527">"Пренослива СД картичка"</item>
+    <item msgid="6902033473986647035">"Дозволи системот да одлучи"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Локација"</item>
+    <item msgid="6842381562497597649">"Лични"</item>
+    <item msgid="3966700236695683444">"Пораки"</item>
+    <item msgid="8563996233342430477">"Медиуми"</item>
+    <item msgid="5323851085993963783">"Уред"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"приближна локација"</item>
+    <item msgid="1830619568689922920">"точна локација"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"вибрации"</item>
+    <item msgid="8632513128515114092">"прочитај контакти"</item>
+    <item msgid="3741042113569620272">"измени контакти"</item>
+    <item msgid="4204420969709009931">"прочитај евиденција на повици"</item>
+    <item msgid="2260380357119423209">"измени евиденција на повици"</item>
+    <item msgid="6550710385014530934">"прочитај календар"</item>
+    <item msgid="3575906174264853951">"измени календар"</item>
+    <item msgid="4319843242568057174">"Скенирање Wi-Fi"</item>
+    <item msgid="2981791890467303819">"известување"</item>
+    <item msgid="6617825156152476692">"Скенирање мобилен"</item>
+    <item msgid="8865260890611559753">"повикај телефонски број"</item>
+    <item msgid="3254999273961542982">"прочитај SMS порака"</item>
+    <item msgid="7711446453028825171">"напиши SMS порака"</item>
+    <item msgid="6123238544099198034">"прими SMS порака"</item>
+    <item msgid="838342167431596036">"прими SMS пораки за итни случаи"</item>
+    <item msgid="8554432731560956686">"прими MMS порака"</item>
+    <item msgid="7464863464299515059">"прими рекламни пораки на WAP"</item>
+    <item msgid="310463075729606765">"испрати SMS порака"</item>
+    <item msgid="7338021933527689514">"прочитај SMS порака на ICC"</item>
+    <item msgid="6130369335466613036">"напиши SMS порака на ICC"</item>
+    <item msgid="6536865581421670942">"измени поставки"</item>
+    <item msgid="4547203129183558973">"цртај на врвот"</item>
+    <item msgid="9080347512916542840">"пристапи кон известувања"</item>
+    <item msgid="5332718516635907742">"фотоапарат"</item>
+    <item msgid="6098422447246167852">"снимај аудио"</item>
+    <item msgid="9182794235292595296">"репродуцирај аудио"</item>
+    <item msgid="8760743229597702019">"прочитај табла со исечоци"</item>
+    <item msgid="2266923698240538544">"измени табла со исечоци"</item>
+    <item msgid="1801619438618539275">"копчиња на медиуми"</item>
+    <item msgid="31588119965784465">"аудио фокус"</item>
+    <item msgid="7565226799008076833">"основна јачина на звук"</item>
+    <item msgid="5420704980305018295">"јачина на звук на глас"</item>
+    <item msgid="5797363115508970204">"јачина на звук на ѕвонење"</item>
+    <item msgid="8233154098550715999">"јачина на звук на медиуми"</item>
+    <item msgid="5196715605078153950">"јачина на звук на аларм"</item>
+    <item msgid="394030698764284577">"јачина на звук на известување"</item>
+    <item msgid="8952898972491680178">"јачина на звук на Bluetooth"</item>
+    <item msgid="8506227454543690851">"остани активен"</item>
+    <item msgid="1108160036049727420">"следи локација"</item>
+    <item msgid="1496205959751719491">"следи локација од големо значење"</item>
+    <item msgid="3776296279910987380">"добиј статистики за користење"</item>
+    <item msgid="8827100324471975602">"вклучи/исклучи звук на микрофон"</item>
+    <item msgid="6880736730520126864">"прикажи известување"</item>
+    <item msgid="4933375960222609935">"проектирај медиуми"</item>
+    <item msgid="8357907018938895462">"активирај ВПН"</item>
+    <item msgid="8143812849911310973">"напиши тапет"</item>
+    <item msgid="6266277260961066535">"помошна структура"</item>
+    <item msgid="7715498149883482300">"помошна слика од екранот"</item>
+    <item msgid="4046679376726313293">"прочитај ја состојбата на телефонот"</item>
+    <item msgid="6329507266039719587">"додај говорна пошта"</item>
+    <item msgid="7692440726415391408">"користи SIP"</item>
+    <item msgid="8572453398128326267">"обработи појдовен повик"</item>
+    <item msgid="7775674394089376306">"отпечаток"</item>
+    <item msgid="3182815133441738779">"телесни сензори"</item>
+    <item msgid="2793100005496829513">"читај пораки Cell Broadcast"</item>
+    <item msgid="2633626056029384366">"лажна локација"</item>
+    <item msgid="8356842191824684631">"прочитај ја меморијата"</item>
+    <item msgid="5671906070163291500">"напиши во меморијата"</item>
+    <item msgid="2791955098549340418">"вклучи го екранот"</item>
+    <item msgid="5599435119609178367">"земи сметки"</item>
+    <item msgid="1165623660533024666">"извршувај во заднина"</item>
+    <item msgid="6423861043647911030">"јачина на звук на пристапноста"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Кратко"</item>
+    <item msgid="4816511817309094890">"Средно"</item>
+    <item msgid="8305084671259331134">"Долго"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Стандардно"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-Serif збиени"</item>
+    <item msgid="6529379119163117545">"Sans-serif со еднаква ширина"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif со еднаква ширина"</item>
+    <item msgid="4448481989108928248">"Обичен"</item>
+    <item msgid="4627069151979553527">"Курзив"</item>
+    <item msgid="6896773537705206194">"Мали големи букви"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Стандардно"</item>
+    <item msgid="6488643537808152001">"Ниедна"</item>
+    <item msgid="552332815156010137">"Со контури"</item>
+    <item msgid="7187891159463789272">"Со сенка"</item>
+    <item msgid="8019330250538856521">"Поткренат"</item>
+    <item msgid="8987385315647049787">"Вдлабнат"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN со претходно споделени клучеви"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN со сертификати"</item>
+    <item msgid="312397853907741968">"IPSec VPN со претходно споделени клучеви и Xauth автентикација"</item>
+    <item msgid="3319427315593649917">"IPSec VPN со сертификати и Xauth автентикација"</item>
+    <item msgid="8258927774145391041">"IPSec VPN со сертификати и хибридна автентикација"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ништо"</item>
+    <item msgid="1157046369795346308">"Упатство"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Прашај"</item>
+    <item msgid="7718817231348607934">"Никогаш не дозволувај"</item>
+    <item msgid="8184570120217958741">"Секогаш дозволувај"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Постојано"</item>
+    <item msgid="167418068739176448">"Врвна активност"</item>
+    <item msgid="4760813290195199773">"Важно (преден план)"</item>
+    <item msgid="2328684826817647595">"Важно (заднина)"</item>
+    <item msgid="7746406490652867365">"Бекап"</item>
+    <item msgid="5597404364389196754">"Тешка категорија"</item>
+    <item msgid="1290888779300174556">"Услуга (активна)"</item>
+    <item msgid="7241098542073939046">"Услуга (се рестартира)"</item>
+    <item msgid="6610439017684111046">"Приемник"</item>
+    <item msgid="7367606086319921117">"Дома"</item>
+    <item msgid="3344660712396741826">"Последна активност"</item>
+    <item msgid="5006559348883303865">"Кеширана (активност)"</item>
+    <item msgid="8633480732468137525">"Кеширана (клиент за активност)"</item>
+    <item msgid="6248998242443333892">"Кеширана (празна)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Тиркизна"</item>
+    <item msgid="3228505970082457852">"Сина"</item>
+    <item msgid="6590260735734795647">"Индиго"</item>
+    <item msgid="3521763377357218577">"Виолетова"</item>
+    <item msgid="5932337981182999919">"Розова"</item>
+    <item msgid="5642914536624000094">"Црвена"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Постари од 30 дена"</item>
+    <item msgid="8699273238891265610">"Постари од 60 дена"</item>
+    <item msgid="8346279419423837266">"Постари од 90 дена"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Откриј автоматски"</item>
+    <item msgid="773943026484148895">"Сметај како ограничена мрежа"</item>
+    <item msgid="1008268820118852416">"Сметај како неограничена мрежа"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Користи рандомизирана MAC-адреса (стандардно)"</item>
+    <item msgid="214234417308375326">"Користи ја MAC-адресата на уредот"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Не"</item>
+    <item msgid="1930581185557754880">"Да"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Темна"</item>
+    <item msgid="5079453644557603349">"Светла"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Исклучено"</item>
+    <item msgid="4072198137051566919">"Отстранување грешка"</item>
+    <item msgid="2473005316958868509">"Опширно"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Само домашен"</item>
+    <item msgid="1161026694891024702">"Автоматски"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Претпочитан е GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Само GSM"</item>
+    <item msgid="8579197487913425819">"Само WCDMA"</item>
+    <item msgid="8465243227505412498">"Автоматски GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Автоматски CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA без EvDo"</item>
+    <item msgid="7278975240951052041">"Само EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Глобален"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Само TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Глобален"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mk/strings.xml b/tests/CarDeveloperOptions/res/values-mk/strings.xml
index 9b14d1e..b95427b 100644
--- a/tests/CarDeveloperOptions/res/values-mk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/strings.xml
@@ -128,7 +128,7 @@
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"Барање за спарување"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"Допрете за да се спари со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"Примени датотеки"</string>
-    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Датотеки преку Bluetooth"</string>
+    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Датотеки примени преку Bluetooth"</string>
     <string name="device_picker" msgid="8345264486071697705">"Изберете уред со Bluetooth"</string>
     <string name="bluetooth_ask_enablement" msgid="8716802066127746062">"<xliff:g id="APP_NAME">%1$s</xliff:g> сака да се вклучи Bluetooth"</string>
     <string name="bluetooth_ask_disablement" msgid="7125319551097350783">"<xliff:g id="APP_NAME">%1$s</xliff:g> сака да се исклучи Bluetooth"</string>
@@ -349,8 +349,8 @@
     <string name="time_picker_title" msgid="1596400307061268660">"Време"</string>
     <string name="lock_after_timeout" msgid="7755520959071097304">"Автоматско заклучување"</string>
     <string name="lock_after_timeout_summary" msgid="3160517585613694740">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> по режим на штедење"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Веднаш по спиење, освен кога <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> го чувал отклучен"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> по мирување, освен кога е активен поради <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Веднаш по мирувањето, освен кога <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> го држи отклучен"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> по мирувањето, освен кога <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> го држи отклучен"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Прикажи инфо. за сопственик на екран за заклучув."</string>
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Порака на закл.екран"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Овозможи виџети"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Заштитете го таблетот со опција за заклучување екран за да не може никој да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите проверка на лик. Допрете „Откажи“, а потоа поставете PIN или изберете друга опција за заклучување екран."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Заштитете го уредот со опција за заклучување екран за да не може никој да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите проверка на лик. Допрете „Откажи“, а потоа поставете PIN или изберете друга опција за заклучување екран."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Заштитете го телефонот со опција за заклучување екран за да не може никој да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите проверка на лик. Допрете „Откажи“, а потоа поставете PIN или изберете друга опција за заклучување екран."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Да не се поставува PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Да не се поставува лозинка?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Да не се поставува шема?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Поставете заклучување на екранот"</string>
@@ -747,7 +746,7 @@
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"Пребарување..."</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"Поставки на уред"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"Спарен уред"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Поврзување на интернет"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="3693599743477470469">"Интернет врска"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="4627309436489645755">"Тастатура"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="5290994459307558039">"Контакти и историја на повици"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"Да се спари со уредов?"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобилен интернет"</item>
+    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1261,7 +1263,7 @@
     <string name="title_font_size" msgid="5021464556860010851">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"Намалете го или зголемете го текстот"</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"Поставки на заклучување на SIM картичка"</string>
-    <string name="sim_lock_settings_category" msgid="1126759898277681516">"Заклучување SIM-картичката"</string>
+    <string name="sim_lock_settings_category" msgid="1126759898277681516">"Заклучување SIM-картичка"</string>
     <string name="sim_lock_settings_summary_off" msgid="348656447968142307">"Исклученo"</string>
     <string name="sim_lock_settings_summary_on" msgid="3440707542514810045">"Заклучено"</string>
     <string name="sim_lock_settings_title" msgid="877336472752342977">"Заклучување на SIM картичката"</string>
@@ -1685,7 +1687,7 @@
     <string name="safety_and_regulatory_info" msgid="7113766428000920132">"Упатство за безбедност и регулатива"</string>
     <string name="copyright_title" msgid="3847703367689932190">"Авторски права"</string>
     <string name="license_title" msgid="7582145947873528540">"Лиценца"</string>
-    <string name="terms_title" msgid="1804549588198223771">"Правила и услови"</string>
+    <string name="terms_title" msgid="1804549588198223771">"Одредби и услови"</string>
     <string name="webview_license_title" msgid="8244960025549725051">"Системска лиценца за WebView"</string>
     <string name="wallpaper_attributions" msgid="2941987966332943253">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="4461979853894606323">"Извор на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
@@ -1761,7 +1763,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Направете ја шемата на профилот видлива"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"Вибрации на допир"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Заклучи со копче за вклуч."</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Освен кога е активен поради <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Освен кога <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> го држи отклучен"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Постави шема на отклучување"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Промени шема на отклучување"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Како се употребува шемата на отклучување"</string>
@@ -2043,7 +2045,7 @@
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"Читач на екран, првенствено за лица со слепило и слаб вид"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Допрете ставки на екранот за да ги слушнете гласно прочитани"</string>
-    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Титли"</string>
+    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Затворени титлови"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Зголемување"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Зголеми со троен допир"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Зголемете со копче"</string>
@@ -2055,7 +2057,7 @@
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Кога е вклучено зголемување, користете го копчето за „Пристапност“ на дното на екранот за брзо зголемување.\n\n"<b>"За да зумирате"</b>", допрете го копчето за „Пристапност“, а потоа допрете каде било на екранот.\n"<ul><li>"Повлечете со два или повеќе прсти за да се движите"</li>\n<li>"Штипнете со два или повеќе прста за да го приспособите зумот"</li></ul>\n\n<b>"За да зумирате привремено"</b>", допрете го копчето за „Пристапност“, а потоа допрете и задржете каде било на екранот.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го прстот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Копчето за „Пристапност“ е поставено на <xliff:g id="SERVICE">%1$s</xliff:g>. За да користите зголемување, допрете го и задржете го копчето за „Пристапност“, а потоа изберете „Зголемување“."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Копче за јачина на звук"</string>
-    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Кратенки за услуги"</string>
+    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Услуга со кратенка"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Дозволете од заклучен екран"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Кога е вклучена кратенката, може да ги притиснете двете копчиња за јачина на звукот во траење од три секунди за стартување функција за пристапност."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Текст со висок контраст"</string>
@@ -2079,7 +2081,7 @@
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Изберете колку долго да се прикажуваат пораките што треба да ги прочитате, но се видливи само привремено.\n\nНе сите апликации ја поддржуваат оваа поставка."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Изберете колку долго да се прикажуваат пораките што бараат да преземете дејство, но се видливи само привремено.\n\nНе сите апликации ја поддржуваат оваа поставка."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Должина на допир и задржување"</string>
-    <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"Инверзија на боја"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"Инверзија на бои"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"Може да влијае на изведбата"</string>
     <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"Тајминг за неактивност"</string>
     <string name="accessibility_autoclick_description" msgid="5492414927846407499">"Ако користите глувче, може да го поставите курсорот да дејствува автоматски кога ќе престане да се движи одредено време."</string>
@@ -2089,8 +2091,8 @@
     <string name="accessibility_ring_vibration_title" msgid="7943341443551359985">"Вибрации при ѕвонење"</string>
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"Вибрации при допир"</string>
     <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"Користи ја услугата"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"Користи корекција на боите"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Користи титли"</string>
+    <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"Користи корекција на бои"</string>
+    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Користи титлoви"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"Продолжи"</string>
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Слушни помагала"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Нема поврзани слушни помагала"</string>
@@ -2144,7 +2146,7 @@
     <string name="captioning_standard_options_title" msgid="4124898413348084226">"Стандардни опции"</string>
     <string name="captioning_locale" msgid="4734464353806207943">"Јазик"</string>
     <string name="captioning_text_size" msgid="1707122517246408084">"Големина на текст"</string>
-    <string name="captioning_preset" msgid="7429888317480872337">"Стил на титли"</string>
+    <string name="captioning_preset" msgid="7429888317480872337">"Стил на затворени титлови"</string>
     <string name="captioning_custom_options_title" msgid="4530479671071326732">"Приспособени опции"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"Боја на заднина"</string>
     <string name="captioning_background_opacity" msgid="8178926599201811936">"Непроѕирност на заднина"</string>
@@ -2154,8 +2156,8 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Непроѕирност на текст"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Боја на раб"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Тип раб"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Фамилија на фонт"</string>
-    <string name="captioning_preview_text" msgid="4877753964772618049">"Титлите ќе изгледаат вака"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Семејство фонтови"</string>
+    <string name="captioning_preview_text" msgid="4877753964772618049">"Затворените титлови ќе изгледаат вака"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Аа"</string>
     <string name="locale_default" msgid="910074908458214054">"Стандардно"</string>
     <string name="color_title" msgid="132875486061816584">"Боја"</string>
@@ -2459,7 +2461,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"Никогаш"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"при <xliff:g id="PERCENT">%1$s</xliff:g> батерија"</string>
     <string name="battery_percentage" msgid="7782252476471033843">"Процент на батеријата"</string>
-    <string name="battery_percentage_description" msgid="9219875229166700610">"Прикажи го процентот на батеријата во статусната лента"</string>
+    <string name="battery_percentage_description" msgid="9219875229166700610">"Прикажувај процент на батеријата во статусната лента"</string>
     <string name="process_stats_summary_title" msgid="9189588417488537954">"Статистика на процес"</string>
     <string name="process_stats_summary" msgid="8077998499161221885">"Паметна статистика за процеси кои се извршуваат"</string>
     <string name="app_memory_use" msgid="5126237308545653706">"Употреба на меморија"</string>
@@ -3138,7 +3140,7 @@
     <string name="notification_unknown_sound_title" msgid="8043718667804838398">"Звук што го дава апликацијата"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"Стандарден звук за известување"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"Стандарден звук за аларм"</string>
-    <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"Вибрации за повици"</string>
+    <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"Вибрирај за повици"</string>
     <string name="other_sound_settings" msgid="5250376066099818676">"Други звуци"</string>
     <string name="dial_pad_tones_title" msgid="8877212139988655769">"Тонови на тастатура за бирање"</string>
     <string name="screen_locking_sounds_title" msgid="4407110895465866809">"Звуци на заклучување екран"</string>
@@ -3314,7 +3316,7 @@
     <string name="notification_pulse_title" msgid="4861418327614907116">"Трепкај со сијаличката"</string>
     <string name="lock_screen_notifications_title" msgid="6889072265118747835">"На заклучен екран"</string>
     <string name="locked_work_profile_notification_title" msgid="8307025804986190658">"При заклучен работен профил"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="5788874994455257378">"Прикажи ја целата содржина од известувањето"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="5788874994455257378">"Прикажи ја целата содржина од известувањата"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="3668806866535260143">"Сокриј чувствителни содржини"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3259929507369817672">"Воопшто не прикажувај известувања"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4230189215124387818">"Кога уредот е заклучен, како сакате да се прикажуваат известувањата?"</string>
@@ -3583,9 +3585,9 @@
     <string name="slot_number" msgid="785422579177068698">"(Отвор<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="6106985160202769725">"Отвори стандардно"</string>
     <string name="app_launch_domain_links_title" msgid="2987289657348349133">"За отворање линкови"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"Отвори поддржани врски"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"Отворај поддржани линкови"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"Отвори без прашање"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Поддржани врски"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"Поддржани линкови"</string>
     <string name="app_launch_other_defaults_title" msgid="2986685757258232543">"Останати стандарди"</string>
     <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="SIZE">%1$s</xliff:g> употребени во <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="4434212376539293892">"Внатрешен капацитет"</string>
@@ -3643,7 +3645,7 @@
     <string name="tap_to_wake" msgid="1902991239401652323">"Допрете за будење"</string>
     <string name="tap_to_wake_summary" msgid="8485222120721006793">"Допрете двапати каде било на екранот за да го разбудите уредот"</string>
     <string name="domain_urls_title" msgid="7939209950373945367">"За отворање линкови"</string>
-    <string name="domain_urls_summary_none" msgid="5401203416941265109">"Не отворај поддржани врски"</string>
+    <string name="domain_urls_summary_none" msgid="5401203416941265109">"Не отворај поддржани линкови"</string>
     <string name="domain_urls_summary_one" msgid="3893975485064803435">"Отвори <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="2130534984153210797">"Отворете <xliff:g id="DOMAIN">%s</xliff:g> и други URL-адреси"</string>
     <string name="domain_urls_apps_summary_off" msgid="1110203970617922543">"Ниедна апликација не отвора поддржани линкови"</string>
@@ -3675,7 +3677,7 @@
     <string name="permit_usage_access" msgid="3321727608629752758">"Дозволи пристап за користење"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"Претпочитани поставки за користење на аплик."</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"Време поминато на уредот"</string>
-    <string name="usage_access_description" msgid="2178083292760305207">"Пристапот за користење овозможува апликацијата да следи кои други апликации ги користите и колку често, како и давателот на услуга, поставките за јазик и други детали."</string>
+    <string name="usage_access_description" msgid="2178083292760305207">"Пристапот за користење овозможува апликацијата да следи кои други апликации ги користите и колку често, како и операторот, поставките за јазик и други детали."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"Меморија"</string>
     <string name="memory_details_title" msgid="6364825184513396865">"Детали за меморија"</string>
     <string name="always_running" msgid="5320183445080208766">"Секогаш е активна (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ќе го забави телефонот"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Присилување целосни мерења со GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Следете ги сите констелации и фреквенции со GNSS без работен циклус"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Отстрани грешка при префрлањето корисници"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Прикажувај детални информации при префрлањето корисници"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Дозволи стартувања на активноста во заднина"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Ги дозволува сите стартувања на активноста во заднина"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Секогаш прикажувај дијалог на пад"</string>
@@ -4474,7 +4478,7 @@
     <string name="copyable_slice_toast" msgid="1357518174923789947">"<xliff:g id="COPY_CONTENT">%1$s</xliff:g> копирано во привремената меморија."</string>
     <string name="search_bar_account_avatar_content_description" msgid="947628881535053409"></string>
     <string name="permission_bar_chart_empty_text" msgid="5893326513700540130">"0 апликации користеле дозволи"</string>
-    <string name="permission_bar_chart_title" msgid="874145405516650073">"Користење дозволи во последните 24 часа"</string>
+    <string name="permission_bar_chart_title" msgid="874145405516650073">"Користење дозволи во минатите 24 часа"</string>
     <string name="permission_bar_chart_details" msgid="942094334321073927">"Прикажи ги сите на контролната табла"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="2831305719356562097">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> апликација</item>
diff --git a/tests/CarDeveloperOptions/res/values-ml-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ml-nokeys/strings.xml
new file mode 100644
index 0000000..e806862
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ml-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ml/arrays.xml b/tests/CarDeveloperOptions/res/values-ml/arrays.xml
new file mode 100644
index 0000000..933d78c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ml/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"അമേരിക്ക"</item>
+    <item msgid="4791956477275129121">"യൂറോപ്പ്"</item>
+    <item msgid="3812126832016254559">"ആഫ്രിക്ക"</item>
+    <item msgid="2765816300353408280">"ഏഷ്യ"</item>
+    <item msgid="6683489385344409742">"ഓസ്‌ട്രേലിയ"</item>
+    <item msgid="5194868215515664953">"പസഫിക്"</item>
+    <item msgid="7044520255415007865">"എല്ലാം"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 സെക്കൻഡ്"</item>
+    <item msgid="772029947136115322">"30 സെക്കൻഡ്"</item>
+    <item msgid="8743663928349474087">"ഒരു മിനിറ്റ്"</item>
+    <item msgid="1506508631223164814">"2 മിനിറ്റ്"</item>
+    <item msgid="8664703938127907662">"5 മിനിറ്റ്"</item>
+    <item msgid="5827960506924849753">"10 മിനിറ്റ്"</item>
+    <item msgid="6677424950124253938">"30 മിനിറ്റ്"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ഉടന്‍"</item>
+    <item msgid="2038544972632026612">"5 സെക്കൻഡ്"</item>
+    <item msgid="5558060663472279597">"15 സെക്കൻഡ്"</item>
+    <item msgid="45341168505452037">"30 സെക്കൻഡ്"</item>
+    <item msgid="227647485917789272">"ഒരു മിനിറ്റ്"</item>
+    <item msgid="3367011891231217504">"2 മിനിറ്റ്"</item>
+    <item msgid="4376575879222393045">"5 മിനിറ്റ്"</item>
+    <item msgid="811192536981678974">"10 മിനിറ്റ്"</item>
+    <item msgid="7258394417241706272">"30 മിനിറ്റ്"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"കണക്‌റ്റ് ചെയ്‌തു"</item>
+    <item msgid="983792611851499732">"ക്ഷണിച്ചു"</item>
+    <item msgid="5438273405428201793">"പരാജയപ്പെട്ടു"</item>
+    <item msgid="4646663015449312554">"ലഭ്യമാണ്"</item>
+    <item msgid="3230556734162006146">"പരിധിക്കു പുറത്ത്"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 മിനിറ്റ്"</item>
+    <item msgid="2759776603549270587">"5 മിനിറ്റ്"</item>
+    <item msgid="167772676068860015">"ഒരു മണിക്കൂർ"</item>
+    <item msgid="5985477119043628504">"ഒരിക്കലും കാലഹരണപ്പെടരുത്"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"സിസ്റ്റം ഡിഫോൾട്ട് ഉപയോഗിക്കുക: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"കഴിഞ്ഞ 30 ദിവസം"</item>
+    <item msgid="3211287705232736964">"ഉപയോഗ സൈക്കിൾ സജ്ജമാക്കുക..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ഉപയോഗ സമയം"</item>
+    <item msgid="2784401352592276015">"അവസാനം ഉപയോഗിച്ചത്"</item>
+    <item msgid="249854287216326349">"അപ്ലിക്കേഷൻ പേര്"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ഒന്നുമില്ല"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ഒന്നുമില്ല"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"സിം"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ഒന്നുമില്ല"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ഒന്നുമില്ല"</item>
+    <item msgid="1464741437353223198">"മാനുവൽ"</item>
+    <item msgid="5793600062487886090">"പ്രോക്‌സി ഓട്ടോകോൺഫിഗറേഷൻ"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ഒന്നുമില്ല"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP അല്ലെങ്കിൽ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"വ്യക്തമാക്കാത്തത്"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDG"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ഒന്നുമില്ല"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ആന്തരിക ഉപകരണ സ്റ്റോറേജ്"</item>
+    <item msgid="3186681694079967527">"നീക്കംചെയ്യാനാകുന്ന SD കാർഡ്"</item>
+    <item msgid="6902033473986647035">"സി‌സ്റ്റത്തിനെ തീരുമാനമെടുക്കാൻ അനുവദിക്കുക"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ലൊക്കേഷൻ"</item>
+    <item msgid="6842381562497597649">"വ്യക്തിഗതം"</item>
+    <item msgid="3966700236695683444">"സന്ദേശം"</item>
+    <item msgid="8563996233342430477">"മീഡിയ"</item>
+    <item msgid="5323851085993963783">"ഉപകരണം"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"മോശം ലൊക്കേഷൻ"</item>
+    <item msgid="1830619568689922920">"നല്ല ലൊക്കേഷൻ"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"വൈബ്രേറ്റുചെയ്യുക"</item>
+    <item msgid="8632513128515114092">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
+    <item msgid="3741042113569620272">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="4204420969709009931">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+    <item msgid="2260380357119423209">"കോൾ ചരിത്രം പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="6550710385014530934">"കലണ്ടർ റീഡുചെയ്യുക"</item>
+    <item msgid="3575906174264853951">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="4319843242568057174">"wi-fi സ്‌കാൻ"</item>
+    <item msgid="2981791890467303819">"അറിയിപ്പ്"</item>
+    <item msgid="6617825156152476692">"സെൽ സ്‌കാൻ"</item>
+    <item msgid="8865260890611559753">"ഫോണ്‍ വിളിക്കുക"</item>
+    <item msgid="3254999273961542982">"SMS വായിക്കുക"</item>
+    <item msgid="7711446453028825171">"SMS എഴുതുക"</item>
+    <item msgid="6123238544099198034">"SMS നേടുക"</item>
+    <item msgid="838342167431596036">"അടിയന്തര SMS നേടുക"</item>
+    <item msgid="8554432731560956686">"MMS നേടുക"</item>
+    <item msgid="7464863464299515059">"WAP പുഷ് നേടുക"</item>
+    <item msgid="310463075729606765">"SMS അയയ്‌ക്കുക"</item>
+    <item msgid="7338021933527689514">"ICC SMS വായിക്കുക"</item>
+    <item msgid="6130369335466613036">"ICC SMS എഴുതുക"</item>
+    <item msgid="6536865581421670942">"ക്രമീകരണങ്ങൾ പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="4547203129183558973">"മുകളിൽ ഡ്രോ ചെയ്യുക"</item>
+    <item msgid="9080347512916542840">"അറിയിപ്പുകൾ ആക്‌സസ്സുചെയ്യുക"</item>
+    <item msgid="5332718516635907742">"ക്യാമറ"</item>
+    <item msgid="6098422447246167852">"ഓഡിയോ റെക്കോർഡുചെയ്യുക"</item>
+    <item msgid="9182794235292595296">"ഓഡിയോ പ്ലേ ചെയ്യുക"</item>
+    <item msgid="8760743229597702019">"ക്ലിപ്പ്ബോർഡ് റീഡുചെയ്യുക"</item>
+    <item msgid="2266923698240538544">"ക്ലിപ്പ്ബോർഡ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="1801619438618539275">"മീഡിയ ബട്ടണുകൾ"</item>
+    <item msgid="31588119965784465">"ഓഡിയോ ഫോക്കസ്"</item>
+    <item msgid="7565226799008076833">"മൊത്തം വോളിയം"</item>
+    <item msgid="5420704980305018295">"വോയ്‌സ് വോളിയം"</item>
+    <item msgid="5797363115508970204">"റിംഗ് വോളിയം"</item>
+    <item msgid="8233154098550715999">"മീഡിയ വോളിയം"</item>
+    <item msgid="5196715605078153950">"അലാറം വോളിയം"</item>
+    <item msgid="394030698764284577">"അറിയിപ്പ് വോളിയം"</item>
+    <item msgid="8952898972491680178">"ബ്ലൂടൂത്ത് വോളിയം"</item>
+    <item msgid="8506227454543690851">"സജീവമായി തുടരുക"</item>
+    <item msgid="1108160036049727420">"ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="1496205959751719491">"ഉയർന്ന പവർ ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="3776296279910987380">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ നേടുക"</item>
+    <item msgid="8827100324471975602">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
+    <item msgid="6880736730520126864">"ടോസ്റ്റ് കാണിക്കുക"</item>
+    <item msgid="4933375960222609935">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
+    <item msgid="8357907018938895462">"VPN സജീവമാക്കുക"</item>
+    <item msgid="8143812849911310973">"വാൾപേപ്പർ എഴുതുക"</item>
+    <item msgid="6266277260961066535">"അസിസ്റ്റ് ഘടന"</item>
+    <item msgid="7715498149883482300">"അസിസ്റ്റ് സ്‌ക്രീൻഷോട്ട്"</item>
+    <item msgid="4046679376726313293">"ഫോൺ നില വായിക്കുക"</item>
+    <item msgid="6329507266039719587">"വോയ്‌സ്‌മെയിൽ ചേർക്കുക"</item>
+    <item msgid="7692440726415391408">"sip ഉപയോഗിക്കുക"</item>
+    <item msgid="8572453398128326267">"ഔട്ട്‌ഗോയിംഗ് കോൾ പ്രോസസ്സുചെയ്യുക"</item>
+    <item msgid="7775674394089376306">"ഫിംഗർപ്രിന്റ്"</item>
+    <item msgid="3182815133441738779">"ബോഡി സെൻസറുകൾ"</item>
+    <item msgid="2793100005496829513">"സെൽ ബ്രോഡ്‌കാസ്റ്റുകൾ വായിക്കുക"</item>
+    <item msgid="2633626056029384366">"മോക്ക് ലൊക്കേഷൻ"</item>
+    <item msgid="8356842191824684631">"സ്റ്റോറേജ് വായിക്കുക"</item>
+    <item msgid="5671906070163291500">"സ്റ്റോറേജ് എഴുതുക"</item>
+    <item msgid="2791955098549340418">"സ്ക്രീൻ ഓണാക്കുക"</item>
+    <item msgid="5599435119609178367">"അക്കൗണ്ടുകൾ സ്വന്തമാക്കുക"</item>
+    <item msgid="1165623660533024666">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുക"</item>
+    <item msgid="6423861043647911030">"ഉപയോഗസഹായി വോളിയം"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"ഹ്രസ്വം"</item>
+    <item msgid="4816511817309094890">"ഇടത്തരം"</item>
+    <item msgid="8305084671259331134">"ദൈർഘ്യമുള്ളത്"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ഡിഫോൾട്ട്"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif കട്ടിയുള്ളത്"</item>
+    <item msgid="6529379119163117545">"Sans-serif മോണോസ്പെയ്സ്"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif മോണോസ്പെയ്സ്"</item>
+    <item msgid="4448481989108928248">"സാധാരണം"</item>
+    <item msgid="4627069151979553527">"കൂട്ടെഴുത്ത്"</item>
+    <item msgid="6896773537705206194">"ചെറിയ കാപ്പിറ്റലുകൾ"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ഡിഫോൾട്ട്"</item>
+    <item msgid="6488643537808152001">"ഒന്നുമില്ല"</item>
+    <item msgid="552332815156010137">"ഔട്ട്‍ലൈൻ"</item>
+    <item msgid="7187891159463789272">"ഡ്രോപ്പ് ഷാഡോ"</item>
+    <item msgid="8019330250538856521">"ഉയർന്ന് നിൽക്കുന്നത്"</item>
+    <item msgid="8987385315647049787">"താഴ്ന്നത്"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"മുമ്പ് പങ്കിട്ട കീകൾ ഉപയോഗിക്കുന്ന L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"സർട്ടിഫിക്കറ്റുകൾ ഉപയോഗിക്കുന്ന L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"മുമ്പ് പങ്കിട്ട കീകളും Xauth പ്രമാണീകരണവും ഉപയോഗിക്കുന്ന IPSec VPN"</item>
+    <item msgid="3319427315593649917">"സർട്ടിഫിക്കറ്റുകളും Xauth പ്രമാണീകരണവും ഉപയോഗിക്കുന്ന IPSec VPN"</item>
+    <item msgid="8258927774145391041">"സർട്ടിഫിക്കറ്റുകളും ഹൈബ്രിഡ് പ്രാമാണീകരണവുമുള്ള IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ഒന്നുമില്ല"</item>
+    <item msgid="1157046369795346308">"മാനുവൽ"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ചോദിക്കുക"</item>
+    <item msgid="7718817231348607934">"ഒരിക്കലുമനുവദിക്കരുത്"</item>
+    <item msgid="8184570120217958741">"എല്ലായ്‌പ്പോഴും അനുവദിക്കുക"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"നിരന്തരമായ"</item>
+    <item msgid="167418068739176448">"മികച്ച പ്രവർത്തനം"</item>
+    <item msgid="4760813290195199773">"പ്രധാനം (ഫോർഗ്രൗണ്ട്)"</item>
+    <item msgid="2328684826817647595">"പ്രധാനം (പശ്ചാത്തലം)"</item>
+    <item msgid="7746406490652867365">"ബാക്കപ്പെടുക്കുക"</item>
+    <item msgid="5597404364389196754">"കനത്ത ഭാരം"</item>
+    <item msgid="1290888779300174556">"സേവനം (പ്രവർത്തിക്കുന്നു)"</item>
+    <item msgid="7241098542073939046">"സേവനം (പുനരാരംഭിക്കുന്നു)"</item>
+    <item msgid="6610439017684111046">"റിസീവർ"</item>
+    <item msgid="7367606086319921117">"ഹോം"</item>
+    <item msgid="3344660712396741826">"അവസാന പ്രവർത്തനം"</item>
+    <item msgid="5006559348883303865">"കാഷെചെയ്‌തു (പ്രവർത്തനം)"</item>
+    <item msgid="8633480732468137525">"കാഷെചെയ്‌തു (പ്രവർത്തന ക്ലയന്റ്)"</item>
+    <item msgid="6248998242443333892">"കാഷെചെയ്‌തു (ശൂന്യം)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ടീല്‍"</item>
+    <item msgid="3228505970082457852">"നീല"</item>
+    <item msgid="6590260735734795647">"ഇൻഡിഗോ"</item>
+    <item msgid="3521763377357218577">"പര്‍പ്പിള്‍"</item>
+    <item msgid="5932337981182999919">"പിങ്ക്"</item>
+    <item msgid="5642914536624000094">"ചുവപ്പ്"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 ദിവസത്തിലധികം പഴയത്"</item>
+    <item msgid="8699273238891265610">"60 ദിവസത്തിലധികം പഴയത്"</item>
+    <item msgid="8346279419423837266">"90 ദിവസത്തിലധികം പഴയത്"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"സ്വയമേവ കണ്ടെത്തുക"</item>
+    <item msgid="773943026484148895">"മീറ്റർ-മാപകമായി കണക്കാക്കുക"</item>
+    <item msgid="1008268820118852416">"മീറ്റർ മാപകമല്ലാത്തതായി കണക്കാക്കുക"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ക്രമരഹിതമാക്കിയ MAC ഉപയോഗിക്കുക (ഡിഫോൾട്ട്)"</item>
+    <item msgid="214234417308375326">"MAC ഉപകരണം ഉപയോഗിക്കുക"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ഇല്ല"</item>
+    <item msgid="1930581185557754880">"അതെ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ഇരുണ്ട"</item>
+    <item msgid="5079453644557603349">"ഇളം"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ഓഫ്"</item>
+    <item msgid="4072198137051566919">"ഡീബഗ് ചെയ്യുക"</item>
+    <item msgid="2473005316958868509">"വെർ‌ബോസ്"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ഹോം മാത്രം"</item>
+    <item msgid="1161026694891024702">"സ്വയമേവ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"മുൻഗണന നൽകുന്നത് GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"GSM മാത്രം"</item>
+    <item msgid="8579197487913425819">"WCDMA മാത്രം"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA സ്വമേധയാ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo സ്വമേധയാ"</item>
+    <item msgid="4219607161971472471">"EvDo ഇല്ലാത്ത CDMA"</item>
+    <item msgid="7278975240951052041">"EvDo മാത്രം"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ആഗോളം"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA മാത്രം"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/സിം"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ആഗോളം"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ml/strings.xml b/tests/CarDeveloperOptions/res/values-ml/strings.xml
index 7a29657..620e35c 100644
--- a/tests/CarDeveloperOptions/res/values-ml/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ml/strings.xml
@@ -128,7 +128,7 @@
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"ജോടിയാക്കൽ അഭ്യർത്ഥന"</string>
     <string name="bluetooth_notif_message" msgid="6612367890895077938">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്ന ഉപകരണവുമായി ജോടിയാക്കാൻ ടാപ്പുചെയ്യുക."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"സ്വീകരിച്ച ഫയലുകള്‍"</string>
-    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Bluetooth വഴി ഫയലുകൾ സ്വീകരിച്ചു"</string>
+    <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Bluetooth വഴി സ്വീകരിച്ച ഫയലുകൾ"</string>
     <string name="device_picker" msgid="8345264486071697705">"ബ്ലൂടൂത്തുപകരണം തിരഞ്ഞെടുക്കൂ"</string>
     <string name="bluetooth_ask_enablement" msgid="8716802066127746062">"Bluetooth ഓണാക്കാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
     <string name="bluetooth_ask_disablement" msgid="7125319551097350783">"Bluetooth ഓഫാക്കാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച്  പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. \'റദ്ദാക്കുക\' ടാപ്പ് ചെയ്‌ത ശേഷം പിൻ സജ്ജീകരിക്കുകയോ മറ്റൊരു സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ തിരഞ്ഞെടുക്കുകയോ ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"നിങ്ങളുടെ ഉപകരണം സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. \'റദ്ദാക്കുക\' ടാപ്പ് ചെയ്‌ത ശേഷം പിൻ സജ്ജീകരിക്കുകയോ മറ്റൊരു സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ തിരഞ്ഞെടുക്കുകയോ ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"നിങ്ങളുടെ ഫോൺ സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച്  പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം പരിശോധിച്ചുറപ്പിക്കൽ സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. \'റദ്ദാക്കുക\' ടാപ്പ് ചെയ്‌ത ശേഷം പിൻ സജ്ജീകരിക്കുകയോ മറ്റൊരു സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ തിരഞ്ഞെടുക്കുകയോ ചെയ്യുക."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"പിൻ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"പാസ്‌വേഡ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"പാറ്റേൺ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"സ്‌ക്രീൻ ലോക്ക് സജ്ജമാക്കുക"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"വൈ-ഫൈ"</item>
+    <item msgid="4421333712484542489">"മൊബൈൽ"</item>
+    <item msgid="6007360612667098926">"വൈ-ഫൈ മാത്രം"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1220,7 +1222,7 @@
     <string name="night_display_summary_on" msgid="6580571388791426596">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5461580863060506687">"ഒരിക്കലും സ്വമേധയാ ഓഫാകില്ല"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="2200631112239399233">"<xliff:g id="ID_1">%1$s</xliff:g>-ന് സ്വമേധയാ ഓഫാകും"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"സൂര്യോദയ സമയത്ത് സ്വമേധയാ ഓഫാകും"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"സൂര്യോദയ സമയത്ത് സ്വയമേവ ഓഫാകും"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"ഇപ്പോൾ ഓണാക്കുക"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"ഇപ്പോൾ ഓഫാക്കുക"</string>
     <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"സൂര്യോദയം വരെ ഓണാക്കുക"</string>
@@ -2612,7 +2614,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"ഇപ്പോൾ സമന്വയിപ്പിക്കുന്നതിന് ടാപ്പുചെയ്യുക<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"കലണ്ടർ"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"കോണ്ടാക്റ്റ്"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google സമന്വയത്തിലേക്ക് സ്വാഗതം!"</font>" \nനിങ്ങൾ എവിടെയായിരുന്നാലും കോൺടാക്റ്റുകളും അപ്പോയ്‌ന്റ്മെന്റുകളും അതിലധികം കാര്യങ്ങളും ആക്‌സസ്സുചെയ്യാൻ അനുവദിക്കുന്നതിനായി ഡാറ്റ സമന്വയിപ്പിക്കാനുള്ള Google-ന്റെ ഒരു സമീപനം."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"അപ്ലിക്കേഷൻ സമന്വയ ക്രമീകരണങ്ങൾ"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ഇത് നിങ്ങളുടെ ഫോണിൻ്റെ വേഗത കുറയ്‌ക്കും"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"പൂർണ്ണ GNSS അളവുകൾ നടപ്പിലാക്കുക"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"നോ ഡ്യൂട്ടി സൈക്ലിംഗ് ഉപയോഗിച്ച് മുഴുവൻ GNSS കോൺസ്‌റ്റലേഷനുകളും ആവൃത്തികളും ട്രാക്ക് ചെയ്യൂ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ഉപയോക്താവ് മാറുമ്പോൾ ഡീബഗ് ചെയ്യുക"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ഉപയോക്താവ് മാറുന്നതിനിടെ വിശദമായ വിവരങ്ങൾ കാണിക്കുക"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"പ്രവർത്തനം ആരംഭിക്കുന്നതിനുള്ള പശ്ചാത്തല ആക്റ്റിവിറ്റി"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"പ്രവർത്തനം ആരംഭിക്കുന്നതിനുള്ള പശ്ചാത്തല ആക്റ്റിവിറ്റി"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"എപ്പോഴും ക്രാഷ് ഡയലോഗ് കാണിക്കുക"</string>
diff --git a/tests/CarDeveloperOptions/res/values-mn-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-mn-nokeys/strings.xml
new file mode 100644
index 0000000..f52e975
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mn-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Аппликейшн удирдах"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mn/arrays.xml b/tests/CarDeveloperOptions/res/values-mn/arrays.xml
new file mode 100644
index 0000000..815dcbc
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mn/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америк"</item>
+    <item msgid="4791956477275129121">"Европ"</item>
+    <item msgid="3812126832016254559">"Африк"</item>
+    <item msgid="2765816300353408280">"Ази"</item>
+    <item msgid="6683489385344409742">"Австрали"</item>
+    <item msgid="5194868215515664953">"Номхон далай"</item>
+    <item msgid="7044520255415007865">"Бүгд"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 секунд"</item>
+    <item msgid="772029947136115322">"30 секунд"</item>
+    <item msgid="8743663928349474087">"1 минут"</item>
+    <item msgid="1506508631223164814">"2 минут"</item>
+    <item msgid="8664703938127907662">"5 минут"</item>
+    <item msgid="5827960506924849753">"10 минут"</item>
+    <item msgid="6677424950124253938">"30 минут"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Хэзээ ч үгүй"</item>
+    <item msgid="2517785806387977252">"15 секунд"</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 минут"</item>
+    <item msgid="8109273437140044073">"2 минут"</item>
+    <item msgid="2788593551142462622">"5 минут"</item>
+    <item msgid="8012672183888404961">"10 минут"</item>
+    <item msgid="8271452751594598661">"30 минут"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Шууд"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 минут"</item>
+    <item msgid="3367011891231217504">"2 минут"</item>
+    <item msgid="4376575879222393045">"5 минут"</item>
+    <item msgid="811192536981678974">"10 минут"</item>
+    <item msgid="7258394417241706272">"30 минут"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Жижиг"</item>
+    <item msgid="591935967183159581">"Өгөгдмөл"</item>
+    <item msgid="1714184661981538355">"Том"</item>
+    <item msgid="6195563047686707484">"Хамгийн том"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Скан хийж байна…"</item>
+    <item msgid="5597394826455877834">"Холбогдож байна..."</item>
+    <item msgid="5848277343965362748">"Гэрчлэж байна"</item>
+    <item msgid="3391238031431440676">"IP хаягийг авч байна…"</item>
+    <item msgid="5257597310494000224">"Холбогдсон"</item>
+    <item msgid="8472497592913050396">"Түр хаасан"</item>
+    <item msgid="1228072488815999109">"Салгаж байна…"</item>
+    <item msgid="7253087004422991731">"Салгагдсан"</item>
+    <item msgid="4169850917304751227">"Амжилтгүй"</item>
+    <item msgid="6266658166690831131">"Хориглогдсон"</item>
+    <item msgid="4517230805854909775">"Муу холболтоос түр зайлсхийж байна"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Скан хийж байна…"</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> руу холбогдож байна…"</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-тай гэрчилж байна…"</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-с IP хаягийг авч байна…"</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> руу холбогдсон"</item>
+    <item msgid="6600156231416890902">"Түр хаасан"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-с салгагдаж байна…"</item>
+    <item msgid="3980154971187953257">"Салгагдсан"</item>
+    <item msgid="2847316776634969068">"Амжилтгүй"</item>
+    <item msgid="4390990424746035383">"Хориглогдсон"</item>
+    <item msgid="3618248791367063949">"Муу холболтоос түр зайлсхийж байна"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Товчлуур"</item>
+    <item msgid="7401896200768713930">"Түнш төхөөрөмжийн PIN"</item>
+    <item msgid="4526848028011846710">"Энэ төхөөрөмжөөс PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Холбогдсон"</item>
+    <item msgid="983792611851499732">"Уригдсан"</item>
+    <item msgid="5438273405428201793">"Амжилтгүй"</item>
+    <item msgid="4646663015449312554">"Боломжтой"</item>
+    <item msgid="3230556734162006146">"Хүрээнээс гарсан"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 минут"</item>
+    <item msgid="2759776603549270587">"5 минут"</item>
+    <item msgid="167772676068860015">"1 цаг"</item>
+    <item msgid="5985477119043628504">"Хэзээ ч завсарлахгүй"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Системийн өгөгдмөлийг ашиглах: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Муу"</item>
+    <item msgid="7882129634982603782">"Муу"</item>
+    <item msgid="6457357501905996224">"Дундаж"</item>
+    <item msgid="405271628162918841">"Сайн"</item>
+    <item msgid="999948812884919584">"Маш сайн"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Сүүлийн 30 өдөр"</item>
+    <item msgid="3211287705232736964">"Ашиглалтын циклийг тохируулах..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Ашиглалтын цаг"</item>
+    <item msgid="2784401352592276015">"Ашигласан сүүлийн цаг"</item>
+    <item msgid="249854287216326349">"Апп нэр"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Байхгүй"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Аль нь ч биш"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"СИМ"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Байхгүй"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Статик"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Байхгүй"</item>
+    <item msgid="1464741437353223198">"Гар ажиллагаатай"</item>
+    <item msgid="5793600062487886090">"Прокси автомат-тохируулга"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Байхгүй"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP буюу CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Тодорхойлоогүй"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Байхгүй"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Дотоод төхөөрөмжийн сан"</item>
+    <item msgid="3186681694079967527">"Авагддаг SD карт"</item>
+    <item msgid="6902033473986647035">"Системээр шийдүүлэх"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Байршил"</item>
+    <item msgid="6842381562497597649">"Хувийн"</item>
+    <item msgid="3966700236695683444">"Зурвас"</item>
+    <item msgid="8563996233342430477">"Медиа"</item>
+    <item msgid="5323851085993963783">"Төхөөрөмж"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"бүдүүн байршил"</item>
+    <item msgid="1830619568689922920">"сайн байршил"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"чичиргээ"</item>
+    <item msgid="8632513128515114092">"харилцагчдыг унших"</item>
+    <item msgid="3741042113569620272">"харилцагчдыг өөрчлөх"</item>
+    <item msgid="4204420969709009931">"дуудлагын жагсаалтыг унших"</item>
+    <item msgid="2260380357119423209">"дуудлагын жагсаалтыг өөрчлөх"</item>
+    <item msgid="6550710385014530934">"хуанли унших"</item>
+    <item msgid="3575906174264853951">"календарийг өөрчлөх"</item>
+    <item msgid="4319843242568057174">"wi-fi скан"</item>
+    <item msgid="2981791890467303819">"мэдэгдэл"</item>
+    <item msgid="6617825156152476692">"үүрэн скан"</item>
+    <item msgid="8865260890611559753">"утас руу залгах"</item>
+    <item msgid="3254999273961542982">"SMS унших"</item>
+    <item msgid="7711446453028825171">"SMS бичих"</item>
+    <item msgid="6123238544099198034">"SMS хүлээн авах"</item>
+    <item msgid="838342167431596036">"яаралтай SMS хүлээж авах"</item>
+    <item msgid="8554432731560956686">"MMS хүлээн авах"</item>
+    <item msgid="7464863464299515059">"WAP хүлээн авах"</item>
+    <item msgid="310463075729606765">"SMS илгээх"</item>
+    <item msgid="7338021933527689514">"ICC SMS унших"</item>
+    <item msgid="6130369335466613036">"ICC SMS бичих"</item>
+    <item msgid="6536865581421670942">"тохиргоог өөрчлөх"</item>
+    <item msgid="4547203129183558973">"дээр нь нээх"</item>
+    <item msgid="9080347512916542840">"мэдэгдэлд хандах"</item>
+    <item msgid="5332718516635907742">"камер"</item>
+    <item msgid="6098422447246167852">"аудио бичих"</item>
+    <item msgid="9182794235292595296">"аудио тоглуулах"</item>
+    <item msgid="8760743229597702019">"түр санах ойг унших"</item>
+    <item msgid="2266923698240538544">"түр санах ойг өөрчлөх"</item>
+    <item msgid="1801619438618539275">"медиа товч"</item>
+    <item msgid="31588119965784465">"аудио фокус"</item>
+    <item msgid="7565226799008076833">"үндсэн дууны хэмжээ"</item>
+    <item msgid="5420704980305018295">"хоолойн дууны хэмжээ"</item>
+    <item msgid="5797363115508970204">"хонхны дууны түвшин"</item>
+    <item msgid="8233154098550715999">"медиа дууны түвшин"</item>
+    <item msgid="5196715605078153950">"сэрүүлгийн дууны түвшин"</item>
+    <item msgid="394030698764284577">"мэдэгдлийн дууны хэмжээ"</item>
+    <item msgid="8952898972491680178">"блютүүтийн хэмжээ"</item>
+    <item msgid="8506227454543690851">"сэрүүн байлгах"</item>
+    <item msgid="1108160036049727420">"байршлыг хянах"</item>
+    <item msgid="1496205959751719491">"өндөр чадалтай байршлуудыг хянах"</item>
+    <item msgid="3776296279910987380">"ашиглалтын статистик авах"</item>
+    <item msgid="8827100324471975602">"Микрофон хаах/нээх"</item>
+    <item msgid="6880736730520126864">"toast харуулах"</item>
+    <item msgid="4933375960222609935">"төслийн медиа"</item>
+    <item msgid="8357907018938895462">"VPN идэвхжүүлэх"</item>
+    <item msgid="8143812849911310973">"ханын зураг бичих"</item>
+    <item msgid="6266277260961066535">"бүтцийг өөрчлөх"</item>
+    <item msgid="7715498149883482300">"дэлгэцийн агшинг өөрчлөх"</item>
+    <item msgid="4046679376726313293">"гар утасны төлөвийг унших"</item>
+    <item msgid="6329507266039719587">"дуут шуудан нэмэх"</item>
+    <item msgid="7692440726415391408">"sip ашиглах"</item>
+    <item msgid="8572453398128326267">"залгах дуудлагыг боловсруулах"</item>
+    <item msgid="7775674394089376306">"хурууны хээ"</item>
+    <item msgid="3182815133441738779">"биеийн мэдрэгч"</item>
+    <item msgid="2793100005496829513">"үүрэн нэвтрүүлгийг унших"</item>
+    <item msgid="2633626056029384366">"хуурамч байршил"</item>
+    <item msgid="8356842191824684631">"санах ойг унших"</item>
+    <item msgid="5671906070163291500">"санах ойг бичих"</item>
+    <item msgid="2791955098549340418">"дэлгэцийг асаах"</item>
+    <item msgid="5599435119609178367">"бүртгэл авах"</item>
+    <item msgid="1165623660533024666">"дэвсгэрт ажиллуулах"</item>
+    <item msgid="6423861043647911030">"хүртээмжийн дууны түвшин"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Богино"</item>
+    <item msgid="4816511817309094890">"Дунд"</item>
+    <item msgid="8305084671259331134">"Урт"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Өгөгдмөл"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Маш жижиг"</item>
+    <item msgid="5091603983404027034">"Жижиг"</item>
+    <item msgid="176844712416932112">"Энгийн"</item>
+    <item msgid="2784236342175159295">"Том"</item>
+    <item msgid="218913203203160606">"Маш том"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Өгөгдмөл"</item>
+    <item msgid="6488643537808152001">"Байхгүй"</item>
+    <item msgid="552332815156010137">"Гадна хүрээ"</item>
+    <item msgid="7187891159463789272">"Сүүдэр тусгах"</item>
+    <item msgid="8019330250538856521">"Товгор"</item>
+    <item msgid="8987385315647049787">"Ухмал"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Апп-н үндсэнийг ашиглах"</item>
+    <item msgid="8611890312638868524">"Хар дээр цагаан"</item>
+    <item msgid="5891360837786277638">"Цагаан дээр хар"</item>
+    <item msgid="2798457065945456853">"Хар дээр шар"</item>
+    <item msgid="5799049811524553967">"Цэнхэр дээр шар"</item>
+    <item msgid="3673930830658169860">"Тусгай"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"Урьдчилан хуваалцсан L2TP/IPSec VPN түлхүүртэй"</item>
+    <item msgid="6128519070545038358">"Сертификаттай L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"Урьдчилан хуваалцсан түлхүүртэй IPSec VPN болон Xauth гэрчлэлт"</item>
+    <item msgid="3319427315593649917">"Сертификат болон Xauth гэрчлэл бүхий IPSec VPN"</item>
+    <item msgid="8258927774145391041">"Сертификат болон холимог гэрчлэл бүхий IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Хоосон"</item>
+    <item msgid="1157046369795346308">"Гар ажиллагаатай"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Салгагдсан"</item>
+    <item msgid="8754480102834556765">"Эхлүүлж байна…"</item>
+    <item msgid="3351334355574270250">"Холбогдож байна..."</item>
+    <item msgid="8303882153995748352">"Холбогдсон"</item>
+    <item msgid="9135049670787351881">"Завсарлага"</item>
+    <item msgid="2124868417182583926">"Амжилтгүй"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Асуух"</item>
+    <item msgid="7718817231348607934">"Хэзээ ч зөвшөөрөхгүй"</item>
+    <item msgid="8184570120217958741">"Байнга зөвшөөрөх"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Тогтвортой"</item>
+    <item msgid="167418068739176448">"Топ үйлдэл"</item>
+    <item msgid="4760813290195199773">"Чухал (ил)"</item>
+    <item msgid="2328684826817647595">"Чухал (далд)"</item>
+    <item msgid="7746406490652867365">"Нөөцлөх"</item>
+    <item msgid="5597404364389196754">"Хүнд жинтэй"</item>
+    <item msgid="1290888779300174556">"Үйлчилгээ (ажиллаж байгаа)"</item>
+    <item msgid="7241098542073939046">"Үйлчилгээ (дахин ачааллалт)"</item>
+    <item msgid="6610439017684111046">"Хүлээн авагч"</item>
+    <item msgid="7367606086319921117">"Нүүр"</item>
+    <item msgid="3344660712396741826">"Сүүлийн үйлдэл"</item>
+    <item msgid="5006559348883303865">"Кеш хийгдсэн (үйлдэл)"</item>
+    <item msgid="8633480732468137525">"Кеш хийгдсэн (үйлдэлийн клиент)"</item>
+    <item msgid="6248998242443333892">"Кеш хийгдсэн (хоосон)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Усан цэнхэр"</item>
+    <item msgid="3228505970082457852">"Цэнхэр"</item>
+    <item msgid="6590260735734795647">"Индиго"</item>
+    <item msgid="3521763377357218577">"Ягаан"</item>
+    <item msgid="5932337981182999919">"Ягаан"</item>
+    <item msgid="5642914536624000094">"Улаан"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 гаруй хоног хадгална"</item>
+    <item msgid="8699273238891265610">"60 гаруй хоног хадгална"</item>
+    <item msgid="8346279419423837266">"90 гаруй хоног хадгална"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Автоматаар илрүүлэх"</item>
+    <item msgid="773943026484148895">"Хязгаартайгаар тохируулах"</item>
+    <item msgid="1008268820118852416">"Хязгааргүйгээр тохируулах"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Санамсаргүй үүссэн MAC-г ашиглах (өгөгдмөл)"</item>
+    <item msgid="214234417308375326">"Төхөөрөмжийн MAC-г ашиглах"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Үгүй"</item>
+    <item msgid="1930581185557754880">"Тийм"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Бараан"</item>
+    <item msgid="5079453644557603349">"Цайвар"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Идэвхгүй"</item>
+    <item msgid="4072198137051566919">"Дебаг хийх"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Зөвхөн гэр"</item>
+    <item msgid="1161026694891024702">"Автомат"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA нь давуу эрхтэй"</item>
+    <item msgid="7581481130337402578">"Зөвхөн GSM"</item>
+    <item msgid="8579197487913425819">"Зөвхөн WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA автомат"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo автомат"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"Зөвхөн EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Глобал"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"Зөвхөн TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Глобал"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mn/strings.xml b/tests/CarDeveloperOptions/res/values-mn/strings.xml
index a766f59..6fa3996 100644
--- a/tests/CarDeveloperOptions/res/values-mn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mn/strings.xml
@@ -106,7 +106,7 @@
     <string name="bluetooth_profile_details" msgid="1785505059738682493">"Профайлын тохиргоо"</string>
     <string name="bluetooth_name_not_set" msgid="1886067683138385142">"Нэр тохируулаагүй, бүртгэлийн нэрийг ашиглаж байна"</string>
     <string name="bluetooth_scan_for_devices" msgid="3215740768422735880">"Төхөөрөмжүүдийг скан хийх"</string>
-    <string name="bluetooth_rename_device" msgid="7862992396452800566">"Энэ төхөөрөмжийг дахин нэрлэх"</string>
+    <string name="bluetooth_rename_device" msgid="7862992396452800566">"Энэ төхөөрөмжийн нэрийг өөрчлөх"</string>
     <string name="bluetooth_rename_button" msgid="8946904845821073267">"Нэр солих"</string>
     <string name="bluetooth_disconnect_title" msgid="2689706557852333780">"Төхөөрөмжийг салгах уу?"</string>
     <string name="bluetooth_disconnect_all_profiles" product="default" msgid="8920448151607060442">"Таны утас <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-с сална."</string>
@@ -426,7 +426,7 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"Аппад нотолгоожуулах үед үргэлж баталгаажуулалт шаардах"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"Царайны өгөгдлийг хасах"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"Та царайгаа төхөөрөмжийн түгжээ тайлах болон аппад нэвтрэхэд ашиглах боломжтой. "<annotation id="url">"Нэмэлт мэдээлэл авах"</annotation></string>
-    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Царайн өгөгдлийг устгах уу?"</string>
+    <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"Царайны өгөгдлийг устгах уу?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"Царайгаар тайлах онцлогоор бичсэн өгөгдлийг бүрмөсөн, аюулгүйгээр устгана. Та үүнийг устгасны дараа утасныхаа түгжээг тайлах, аппуудад нэвтрэх болон төлбөрийг баталгаажуулахын тулд ПИН, хээ эсвэл нууц үгээ оруулах шаардлагатай болно."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"Хурууны хээ"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"Хурууны хээ удирдах"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Таблетаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн та царайн нотолгоог тохируулахын тулд дэлгэцийн түгжээг сонгох шаардлагатай. Цуцлах гэснийг товшоод ПИН-г тохируулах эсвэл дэлгэцийн өөр түгжээ сонгоно уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Төхөөрөмжөө дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн та царайн нотолгоог тохируулахын тулд дэлгэцийн түгжээг сонгох шаардлагатай. Цуцлах гэснийг товшоод ПИН-г тохируулах эсвэл дэлгэцийн өөр түгжээ сонгоно уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Утсаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн та царайн нотолгоог тохируулахын тулд дэлгэцийн түгжээг сонгох шаардлагатай. Цуцлах гэснийг товшоод ПИН-г тохируулах эсвэл дэлгэцийн өөр түгжээ сонгоно уу."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ПИН-н тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Нууц үгийн тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Хээний тохируулгыг алгасах уу?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Дэлгэцийн түгжээ тохируулах"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобайл"</item>
+    <item msgid="6007360612667098926">"Зөвхөн Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1421,7 +1423,7 @@
     <string name="usb_midi_title" msgid="8626512517313340943">"MIDI"</string>
     <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI-г идэвхжүүлсэн програмуудыг өөрийн компьютер дээрх MIDI програм хангамжийг USB дээр ажиллуулах."</string>
     <string name="storage_other_users" msgid="1055693465220962928">"Бусад хэрэглэгчид"</string>
-    <string name="storage_internal_title" msgid="7969898703086593200">"Төхөөрөмжийн санах ой"</string>
+    <string name="storage_internal_title" msgid="7969898703086593200">"Төхөөрөмжийн хадгалах сан"</string>
     <string name="storage_external_title" msgid="3308178326521953306">"Зөөврийн санах ой"</string>
     <string name="storage_volume_summary" msgid="3938298080954984809">"<xliff:g id="TOTAL">%2$s</xliff:g>-ын <xliff:g id="USED">%1$s</xliff:g>-г ашигласан"</string>
     <string name="storage_size_large" msgid="2252229139037320440">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
@@ -2078,7 +2080,7 @@
     <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"Үйлдэл хийх хугацаа"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"Та унших шаардлагатай хэдий ч зөвхөн түр хугацаанд харагддаг мессежийг хэр удаан харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг зурвасыг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Хүрэх &amp; барих хүлээлт"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"Хүрээд &amp; барьж хүлээх"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"Өнгө урвуулалт"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"Үзүүлбэрт нөлөөлж болзошгүй"</string>
     <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"Тодорхой хугацаа"</string>
@@ -2265,10 +2267,10 @@
     <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"Таблет батарейг цаана энгийн байдлаар ашигладаг"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"Төхөөрөмж батарейг цаана энгийн байдлаар ашигладаг"</string>
     <string name="battery_tip_low_battery_title" msgid="6784043681672161175">"Бага батерейны багтаамж"</string>
-    <string name="battery_tip_low_battery_summary" msgid="9151355911381188604">"Батерейны амь бага байна"</string>
-    <string name="battery_tip_smart_battery_title" product="default" msgid="5517122075918038665">"Утасныхаа батерейны амийг сайжруулах"</string>
-    <string name="battery_tip_smart_battery_title" product="tablet" msgid="203494973250969040">"Таблетынхаа батерейны амийг сайжруулах"</string>
-    <string name="battery_tip_smart_battery_title" product="device" msgid="7419448992583346364">"Төхөөрөмжийнхөө батерейны амийг сайжруулах"</string>
+    <string name="battery_tip_low_battery_summary" msgid="9151355911381188604">"Батарейн ажиллах хугацаа бага байна"</string>
+    <string name="battery_tip_smart_battery_title" product="default" msgid="5517122075918038665">"Утасныхаа батарейн ажиллах хугацааг нэмэгдүүлэх"</string>
+    <string name="battery_tip_smart_battery_title" product="tablet" msgid="203494973250969040">"Таблетынхаа батарейн ажиллах хугацааг нэмэгдүүлэх"</string>
+    <string name="battery_tip_smart_battery_title" product="device" msgid="7419448992583346364">"Төхөөрөмжийнхөө батарейн ажиллах хугацааг нэмэгдүүлэх"</string>
     <string name="battery_tip_smart_battery_summary" msgid="5344821856478265778">"Батерейны менежерийг асаах"</string>
     <string name="battery_tip_early_heads_up_title" msgid="707163785378746813">"Тэжээл хэмнэгчийг асаах"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="4231489566422395156">"Батерей ердийнхөөс хурдан дуусаж болзошгүй"</string>
@@ -2621,7 +2623,7 @@
     <string name="header_account_settings" msgid="8586173964125512219">"Акаунтын тохиргоо"</string>
     <string name="remove_account_label" msgid="5885425720323823387">"Бүртгэлийг хасах"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Бүртгэл нэмэх"</string>
-    <string name="really_remove_account_title" msgid="4166512362915154319">"Акаунтыг арилгах уу?"</string>
+    <string name="really_remove_account_title" msgid="4166512362915154319">"Бүртгэлийг арилгах уу?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Энэ акаунтыг арилгаснаас үүний бүх зурвас, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
     <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Энэ акаунтыг арилгаснаар үүний бүх зурвас, харилцагчид, бусад өгөгдлүүдийг утаснаас устгах болно!"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Энэ бүртгэлийг устгаснаар үүний бүх зурвас, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
@@ -3621,7 +3623,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> нэмэлт зөвшөөрөл</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"Зөвшөөрөл олгоогүй байна"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Зөвшөөрөл шаардлаггүй"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"Ямар ч зөвшөөрөл хүсээгүй байна"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"Бүх апп-ууд"</string>
     <string name="filter_enabled_apps" msgid="5888459261768538489">"Суулгасан апп"</string>
     <string name="filter_instant_apps" msgid="8087483282854072366">"Шуурхай апп"</string>
@@ -4270,6 +4272,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Энэ нь энэ утсыг удаашруулна"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Бүтэн GNSS хэмжилтийг хүчлэх"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Бүх GNSS орд болон давтамжийг давтамжийн түвшингүйгээр шинжлэх"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Хэрэглэгчийг сэлгэхэд дебаг хийх"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Хэрэглэгчийг сэлгэх явцад дэлгэрэнгүй мэдээлэл харуулах"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Арын үйл ажиллагааг эхлүүлэхийг зөвшөөрөх"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Арын бүх үйл ажиллагааг эхлүүлэхийг зөвшөөрдөг"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Гэмтлийн харилцах цонхыг тогтмол харуулах"</string>
@@ -4308,9 +4312,9 @@
     <string name="media_output_summary_unavailable" msgid="6629338032551086053">"Боломжгүй"</string>
     <string name="take_call_on_title" msgid="6570776899869030724">"Дуудлага авах"</string>
     <string name="cannot_change_apn_toast" msgid="5405823369239466817">"Энэ APN-г өөрчлөх боломжгүй."</string>
-    <string name="battery_suggestion_title" product="tablet" msgid="10172199242166440">"Таблетын батерейны амийг сайжруулах"</string>
-    <string name="battery_suggestion_title" product="device" msgid="765005476863631528">"Төхөөрөмжийн батерейны амийг сайжруулах"</string>
-    <string name="battery_suggestion_title" product="default" msgid="3295786171830183688">"Утасны батерейны амийг сайжруулах"</string>
+    <string name="battery_suggestion_title" product="tablet" msgid="10172199242166440">"Таблетын батарейн ажиллах хугацааг нэмэгдүүлэх"</string>
+    <string name="battery_suggestion_title" product="device" msgid="765005476863631528">"Төхөөрөмжийн батарейн ажиллах хугацааг нэмэгдүүлэх"</string>
+    <string name="battery_suggestion_title" product="default" msgid="3295786171830183688">"Утасны батарейн ажиллах хугацааг нэмэгдүүлэх"</string>
     <string name="battery_suggestion_summary" msgid="2669070349482656490"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="4173494225145223638">"Хонх дуугаргахаас сэргийлэх"</string>
     <string name="gesture_prevent_ringing_title" msgid="8827963588425673557">"Асаах &amp; Дууны түвшинг нэмэх товчлуурыг зэрэг дарж"</string>
diff --git a/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml
new file mode 100644
index 0000000..528e53c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mr-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ॲप्लिकेशन व्‍यवस्‍थापित करा"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mr/arrays.xml b/tests/CarDeveloperOptions/res/values-mr/arrays.xml
new file mode 100644
index 0000000..66a7810
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-mr/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"अमेरिका"</item>
+    <item msgid="4791956477275129121">"युरोप"</item>
+    <item msgid="3812126832016254559">"आफ्रिका"</item>
+    <item msgid="2765816300353408280">"आशिया"</item>
+    <item msgid="6683489385344409742">"ऑस्ट्रेलिया"</item>
+    <item msgid="5194868215515664953">"पॅसिफिक"</item>
+    <item msgid="7044520255415007865">"सर्व"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 सेकंद"</item>
+    <item msgid="772029947136115322">"३० सेकंद"</item>
+    <item msgid="8743663928349474087">"एक मिनिट"</item>
+    <item msgid="1506508631223164814">"दोन मिनिटे"</item>
+    <item msgid="8664703938127907662">"5 मिनिटे"</item>
+    <item msgid="5827960506924849753">"10 मिनिटे"</item>
+    <item msgid="6677424950124253938">"30 मिनिटे"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"तत्काळ"</item>
+    <item msgid="2038544972632026612">"5 सेकंद"</item>
+    <item msgid="5558060663472279597">"15 सेकंद"</item>
+    <item msgid="45341168505452037">"३० सेकंद"</item>
+    <item msgid="227647485917789272">"एक मिनिट"</item>
+    <item msgid="3367011891231217504">"दोन मिनिटे"</item>
+    <item msgid="4376575879222393045">"5 मिनिटे"</item>
+    <item msgid="811192536981678974">"10 मिनिटे"</item>
+    <item msgid="7258394417241706272">"30 मिनिटे"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"कनेक्ट केलेले आहे"</item>
+    <item msgid="983792611851499732">"आमंत्रित केले"</item>
+    <item msgid="5438273405428201793">"अयशस्वी"</item>
+    <item msgid="4646663015449312554">"उपलब्ध आहे"</item>
+    <item msgid="3230556734162006146">"परिक्षेत्राच्या बाहेर"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"दोन मिनिटे"</item>
+    <item msgid="2759776603549270587">"5 मिनिटे"</item>
+    <item msgid="167772676068860015">"एक तास"</item>
+    <item msgid="5985477119043628504">"कधीही टाइमआउट नाही"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"सिस्टम डिफॉल्ट वापरा: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"३"</item>
+    <item msgid="1644506614010085798">"४"</item>
+    <item msgid="3132506679404897150">"५"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"अंतिम 30 दिवस"</item>
+    <item msgid="3211287705232736964">"वापर चक्र सेट करा..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"वापर वेळ"</item>
+    <item msgid="2784401352592276015">"अंतिम वेळी वापरलेले"</item>
+    <item msgid="249854287216326349">"अ‍ॅप नाव"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"काहीही नाही"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"काहीही नाही"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"सिम"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"काहीही नाही"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"काहीही नाही"</item>
+    <item msgid="1464741437353223198">"व्यक्तिचलित"</item>
+    <item msgid="5793600062487886090">"प्रॉक्सी ऑटो-कॉन्फिग"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"काहीही नाही"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP किंवा CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"नमूद केले नाही"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"काहीही नाही"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"अंतर्गत डिव्हाइस स्टोरेज"</item>
+    <item msgid="3186681694079967527">"काढण्यायोग्य SD कार्ड"</item>
+    <item msgid="6902033473986647035">"सिस्टम ला ठरवू द्या"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"स्थान"</item>
+    <item msgid="6842381562497597649">"वैयक्तिक"</item>
+    <item msgid="3966700236695683444">"मेसेजिंग"</item>
+    <item msgid="8563996233342430477">"मीडिया"</item>
+    <item msgid="5323851085993963783">"डिव्हाइस"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"खडबडीत स्थान"</item>
+    <item msgid="1830619568689922920">"उत्कृष्ट स्थान"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"व्हायब्रेट होणे"</item>
+    <item msgid="8632513128515114092">"संपर्क वाचा"</item>
+    <item msgid="3741042113569620272">"संपर्क सुधारित करा"</item>
+    <item msgid="4204420969709009931">"कॉल लॉग वाचा"</item>
+    <item msgid="2260380357119423209">"कॉल लॉग सुधारित करा"</item>
+    <item msgid="6550710385014530934">"कॅलेंडर वाचा"</item>
+    <item msgid="3575906174264853951">"कॅलेंडर सुधारित करा"</item>
+    <item msgid="4319843242568057174">"वाय-फाय स्कॅन"</item>
+    <item msgid="2981791890467303819">"सूचना"</item>
+    <item msgid="6617825156152476692">"सेल स्कॅन"</item>
+    <item msgid="8865260890611559753">"फोनवर कॉल करा"</item>
+    <item msgid="3254999273961542982">"SMS वाचा"</item>
+    <item msgid="7711446453028825171">"SMS लिहा"</item>
+    <item msgid="6123238544099198034">"SMS प्राप्त करा"</item>
+    <item msgid="838342167431596036">"आणीबाणी SMS प्राप्त करा"</item>
+    <item msgid="8554432731560956686">"MMS प्राप्त करा"</item>
+    <item msgid="7464863464299515059">"WAP पुश प्राप्त करा"</item>
+    <item msgid="310463075729606765">"SMS पाठवा"</item>
+    <item msgid="7338021933527689514">"ICC SMS वाचा"</item>
+    <item msgid="6130369335466613036">"ICC SMS लिहा"</item>
+    <item msgid="6536865581421670942">"सेटिंग्ज सुधारित करा"</item>
+    <item msgid="4547203129183558973">"शीर्षस्थानी रेखांकित करा"</item>
+    <item msgid="9080347512916542840">"सूचना अ‍ॅक्सेस करा"</item>
+    <item msgid="5332718516635907742">"कॅमेरा"</item>
+    <item msgid="6098422447246167852">"ऑडिओ रेकॉर्ड करा"</item>
+    <item msgid="9182794235292595296">"ऑडिओ प्ले करा"</item>
+    <item msgid="8760743229597702019">"क्लिपबोर्ड वाचा"</item>
+    <item msgid="2266923698240538544">"क्लिपबोर्ड सुधारित करा"</item>
+    <item msgid="1801619438618539275">"मीडिया बटण"</item>
+    <item msgid="31588119965784465">"ऑडिओ फोकस"</item>
+    <item msgid="7565226799008076833">"प्रमुख व्हॉल्यूम"</item>
+    <item msgid="5420704980305018295">"व्हॉईस व्हॉल्यूम"</item>
+    <item msgid="5797363115508970204">"रिंग व्हॉल्यूम"</item>
+    <item msgid="8233154098550715999">"मीडिया व्हॉल्यूम"</item>
+    <item msgid="5196715605078153950">"अलार्म व्हॉल्यूम"</item>
+    <item msgid="394030698764284577">"सूचना व्हॉल्यूम"</item>
+    <item msgid="8952898972491680178">"ब्लूटूथ व्हॉल्यूम"</item>
+    <item msgid="8506227454543690851">"सक्रिय ठेवा"</item>
+    <item msgid="1108160036049727420">"स्थानाचे परीक्षण करा"</item>
+    <item msgid="1496205959751719491">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
+    <item msgid="3776296279910987380">"वापर आकडेवारी मिळवा"</item>
+    <item msgid="8827100324471975602">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
+    <item msgid="6880736730520126864">"टोस्ट दर्शवा"</item>
+    <item msgid="4933375960222609935">"प्रोजेक्‍ट मीडिया"</item>
+    <item msgid="8357907018938895462">"VPN सक्रिय करा"</item>
+    <item msgid="8143812849911310973">"लिहिण्याचा वॉलपेपर"</item>
+    <item msgid="6266277260961066535">"सहाय्य रचना"</item>
+    <item msgid="7715498149883482300">"सहाय्य स्क्रीनशॉट"</item>
+    <item msgid="4046679376726313293">"फोन स्थिती वाचा"</item>
+    <item msgid="6329507266039719587">"व्हॉइसमेल जोडा"</item>
+    <item msgid="7692440726415391408">"सिप वापरा"</item>
+    <item msgid="8572453398128326267">"केल्या जाणार्‍या कॉलवर प्रक्रिया करा"</item>
+    <item msgid="7775674394089376306">"फिंगरप्रिंट"</item>
+    <item msgid="3182815133441738779">"शरीर सेन्सर"</item>
+    <item msgid="2793100005496829513">"सेल ब्रॉडकास्ट वाचा"</item>
+    <item msgid="2633626056029384366">"बनावट स्थान"</item>
+    <item msgid="8356842191824684631">"वाचण्‍याचा स्टोरेज"</item>
+    <item msgid="5671906070163291500">"लिहिण्‍याचा स्टोरेज"</item>
+    <item msgid="2791955098549340418">"स्क्रीन चालू करा"</item>
+    <item msgid="5599435119609178367">"खाती मिळवा"</item>
+    <item msgid="1165623660533024666">"पार्श्वभूमीमध्ये चालवा"</item>
+    <item msgid="6423861043647911030">"प्रवेशयोग्यता आकारमान"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"लघु"</item>
+    <item msgid="4816511817309094890">"मध्‍यम"</item>
+    <item msgid="8305084671259331134">"दीर्घ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"डीफॉल्ट"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif संक्षिप्त"</item>
+    <item msgid="6529379119163117545">"Sans-serif मोनोस्पेस"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif मोनोस्पेस"</item>
+    <item msgid="4448481989108928248">"अनौपचारिक"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"डीफॉल्ट"</item>
+    <item msgid="6488643537808152001">"काहीही नाही"</item>
+    <item msgid="552332815156010137">"रुपरेषा"</item>
+    <item msgid="7187891159463789272">"ड्रॉप शॅडो"</item>
+    <item msgid="8019330250538856521">"उन्नत"</item>
+    <item msgid="8987385315647049787">"हताश"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"५०%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"१००%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"पूर्व-शेअर की सह L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"प्रमाणपत्रांसह L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"पूर्व-शेअर की आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
+    <item msgid="3319427315593649917">"प्रमाणपत्रे आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
+    <item msgid="8258927774145391041">"प्रमाणपत्रे आणि संकरित प्रमाणीकरणासह IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"काहीही नाही"</item>
+    <item msgid="1157046369795346308">"व्यक्तिचलित"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"विचारा"</item>
+    <item msgid="7718817231348607934">"कधीही अनुमती देऊ नका"</item>
+    <item msgid="8184570120217958741">"नेहमी अनुमती द्या"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"कायम"</item>
+    <item msgid="167418068739176448">"आघाडीच्या ॲक्टिव्हिटी"</item>
+    <item msgid="4760813290195199773">"महत्त्वाचे (अग्रभाग)"</item>
+    <item msgid="2328684826817647595">"महत्त्वाचे (पार्श्वभूमी)"</item>
+    <item msgid="7746406490652867365">"बॅकअप"</item>
+    <item msgid="5597404364389196754">"सरासरी वजनापेक्षा जास्त"</item>
+    <item msgid="1290888779300174556">"सेवा (चालत आहे)"</item>
+    <item msgid="7241098542073939046">"सेवा (रीस्टार्ट करत आहे)"</item>
+    <item msgid="6610439017684111046">"प्राप्तकर्ता"</item>
+    <item msgid="7367606086319921117">"होम"</item>
+    <item msgid="3344660712396741826">"शेवटच्या ॲक्टिव्हिटी"</item>
+    <item msgid="5006559348883303865">"कॅशे केलेली (ॲक्टिव्हिटी)"</item>
+    <item msgid="8633480732468137525">"कॅशे केलेला (ॲक्टिव्हिटी क्लायंट)"</item>
+    <item msgid="6248998242443333892">"कॅश   केलेला (रिक्त)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"हिरवट निळा"</item>
+    <item msgid="3228505970082457852">"निळा"</item>
+    <item msgid="6590260735734795647">"नीळ"</item>
+    <item msgid="3521763377357218577">"जांभळा"</item>
+    <item msgid="5932337981182999919">"गुलाबी"</item>
+    <item msgid="5642914536624000094">"लाल"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 दिवसांपेक्षा अधिक जुने"</item>
+    <item msgid="8699273238891265610">"60 दिवसांपेक्षा अधिक जुने"</item>
+    <item msgid="8346279419423837266">"90 दिवसांपेक्षा अधिक जुने"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"आपोआप शोधा"</item>
+    <item msgid="773943026484148895">"मर्यादित डेटा वापराचे नेटवर्क"</item>
+    <item msgid="1008268820118852416">"अमर्याद डेटा वापराचे नेटवर्क"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"रँडमाइझ केलेले MAC वापरा (डीफॉल्ट)"</item>
+    <item msgid="214234417308375326">"डिव्हाइस MAC वापरा"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"नाही"</item>
+    <item msgid="1930581185557754880">"होय"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"गडद"</item>
+    <item msgid="5079453644557603349">"फिकी"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"बंद"</item>
+    <item msgid="4072198137051566919">"डीबग करा"</item>
+    <item msgid="2473005316958868509">"शब्दबंबाळ"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"केवळ होम"</item>
+    <item msgid="1161026694891024702">"स्वयंचलित"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA प्राधान्यकृत"</item>
+    <item msgid="7581481130337402578">"केवळ GSM"</item>
+    <item msgid="8579197487913425819">"केवळ WCDMA"</item>
+    <item msgid="8465243227505412498">"आपोआप GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"आपोआप CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"केवळ EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"जागतिक"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"केवळ TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/सिम"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"जागतिक"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-mr/strings.xml b/tests/CarDeveloperOptions/res/values-mr/strings.xml
index f66473d..674ed48 100644
--- a/tests/CarDeveloperOptions/res/values-mr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mr/strings.xml
@@ -44,7 +44,7 @@
     <string name="dsds_dialog_confirm" msgid="4858826679303698086">"रीस्टार्ट"</string>
     <string name="dsds_dialog_cancel" msgid="5436928622826294809">"रद्द करा"</string>
     <string name="radio_info_radio_power" msgid="1377208736090161142">"मोबाइल रेडिओ पॉवर"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8833699138060620935">"सिम अॅड्रेस बुक पहा"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8833699138060620935">"सिम ॲड्रेस बुक पहा"</string>
     <string name="radioInfo_menu_viewFDN" msgid="617578481953919839">"निश्चित डायलिंग नंबर पहा"</string>
     <string name="radioInfo_menu_viewSDN" msgid="5723902253834152619">"सेवा डायलिंग नंबर पहा"</string>
     <string name="radioInfo_menu_getIMS" msgid="165918168050375324">"IMS सेवा स्थिती"</string>
@@ -208,7 +208,7 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"तुम्हाला पोर्ट फील्ड पूर्ण करण्‍याची आवश्यकता आहे"</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"होस्ट फील्ड रिक्त असल्यास पोर्ट फील्ड रिक्त असणे आवश्यक आहे."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"तुम्ही टाइप केलेला पोर्ट वैध नाही."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य अॅप्सद्वारे कदाचित वापरले जाणार नाही."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य ॲप्सद्वारे कदाचित वापरले जाणार नाही."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL बँडविड्थ (kbps):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL बँडविड्थ (kbps):"</string>
@@ -276,13 +276,13 @@
     <string name="dlg_remove_locales_message" msgid="5179370688876343176">"मजकूर दुसऱ्या भाषेत डिस्प्ले केला जाईल."</string>
     <string name="dlg_remove_locales_error_title" msgid="9090578326002163975">"सर्व भाषा काढू शकत नाही"</string>
     <string name="dlg_remove_locales_error_message" msgid="6799897638891903618">"किमान एक प्राधान्यीकृत भाषा ठेवा"</string>
-    <string name="locale_not_translated" msgid="7943669576006420058">"काही अॅपसमध्ये उपलब्ध होऊ शकत नाही"</string>
+    <string name="locale_not_translated" msgid="7943669576006420058">"काही ॲपसमध्ये उपलब्ध होऊ शकत नाही"</string>
     <string name="action_drag_label_move_up" msgid="2074064283966078352">"वर हलवा"</string>
     <string name="action_drag_label_move_down" msgid="1367989732445492291">"खाली हलवा"</string>
     <string name="action_drag_label_move_top" msgid="2033098833739345957">"शीर्षस्थानी हलवा"</string>
     <string name="action_drag_label_move_bottom" msgid="5583190721915611567">"तळाशी हलवा"</string>
     <string name="action_drag_label_remove" msgid="3362982836323040394">"भाषा काढा"</string>
-    <string name="activity_picker_label" msgid="3766230432501240226">"अॅक्टिव्हिटी निवडा"</string>
+    <string name="activity_picker_label" msgid="3766230432501240226">"ॲक्टिव्हिटी निवडा"</string>
     <string name="device_info_label" msgid="3595300783366015212">"डिव्हाइस माहिती"</string>
     <string name="display_label" msgid="7638908513729850802">"स्क्रीन"</string>
     <string name="phone_info_label" product="tablet" msgid="7700004946924618112">"टॅबलेट माहिती"</string>
@@ -402,9 +402,9 @@
     <string name="security_settings_face_enroll_introduction_cancel" msgid="4190924649721437238">"रद्द करा"</string>
     <string name="security_settings_face_enroll_introduction_title" msgid="6073249653318265486">"तुमच्या चेहऱ्यासह अनलॉक करा"</string>
     <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="9223270521083202896">"ऑथेंटिकेट करण्यासाठी तुमचा चेहरा वापरा"</string>
-    <string name="security_settings_face_enroll_introduction_message" msgid="484806903869220184">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी मान्यता देण्यासाठी किंवा अॅप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
+    <string name="security_settings_face_enroll_introduction_message" msgid="484806903869220184">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी मान्यता देण्यासाठी किंवा ॲप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
     <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="2850101281254663082">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचा चेहरा वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहरा वापरू शकत नाही. अधिक माहितीसाठी, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="security_settings_face_enroll_introduction_message_setup" msgid="4533297059466270074">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी परवानगी देण्यासाठी किंवा अॅप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
+    <string name="security_settings_face_enroll_introduction_message_setup" msgid="4533297059466270074">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी परवानगी देण्यासाठी किंवा ॲप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
     <string name="security_settings_face_enroll_introduction_footer_message" msgid="7764021721107723266"></string>
     <string name="security_settings_face_enroll_repeat_title" msgid="2507710348140837875">"तुमचा चेहरा वर्तुळाच्या मध्यभागी ठेवा"</string>
     <string name="security_settings_face_enroll_enrolling_skip" msgid="4346077260378772613">"हे नंतर करा"</string>
@@ -423,9 +423,9 @@
     <string name="security_settings_face_settings_require_attention" msgid="2755140150841557225">"अनलॉक करण्यासाठी डोळे उघडा"</string>
     <string name="security_settings_face_settings_require_attention_details" msgid="2557060433599942587">"चेहरा ऑथेंटिकेशन वापरताना, तुमचे डोळे उघडे असणे आवश्यक आहे"</string>
     <string name="security_settings_face_settings_require_confirmation" msgid="7312024271060416438">"नेहमी खात्री करणे आवश्यक आहे"</string>
-    <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"अॅपमध्ये ऑथेंटिकेशन करताना नेहमी खात्री करणे आवश्यक आहे"</string>
+    <string name="security_settings_face_settings_require_confirmation_details" msgid="8740564864091803429">"ॲपमध्ये ऑथेंटिकेशन करताना नेहमी खात्री करणे आवश्यक आहे"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"फेस डेटा काढून टाका"</string>
-    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"डिव्हाइस अनलॉक करण्यासाठी आणि अॅप्स करण्यासाठी तुम्ही तुमचा चेहेरा वापरू शकता. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
+    <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"डिव्हाइस अनलॉक करण्यासाठी आणि अ‍ॅप्स करण्यासाठी तुम्ही तुमचा चेहेरा वापरू शकता. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"फेस डेटा हटवायचा?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"फेस अनलॉकने रेकॉर्ड केलेला डेटा कायमचा आणि सुरक्षितपणे हटवला जाईल. काढल्यानंतर, तुमचा फोन अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंट निश्चित करण्यासाठी तुम्हाला तुमचा पिन, पॅटर्न किंवा पासवर्ड लागेल."</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"फिंगरप्रिंट"</string>
@@ -440,7 +440,7 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="3613424536269750172"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="889558002683900544">"फिंगरप्रिंटने अनलॉक करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7915504118657864429">"तुमचे फिंगरप्रिंट वापरा"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा अॅप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: तुमचे फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="5586198131986682472">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्‍यासाठी किंवा ॲप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही ज्यांचे फिंगरप्रिंट जोडता त्याविषयी सावधगिरी बाळगा. जोडलेला एक प्रिंट देखील यापैकी कोणतीही गोष्ट करू शकतो. \n\n टीप: तुमचे फिंगरप्रिंट क्लिष्ट पॅटर्न किंवा पिन पेक्षा कमी सुरक्षित असू शकतात."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1640839304679275468">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6734490666593320711">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमची फिंगरप्रिंट वापरा.\n\nटीप: क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="9168637333731599827">"रद्द करा"</string>
@@ -454,7 +454,7 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8395540117461339748">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा रीसेट केल्यास तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="7572334562915795226">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा टॅब्लेट हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"डिव्हाइस संरक्षण्‍ा वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना ते वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3819285334459763813">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हे डिव्हाइस हरवल्यास किंवा चोरी झाल्यास तुम्ही इतरांना ते वापरण्यापासून प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="5361573789585652826">"डिव्हाइस संरक्षण वैशिष्ट्ये सुरू होणार नाहीत. हा फोन हरवला किंवा चोरी झाला तर तुम्ही इतरांना तो वापरण्यापासून रोखू शकणार नाही."</string>
     <string name="skip_anyway_button_label" msgid="4437815969645175429">"तरीही वगळा"</string>
     <string name="go_back_button_label" msgid="7310586887969860472">"परत जा"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"तुमचा टॅबलेट स्क्रीन लॉक पर्यायाने संरक्षित करा जेणेकरून तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस ऑथेंटिकेशन सेट करण्यासाठी स्क्रीन लॉक पर्याय देखील आवश्यक आहे. रद्द करा वर टॅप करा, त्यानंतर एक पिन सेट करा किंवा दुसरा स्क्रीन लॉक पर्याय निवडा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"तुमचे डिव्हाइस स्क्रीन लॉक पर्यायाने संरक्षित करा जेणेकरून ते हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस ऑथेंटिकेशन सेट करण्यासाठी स्क्रीन लॉक पर्याय देखील आवश्यक आहे. रद्द करा वर टॅप करा, त्यानंतर एक पिन सेट करा किंवा दुसरा स्क्रीन लॉक पर्याय निवडा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"तुमचा फोन स्क्रीन लॉक पर्यायाने संरक्षित करा जेणेकरून तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस ऑथेंटिकेशन सेट करण्यासाठी स्क्रीन लॉक पर्याय देखील आवश्यक आहे. रद्द करा वर टॅप करा, त्यानंतर एक पिन सेट करा किंवा दुसरा स्क्रीन लॉक पर्याय निवडा."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"पिन सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"पासवर्ड सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"पॅटर्न सेट करणे वगळायचे का?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"स्क्रीन लॉक सेट करा"</string>
@@ -504,7 +503,7 @@
     <string name="fingerprint_delete_title" msgid="3120894112324235536">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' काढा"</string>
     <string name="fingerprint_delete_message" msgid="5895802741486967970">"तुम्हाला ही फिंगरप्रिंट हटवायची आहे का?"</string>
     <string name="fingerprint_last_delete_message" msgid="3346252479778971442">"तुम्ही तुमचे फिंगरप्रिंट तुमचा फोन अनलॉक करण्‍यासाठी, खरेदी प्रमाणित करण्‍यासाठी किंवा त्यांच्यासह अ‍ॅप्समध्ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"तुम्ही तुमचे फिंगरप्रिंट तुमचे कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="5385095150532247025">"तुम्ही तुमचे फिंगरप्रिंट तुमचे कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य ॲप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_confirm" msgid="7984595457589664004">"होय, काढा"</string>
     <string name="crypt_keeper_settings_title" msgid="839783588093862748">"एंक्रिप्शन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"टॅबलेट एंक्रिप्ट करा"</string>
@@ -551,9 +550,9 @@
     <string name="setup_lock_settings_picker_title" product="device" msgid="4739290104106645233">"तुमचे डिव्हाइस संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="3911582328576859628">"तुमचा फोन संरक्षित करा"</string>
     <string name="lock_settings_picker_biometrics_added_security_message" msgid="799453282539387294">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा"</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="7230799135599877804">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="7230799135599877804">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="2098404520816295371">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="2003984443953672040">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="1344567476145156885">"तुमची बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="lock_settings_picker_face_message" msgid="6413145626861812959">"तुमची बॅकअप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="setup_lock_settings_options_button_label" msgid="4197315143877977385">"स्क्रीन लॉक पर्याय"</string>
@@ -600,35 +599,35 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="1843950215687159135">"तुमच्या पॅटर्नशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8846957650251741548">"तुमच्या नमुन्याशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही."</string>
+</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह ॲप्समध्ये साइन इन करण्यास सक्षम राहणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="6760473271034592796">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="4384632309103635233">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="854665587186358170">"तुमच्या पासवर्डाशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="218143910981979545">"तुमच्या पासवर्डशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक करू शकणार नाही, खरेदींना अधिकृत करू शकणार नाही किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक करू शकणार नाही, खरेदींना अधिकृत करू शकणार नाही किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="3570135744390201244">"तुमच्या स्क्रीनलॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="5775815077478538855">"तुमच्या स्क्रीन लॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या डिव्हाइस मधून काढल्या जातील आणि तुम्ही तुमचा फोन अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="2369992898062808499">"आपल्या नमुन्याशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="8511105093090018735">"तुमच्या नमुन्याशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7114165651000498040">"आपल्या पिनशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="5118210431544156122">"तुमच्या पिनशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="3989497526180082037">"आपल्या संकेतशब्दाशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="8360485354164416198">"तुमच्या पासवर्डशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="4066001421137974082">"आपल्या स्क्रीनलॉक शिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1201259228331105948">"तुमच्या स्क्रीन लॉकशिवाय प्रोफाइल संरक्षण वैशिष्ट्ये काम करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून अॅप्समध्ये साइन इन करू शकणार नाही."</string>
+</xliff:g>तुमच्या सेव्ह केलेल्या फिंगरप्रिंट देखील या प्रोफाइलमधून काढल्या जातील आणि तुम्ही तुमची प्रोफाइल अनलॉक, खरेदींना अधिकृत किंवा त्या वापरून ॲप्समध्ये साइन इन करू शकणार नाही."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="2373890505202766456">"होय, काढा"</string>
     <string name="unlock_change_lock_pattern_title" msgid="7622476883851319877">"अनलॉक पॅटर्न बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="6671224158800812238">"अनलॉक पिन बदला"</string>
@@ -710,7 +709,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="450401426127674369">"रद्द करा"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="8474690922559443018">"पुढील"</string>
     <string name="lock_setup" msgid="8710689848703935088">"सेटअप पूर्ण झाले आहे"</string>
-    <string name="manage_device_admin" msgid="322047441168191695">"डिव्हाइस अ‍ॅडमिन अॅप्‍स"</string>
+    <string name="manage_device_admin" msgid="322047441168191695">"डिव्हाइस अ‍ॅडमिन ॲप्‍स"</string>
     <string name="number_of_device_admins_none" msgid="8519193548630223132">"सक्रिय अ‍ॅप्स नाहीत"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="6445613288828151224">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय अ‍ॅप्‍स</item>
@@ -753,7 +752,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="7900515495932064945">"या डिव्हाइसशी जोडायचे?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7395493311980018460">"फोन बुक शेअर करायचे?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="2103132762434487717">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपल्या संपर्कांवर आणि कॉल इतिहासावर प्रवेश करू इच्छित आहे."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर अॅक्सेस असेल."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="5513953935086446387">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर ॲक्सेस असेल."</string>
     <string name="bluetooth_preference_found_media_devices" msgid="5748539613567836379">"उपलब्ध डिव्हाइस"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="4190090666412408576">"कोणतेही डिव्हाइसेस उपलब्ध नाहीत"</string>
     <string name="bluetooth_device_context_connect" msgid="1812090541371432890">"कनेक्ट करा"</string>
@@ -765,7 +764,7 @@
     <string name="bluetooth_menu_advanced" msgid="7566858513372603652">"प्रगत"</string>
     <string name="bluetooth_advanced_titlebar" msgid="6459469494039004784">"प्रगत ब्लूटूथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6255367297830430459">"ब्लूटूथ चालू असते तेव्हा, तुमचे डिव्हाइस इतर जवळच्या ब्लूटूथ डिव्हाइस सह संवाद करु शकते."</string>
-    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्‍लूटूथ सुरू असताना, तुमचे डिव्‍हाइस इतर जवळपासच्‍या ब्‍लूटूथ डिव्‍हाइसशी संवाद साधू शकते.\n\nडिव्‍हाइस अनुभव सुधारण्‍यासाठी, अॅप्‍स आणि सेवा ब्‍लूटूथ सुरू असताना देखील, अजूनही जवळपासचे डिव्‍हाइस कधीही स्‍कॅन करू शकते. उदाहरणार्थ, याचा वापर स्‍थानावर आधारित वैशिष्‍ट्ये आणि सेवा सुधारण्‍यात केला जाऊ शकतो. तुम्‍ही हे "<annotation id="link">"स्‍कॅनिंग सेटिंग्‍ज"</annotation>" मध्‍ये जाऊन बदलू शकता."</string>
+    <string name="bluetooth_scanning_on_info_message" msgid="5460370815156050550">"ब्‍लूटूथ सुरू असताना, तुमचे डिव्‍हाइस इतर जवळपासच्‍या ब्‍लूटूथ डिव्‍हाइसशी संवाद साधू शकते.\n\nडिव्‍हाइस अनुभव सुधारण्‍यासाठी, ॲप्‍स आणि सेवा ब्‍लूटूथ सुरू असताना देखील, अजूनही जवळपासचे डिव्‍हाइस कधीही स्‍कॅन करू शकते. उदाहरणार्थ, याचा वापर स्‍थानावर आधारित वैशिष्‍ट्ये आणि सेवा सुधारण्‍यात केला जाऊ शकतो. तुम्‍ही हे "<annotation id="link">"स्‍कॅनिंग सेटिंग्‍ज"</annotation>" मध्‍ये जाऊन बदलू शकता."</string>
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टम अ‍ॅप्स आणि सेवा अद्याप ब्लूटूथ डिव्हाइस शोधू शकतात. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"कनेक्ट होऊ शकत नाही. पुन्हा प्रयत्न करा."</string>
     <string name="device_details_title" msgid="726517818032923222">"डिव्हाइस तपशील"</string>
@@ -779,7 +778,7 @@
     <string name="bluetooth_disconnect_a2dp_profile" msgid="8072503764470451567">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> मीडिया ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8384028101155317339">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> हँड्सफ्री ऑडिओवरून डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="6964226087090465662">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> इनपुट डिव्हाइसवरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट अॅक्सेस डिस्कनेक्ट केला जाईल."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="5523689915196343097">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट ॲक्सेस डिस्कनेक्ट केला जाईल."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="8145126793699232403">"या टॅबलेटचे इंटरनेट कनेक्शन शेअर केल्याने <xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="6040826983120279685">"या फोनचे इंटरनेट कनेक्शन शेअर केल्याने <xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट होईल."</string>
     <string name="bluetooth_device_advanced_title" msgid="5752155558126694036">"पेअर केलेले ब्लूटूथ डिव्हाइस"</string>
@@ -788,7 +787,7 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="1414487572426490659">"यासाठी वापरा"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="2270087843175307865">"पुनर्नामित करा"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8258863155491651198">"येणार्‍या फाईल स्थानांतरणांना अनुमती द्या"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"इंटरनेट अॅक्सेससाठी डिव्हाइसशी कनेक्ट केले"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="5934228955175911807">"इंटरनेट ॲक्सेससाठी डिव्हाइसशी कनेक्ट केले"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन शेअर करत आहे"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"डॉक सेटिंग्ज"</string>
     <string name="bluetooth_dock_settings_title" msgid="4444650787249778130">"ऑडिओसाठी डॉक वापरा"</string>
@@ -817,13 +816,13 @@
     <string name="rx_link_speed" msgid="3735337600274627581">"<xliff:g id="RECEIVE_LINK_SPEED">%1$d</xliff:g> Mbps"</string>
     <string name="wifi_ask_enable" msgid="925862998663619616">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय चालू करू इच्छित आहे"</string>
     <string name="wifi_ask_disable" msgid="2146839060110412974">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय बंद करू इच्छित आहे"</string>
-    <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"डीबग करण्यायोग्य अॅप्सच्या बाइटकोडची पडताळणी करा"</string>
-    <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"डीबग करण्यायोग्य अॅप्ससाठी बाइटकोडची पडताळणी करण्यासाठी ART ला अनुमती द्या"</string>
+    <string name="art_verifier_for_debuggable_title" msgid="5223835619409464642">"डीबग करण्यायोग्य ॲप्सच्या बाइटकोडची पडताळणी करा"</string>
+    <string name="art_verifier_for_debuggable_summary" msgid="2204242476996701111">"डीबग करण्यायोग्य ॲप्ससाठी बाइटकोडची पडताळणी करण्यासाठी ART ला अनुमती द्या"</string>
     <string name="nfc_quick_toggle_title" msgid="4990697912813795002">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="983451155092850657">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="7141056939052895142">"फोन दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="nfc_disclaimer_title" msgid="4860231267351602970">"NFC चालू करा"</string>
-    <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC हे डिव्हाइस आणि दुसरे जवळपासचे डिव्हाइस किंवा पेमेंट टर्मिनल, अॅक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
+    <string name="nfc_disclaimer_content" msgid="3066113577854565782">"NFC हे डिव्हाइस आणि दुसरे जवळपासचे डिव्हाइस किंवा पेमेंट टर्मिनल, ॲक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
     <string name="nfc_secure_settings_title" msgid="5153751163174916581">"NFC चे संरक्षण करा"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="7631183023440112192">"स्क्रीन अनलॉक केल्यावर NFC पेमेंट आणि फक्त परिवहन वापरासाठीला अनुमती द्या"</string>
     <string name="android_beam_settings_title" msgid="3083436415873738389">"Android बीम"</string>
@@ -860,7 +859,7 @@
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="1559329344492373028">"वापरण्‍यासाठी, नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1123080670578756834">"वापरण्‍यासाठी, सुसंगत नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="wifi_install_credentials" msgid="5650088113710858289">"प्रमाणपत्रे इंस्टॉल करा"</string>
-    <string name="wifi_scan_notify_text" msgid="7614101215028336927">"स्थान अचूकता सुधारण्यासाठी अॅप्स आणि सेवा वाय-फाय बंद असतानाही कधीही वाय-फाय नेटवर्क शोधण्यासाठी स्कॅन करू शकतात. स्थानाधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी हे वापरले जाऊ शकते. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
+    <string name="wifi_scan_notify_text" msgid="7614101215028336927">"स्थान अचूकता सुधारण्यासाठी अ‍ॅप्स आणि सेवा वाय-फाय बंद असतानाही कधीही वाय-फाय नेटवर्क शोधण्यासाठी स्कॅन करू शकतात. स्थानाधारित वैशिष्ट्ये आणि सेवांमध्ये सुधारणा करण्यासाठी हे वापरले जाऊ शकते. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये बदलू शकता."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="723796963816095410">"स्थान अचूकता वाढवण्यासाठी, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये वाय-फाय स्कॅनिंग चालू करा."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="1235445971400237444">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2120785188625932076">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
@@ -870,9 +869,9 @@
     <string name="wifi_suspend_optimizations" msgid="8826033336622472222">"वाय-फाय ऑप्टिमायझेशन"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="2375789014394339008">"वाय-फाय चालू असताना बॅटरी वापर कमी करा"</string>
     <string name="wifi_limit_optimizations_summary" msgid="1192849485764156570">"वाय-फाय द्वारे वापरलेल्या बॅटरीवर मर्यादा घाला"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"वाय-फायला इंटरनेट अॅक्सेस नसल्यास मोबाइल डेटावर स्विच करा."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"वाय-फायला इंटरनेट ॲक्सेस नसल्यास मोबाइल डेटावर स्विच करा."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="5067241930716252665">"मोबाइल डेटावर स्‍वयंचलितपणे स्विच करा"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"वाय-फायवरून इंटरनेट अॅक्सेस नसताना मोबाइल डेटा वापरा. डेटा वापर शुल्क लागू शकते."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"वाय-फायवरून इंटरनेट ॲक्सेस नसताना मोबाइल डेटा वापरा. डेटा वापर शुल्क लागू शकते."</string>
     <string name="wifi_add_network" msgid="4094957940791876640">"नेटवर्क जोडा"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"वाय-फाय प्राधान्ये"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"वाय-फाय आपोआप परत चालू होते"</string>
@@ -979,14 +978,14 @@
     <string name="wifi_wps_available_second_item" msgid="5703265526619705185">" (WPS उपलब्ध)"</string>
     <string name="wifi_carrier_connect" msgid="7202618367339982884">"वाहक वाय-फाय नेटवर्क"</string>
     <string name="wifi_carrier_content" msgid="3467402515071949783">"<xliff:g id="NAME">%1$s</xliff:g> ने कनेक्ट करा"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="7811846312032594248">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व ॲप्सना अनुमती द्यायची?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="556993843641750002">"हे बंद करण्यासाठी, ओव्हरफ्लो मेनू मधील प्रगत वर जा."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="8857664849515496237">"अनुमती द्या"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6190909841125369403">"नकार द्या"</string>
     <string name="wifi_hotspot_title" msgid="2631956539767069385">"कनेक्ट करण्यासाठी साइन इन करायचे?"</string>
     <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी तुम्ही नेटवर्कशी कनेक्ट करण्यापूर्वी तुम्हाला ऑनलाइन साइन करण्याची आवश्यकता आहे."</string>
     <string name="wifi_hotspot_connect" msgid="409079339360849653">"कनेक्ट करा"</string>
-    <string name="no_internet_access_text" msgid="7093326244145734504">"या नेटवर्कवर इंटरनेट अॅक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
+    <string name="no_internet_access_text" msgid="7093326244145734504">"या नेटवर्कवर इंटरनेट ॲक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"मर्यादित कनेक्टिव्हिटीमुळे कदाचित काही अ‍ॅप्स आणि सेवा काम करणार नाहीत. तरीही वापरायचे?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="lost_internet_access_title" msgid="1061916948695946130">"वाय-फाय इंटरनेटशी कनेक्ट केलेले नाही"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"वाय-फाय"</item>
+    <item msgid="4421333712484542489">"मोबाइल"</item>
+    <item msgid="6007360612667098926">"केवळ वाय-फाय"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1168,9 +1170,9 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"नैसर्गिक"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"बूस्ट केलेला"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"सॅच्युरेटेड"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"अॅडॅप्टिव्ह"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"ॲडॅप्टिव्ह"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"फक्त अचूक रंग वापरा"</string>
-    <string name="color_mode_summary_automatic" msgid="6066740785261330514">"उठावदार आणि अचूक रंगामध्ये अॅडजस्‍ट करा"</string>
+    <string name="color_mode_summary_automatic" msgid="6066740785261330514">"उठावदार आणि अचूक रंगामध्ये ॲडजस्‍ट करा"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा"</string>
     <string name="accelerometer_summary_on" product="default" msgid="6454733048264875491">"फोन फिरवताना ओरिएंटेशन आपोआप स्विच करा"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="2663240868158338608">"टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा"</string>
@@ -1178,7 +1180,7 @@
     <string name="brightness" msgid="7309120144111305275">"चकाकी स्तर"</string>
     <string name="brightness_title" msgid="5660190946911149690">"चकाकी"</string>
     <string name="brightness_summary" msgid="8687101964451818730">"स्क्रीनची चकाकी समायोजित करा"</string>
-    <string name="auto_brightness_title" msgid="908511534369820426">"अ‍ॅडाप्टिव्ह ब्राइटनेस"</string>
+    <string name="auto_brightness_title" msgid="908511534369820426">"अ‍ॅडॅप्टिव्ह ब्राइटनेस"</string>
     <string name="auto_brightness_summary_on" msgid="121488862610275737">"सुरू"</string>
     <string name="auto_brightness_summary_off" msgid="8569141123211510256">"बंद"</string>
     <string name="auto_brightness_summary_very_low" msgid="7625647285740629347">"प्राधान्य दिलेली उज्ज्वलता खूप कमी आहे"</string>
@@ -1196,7 +1198,7 @@
     <string name="auto_brightness_off_summary" msgid="6162650416289359104">"उपलब्ध प्रकाशासाठी समायोजित करू नका"</string>
     <string name="auto_brightness_very_high_summary" msgid="7202032980509583918">"वाढलेला बॅटरी वापर"</string>
     <string name="auto_brightness_disclaimer" msgid="5416696351199148809">"उपलब्ध प्रकाशासाठी उज्ज्वलता स्तर अनुकूल करा. हे वैशिष्ट्य चालू असताना, तुम्ही तरीही उज्ज्वलता तात्पुरती समायोजित करू शकता."</string>
-    <string name="auto_brightness_description" msgid="8209140379089535411">"तुमच्या स्क्रीनचा ब्राइटनेस तुमच्या वातावरण आणि अॅक्टिव्हिटीशी आपोआप अ‍ॅडजस्ट होईल. अ‍ॅडॅप्टिव्ह ब्राइटनेसला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर मॅन्युअली हलवू शकता."</string>
+    <string name="auto_brightness_description" msgid="8209140379089535411">"तुमच्या स्क्रीनचा ब्राइटनेस तुमच्या वातावरण आणि ॲक्टिव्हिटीशी आपोआप अ‍ॅडजस्ट होईल. अ‍ॅडॅप्टिव्ह ब्राइटनेसला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर मॅन्युअली हलवू शकता."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"व्हाइट बॅलन्स डिस्प्ले करा"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"स्क्रीन अवेअर"</string>
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"सुरू करा / तुम्ही स्क्रीनकडे पाहत असल्यास स्क्रीन बंद होणार नाही"</string>
@@ -1384,12 +1386,12 @@
     <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवते, जसे की संगीत आणि फोटो"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"SD कार्डवरील सर्व डेटा मिटवते, जसे की संगीत आणि फोटो"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"कॅश   केलेला डेटा साफ करायचा?"</string>
-    <string name="memory_clear_cache_message" msgid="6723120398411410031">"हे सर्व अॅप्ससाठी कॅश   केलेला डेटा साफ करेल."</string>
+    <string name="memory_clear_cache_message" msgid="6723120398411410031">"हे सर्व ॲप्ससाठी कॅश   केलेला डेटा साफ करेल."</string>
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP किंवा TP कार्य सक्रिय आहे"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"USB स्टोरेज अनमाउंट करायचे?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="4400426555375434431">"SD कार्ड अनमाउंट करायचे?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"USB स्टोरेज अनमाउंट केल्यास, तुम्ही वापरत असलेली काही अॅप्स थांबतील आणि तुम्ही USB स्टोरेज पुन्हा माउंट करेपर्यंत ती अनुपलब्ध असू शकतील."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"तुम्ही SD कार्ड अनमाउंट केल्यास, तुम्ही वापरत असलेले काही अॅप्स थांबतील आणि तुम्ही SD कार्ड पुन्हा माउंट करेपर्यंत अनुपलब्ध राहू शकतात."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"USB स्टोरेज अनमाउंट केल्यास, तुम्ही वापरत असलेली काही अ‍ॅप्स थांबतील आणि तुम्ही USB स्टोरेज पुन्हा माउंट करेपर्यंत ती अनुपलब्ध असू शकतील."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"तुम्ही SD कार्ड अनमाउंट केल्यास, तुम्ही वापरत असलेले काही अ‍ॅप्स थांबतील आणि तुम्ही SD कार्ड पुन्हा माउंट करेपर्यंत अनुपलब्ध राहू शकतात."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB स्टोरेज अनमाउंट करता आले नाही. नंतर पुन्हा प्रयत्न करा."</string>
@@ -1399,7 +1401,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"अनमाउंट करत आहे"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"अनमाउंट प्रगतीवर"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"संचयन स्थान संपत आहे"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"सिंक करणे यासारखी, काही सिस्टम कार्ये, योग्यरितीने कार्य करू शकत नाही. अ‍ॅप्स किंवा मीडिया सामग्री यासारखे, आयटम हटवून किंवा अनपिन करून स्थान मोकळे करण्याचा प्रयत्न करा."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"नाव बदला"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"माउंट करा"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"बाहेर काढा"</string>
@@ -1435,14 +1437,14 @@
     <string name="storage_format_failure" msgid="4383764964041410256">"<xliff:g id="NAME">%1$s</xliff:g> स्वरूपित करणे शक्य झाले नाही"</string>
     <string name="storage_rename_title" msgid="9117863170875961530">"संचयन पुनर्नामित करा"</string>
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"हे <xliff:g id="NAME_0">^1</xliff:g> सुरक्षितपणे बाहेर काढले आहे परंतु अद्याप उपलब्‍ध आहे. \n\nहे <xliff:g id="NAME_1">^1</xliff:g> वापरण्यासाठी, आपल्‍याला प्रथम ते माउंट करणे आवश्‍यक आहे."</string>
-    <string name="storage_dialog_unmountable" msgid="7082856306456936054">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आव्‍ाश्यक आहे."</string>
+    <string name="storage_dialog_unmountable" msgid="7082856306456936054">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आवश्यक आहे."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"हे डिव्हाइस या <xliff:g id="NAME_0">^1</xliff:g> चे सपोर्ट करत नाही. \n\nया डिव्‍हाइससह हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी आपल्‍याला प्रथम ते सेट करणे आवश्‍यक आहे."</string>
     <string name="storage_internal_format_details" msgid="2780806013122012384">"फॉर्मेट झाल्यानंतर, तुम्ही हे <xliff:g id="NAME_0">^1</xliff:g> इतर डिव्हाइसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>\n"या डिव्हाइस वरील पर्यायी स्टोरेजवर तुमच्या मीडिया फायली हलवा किंवा USB केबल वापरून त्या कॉंप्युटरवर ट्रान्सफर करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>\n" <xliff:g id="NAME_6">^1</xliff:g> वर स्टोअर केलेली सर्व अ‍ॅप्स अनइंस्टॉल केली जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डिव्हाइस वरील पर्यायी स्टोरेजवर हलवा."</string>
     <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"तुम्ही <xliff:g id="NAME_0">^1</xliff:g> हे बाहेर काढता तेव्‍हा, त्यावर स्टोअर केलेले अ‍ॅप्स कार्य करणे थांबवतील आणि ते पुन्हा घातले जाईपर्यंत त्यावर स्टोअर केलेल्‍या मीडिया फायली उपलब्ध असणार नाहीत."</b>" \n\nहे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसवर कार्य करण्‍यासाठी स्वरूपित केले आहे. ते इतर कशावरही कार्य करणार नाही."</string>
-    <string name="storage_internal_forget_details" msgid="5655856574682184453">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
+    <string name="storage_internal_forget_details" msgid="5655856574682184453">"अ‍ॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अ‍ॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
     <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"या <xliff:g id="NAME">^1</xliff:g> वर स्टोअर केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
-    <string name="storage_detail_apps" msgid="8154648512504196820">"अॅप्स"</string>
+    <string name="storage_detail_apps" msgid="8154648512504196820">"अ‍ॅप्स"</string>
     <string name="storage_detail_images" msgid="6996202225684468964">"इमेज"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"व्हिडिओ"</string>
     <string name="storage_detail_audio" msgid="6011098436589663944">"ऑडिओ"</string>
@@ -1450,9 +1452,9 @@
     <string name="storage_detail_other" msgid="9164851767437306618">"इतर"</string>
     <string name="storage_detail_system" msgid="6784247618772153283">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
-    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"इतर गोष्टींमध्ये अ‍ॅप्सवरून सेव्ह करून शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश असतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दिसणाराा अाशय पाहण्यासाठी, एक्सप्लोर करा वर टॅप करा."</string>
+    <string name="storage_detail_dialog_other" msgid="5073511663616043370">"इतर गोष्टींमध्ये अ‍ॅप्सवरून सेव्ह करून शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश असतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दिसणाराा आशय पाहण्यासाठी, एक्सप्लोर करा वर टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"सिस्टममध्ये Android व्हर्जन <xliff:g id="VERSION">%s</xliff:g> रन करण्यासाठी वापरल्या जाणाऱ्या फायलींचा समावेश आहे"</string>
-    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> स्टोरेज वापरणारे, सेव्ह केलेले फोटो, संगीत, अॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
+    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> स्टोरेज वापरणारे, सेव्ह केलेले फोटो, संगीत, अ‍ॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"तुमचे <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"पोर्टेबल संचयन म्हणून वापरा"</string>
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"डिव्‍हाइसेस मध्‍ये फोटो आणि इतर मीडिया हलविण्‍यासाठी."</string>
@@ -1486,10 +1488,10 @@
     <string name="storage_wizard_slow_body" msgid="2307974936036261069">"हे <xliff:g id="NAME_0">^1</xliff:g> धीमे असल्याचे दिसते. \n\nतुम्ही सुरु ठेवू शकता परंतु या स्थानावर हलविलेल्या अ‍ॅप्समध्‍ये अडथळा येऊ शकतो आणि डेटा स्थानांतरणास बराच वेळ लागू शकतो. \n\nअधिक चांगल्या कार्यप्रदर्शनासाठी आणखी जलद <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍याचा विचार करा."</string>
     <string name="storage_wizard_init_v2_title" msgid="7408910177547901960">"तुम्ही हे <xliff:g id="NAME">^1</xliff:g> कसे वापराल?"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="7948795312504302810">"अतिरिक्त टॅबलेट स्टोरेजसाठी वापरा"</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6237770506398410172">"फक्त या टॅबलेटवरील अॅप्स, फायली आणि मीडियासाठी"</string>
+    <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6237770506398410172">"फक्त या टॅबलेटवरील अ‍ॅप्स, फायली आणि मीडियासाठी"</string>
     <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="1016850267330050231">"टॅब्लेट स्टोरेज"</string>
     <string name="storage_wizard_init_v2_internal_title" product="default" msgid="2782907833711627804">"अतिरिक्त फोन स्टोरेजसाठी वापरा"</string>
-    <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="6352521760027924000">"फक्त या फोनवरील अॅप्स, फायली आणि मीडियासाठी"</string>
+    <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="6352521760027924000">"फक्त या फोनवरील अ‍ॅप्स, फायली आणि मीडियासाठी"</string>
     <string name="storage_wizard_init_v2_internal_action" product="default" msgid="3383888882755852046">"फोन स्टोरेज"</string>
     <string name="storage_wizard_init_v2_or" msgid="883906565226069620">"किंवा"</string>
     <string name="storage_wizard_init_v2_external_title" msgid="7009571510941803101">"पोर्टेबल स्टोरेजसाठी वापरा"</string>
@@ -1497,21 +1499,21 @@
     <string name="storage_wizard_init_v2_external_action" msgid="4649591913020218098">"पोर्टेबल स्टोरेज"</string>
     <string name="storage_wizard_init_v2_later" msgid="2605006907172213466">"नंतर सेट करा"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="1884699177320256159">"<xliff:g id="NAME">^1</xliff:g> हे फॉरमॅट करायचे का?"</string>
-    <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"अॅप्स, फाइल्स आणि मीडिया स्टोर करण्यासाठी <xliff:g id="NAME_0">^1</xliff:g> ला फॉरमॅट करणे आवश्यक आहे. \n\nफॉरमॅट केल्यामुळे <xliff:g id="NAME_1">^2</xliff:g> वरील विद्यमान डेटा मिटवला जाईल. आशय गमावणे टाळण्यासाठी, दुसऱ्या <xliff:g id="NAME_2">^3</xliff:g> वर किंवा डिव्हाइसवर त्याचा बॅकअप घ्या."</string>
+    <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"अ‍ॅप्स, फाइल्स आणि मीडिया स्टोर करण्यासाठी <xliff:g id="NAME_0">^1</xliff:g> ला फॉरमॅट करणे आवश्यक आहे. \n\nफॉरमॅट केल्यामुळे <xliff:g id="NAME_1">^2</xliff:g> वरील विद्यमान डेटा मिटवला जाईल. आशय गमावणे टाळण्यासाठी, दुसऱ्या <xliff:g id="NAME_2">^3</xliff:g> वर किंवा डिव्हाइसवर त्याचा बॅकअप घ्या."</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="5576917958786300415">"<xliff:g id="NAME">^1</xliff:g> फॉरमॅट करा"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="6728034411587320249">"<xliff:g id="NAME">^1</xliff:g> वर आशय हलवायचा का?"</string>
-    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="6943007011251294950">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अॅप्स हलवू शकता. \n\nहे तुमच्या टॅबलेटच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
-    <string name="storage_wizard_migrate_v2_body" product="default" msgid="3211214309775524554">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अॅप्स हलवू शकता. \n\nहे तुमच्या फोनच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
+    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="6943007011251294950">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अ‍ॅप्स हलवू शकता. \n\nहे तुमच्या टॅबलेटच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
+    <string name="storage_wizard_migrate_v2_body" product="default" msgid="3211214309775524554">"तुम्ही या <xliff:g id="NAME">^1</xliff:g> मध्ये फायली, मिडिया आणि विशिष्ट अ‍ॅप्स हलवू शकता. \n\nहे तुमच्या फोनच्या स्टोरेजमधून <xliff:g id="SIZE">^2</xliff:g> जागा मोकळी करेल आणि त्यासाठी अंदाजे <xliff:g id="DURATION">^3</xliff:g> कालावधी लागेल."</string>
     <string name="storage_wizard_migrate_v2_checklist" msgid="6283777617014793600">"हलविण्याच्या दरम्यान:"</string>
     <string name="storage_wizard_migrate_v2_checklist_media" msgid="4626548613088549096">"<xliff:g id="NAME">^1</xliff:g> काढून टाकू नका"</string>
-    <string name="storage_wizard_migrate_v2_checklist_apps" msgid="6041914027863793837">"काही अॅप्स काम करू शकणार नाहीत"</string>
+    <string name="storage_wizard_migrate_v2_checklist_apps" msgid="6041914027863793837">"काही अ‍ॅप्स काम करू शकणार नाहीत"</string>
     <string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="5086689918108465503">"हा टॅबलेट चार्ज करून ठेवा"</string>
     <string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="7801835366851130972">"हा फोन चार्ज करून ठेवा"</string>
     <string name="storage_wizard_migrate_v2_now" msgid="6818811520564682413">"आशय हलवा"</string>
     <string name="storage_wizard_migrate_v2_later" msgid="4909412563144649085">"आशय नंतर हलवा"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="1796255772658203586">"आशय हलवत आहे…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="4662009769135525740">"हळू <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"तुम्ही तरीही <xliff:g id="NAME_0">^1</xliff:g> वापरू शकता, परंतु ते हळू असू शकते. \n\nया <xliff:g id="NAME_1">^2</xliff:g> वर स्टोअर केलेली अॅप्स योग्यरित्या काम करू शकणार नाहीत आणि आशय ट्रांसफरसाठी जास्त वेळ लागू शकतो. \n\n जलद <xliff:g id="NAME_2">^3</xliff:g> वापरण्याचा प्रयत्न करा, किंवा त्याऐवजी पोर्टेबल स्टोरेजसाठी <xliff:g id="NAME_3">^4</xliff:g> वापरा."</string>
+    <string name="storage_wizard_slow_v2_body" msgid="4443996335261861797">"तुम्ही तरीही <xliff:g id="NAME_0">^1</xliff:g> वापरू शकता, परंतु ते हळू असू शकते. \n\nया <xliff:g id="NAME_1">^2</xliff:g> वर स्टोअर केलेली अ‍ॅप्स योग्यरित्या काम करू शकणार नाहीत आणि आशय ट्रांसफरसाठी जास्त वेळ लागू शकतो. \n\n जलद <xliff:g id="NAME_2">^3</xliff:g> वापरण्याचा प्रयत्न करा, किंवा त्याऐवजी पोर्टेबल स्टोरेजसाठी <xliff:g id="NAME_3">^4</xliff:g> वापरा."</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1686964124972424100">"पुन्हा सुरू करा"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="2320238517431613392">"सुरु ठेवा"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="5803422587027895664">"तुम्‍ही <xliff:g id="NAME">^1</xliff:g> मध्‍ये आशय हलवू शकता"</string>
@@ -1563,7 +1565,7 @@
     <string name="menu_restore" msgid="3799288817317293115">"डीफॉल्टवर रीसेट करा"</string>
     <string name="restore_default_apn_completed" msgid="5671734152740058937">"डीफॉल्ट APN सेटिंग्ज रीसेट करणे पूर्ण झाले."</string>
     <string name="reset_dashboard_title" msgid="7084966342252178530">"रीसेट पर्याय"</string>
-    <string name="reset_dashboard_summary" msgid="8778383341461126642">"नेटवर्क, अॅप्स आणि डिव्हाइस रीसेट केले जाऊ शकतात"</string>
+    <string name="reset_dashboard_summary" msgid="8778383341461126642">"नेटवर्क, अ‍ॅप्स आणि डिव्हाइस रीसेट केले जाऊ शकतात"</string>
     <string name="reset_network_title" msgid="8944059136930806211">"वायफाय मोबाइल आणि ब्लूटूथ रीसेट करा"</string>
     <string name="reset_network_desc" msgid="4982633363916261109">"हे यांसह सर्व नेटवर्क सेटिंग्‍ज रीसेट करेल:\n\n"<li>"वाय‑फाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
     <string name="reset_esim_title" msgid="7630781767040831893">"डाउनलोड केलेली सिम मिटवा"</string>
@@ -1579,7 +1581,7 @@
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"डाउनलोड केलेली सिम एका एररमुळे मिटवता येत नाहीत.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="master_clear_title" msgid="1560712943955904673">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि ॲप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="3432884235445405376">\n\n"तुम्ही खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5993259656117566767">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
@@ -1650,7 +1652,7 @@
     </plurals>
     <string name="location_category_recent_location_access" msgid="286059523360285026">"अलीकडील स्थान अ‍ॅक्सेस"</string>
     <string name="location_recent_location_access_view_details" msgid="2051602261436245905">"तपशील पहा"</string>
-    <string name="location_no_recent_apps" msgid="77502059586413278">"अलीकडे कोणत्याही अॅप्सने स्थानाची विनंती केलेली नाही"</string>
+    <string name="location_no_recent_apps" msgid="77502059586413278">"अलीकडे कोणत्याही ॲप्सने स्थानाची विनंती केलेली नाही"</string>
     <string name="location_no_recent_accesses" msgid="6289916310397279890">"अलीकडे अ‍ॅक्सेस केलेल्या अ‍ॅप्सचे स्थान नाही"</string>
     <string name="location_high_battery_use" msgid="7177199869979522663">"उच्च बॅटरी वापर"</string>
     <string name="location_low_battery_use" msgid="5030448574501435888">"अल्प बॅटरी वापर"</string>
@@ -1661,18 +1663,18 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"ऑफिससाठीच्या स्थान सेवा"</string>
     <string name="location_network_based" msgid="1535812159327454835">"वाय-फाय आणि मोबाईल नेटवर्क स्थान"</string>
-    <string name="location_neighborhood_level" msgid="8459352741296587916">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
+    <string name="location_neighborhood_level" msgid="8459352741296587916">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी ॲप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS उपग्रह"</string>
-    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"तुमचे स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर अॅप्सना GPS वापरु द्या"</string>
-    <string name="location_street_level" product="default" msgid="7407688345675450051">"तुमचे स्थान सूचित करण्यासाठी आपल्या फोनवर अॅप्सना GPS वापरु द्या"</string>
+    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"तुमचे स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर ॲप्सना GPS वापरु द्या"</string>
+    <string name="location_street_level" product="default" msgid="7407688345675450051">"तुमचे स्थान सूचित करण्यासाठी आपल्या फोनवर ॲप्सना GPS वापरु द्या"</string>
     <string name="assisted_gps" msgid="5411780261117055175">"साहाय्यक GPS वापरा"</string>
     <string name="assisted_gps_enabled" msgid="2561022181775725369">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
     <string name="assisted_gps_disabled" msgid="6448758788217415937">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (GPS कामगिरी सुधारण्यासाठी अनचेक करा)"</string>
     <string name="use_location_title" msgid="7724788634359496634">"स्थान आणि Google शोध"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"Google ला शोध परिणाम आणि अन्य सेवा सुधारण्यासाठी तुमचे स्थान वापरू द्या"</string>
-    <string name="location_access_title" msgid="8587974819606800029">"माझी स्थाने अॅक्सेस करा"</string>
-    <string name="location_access_summary" msgid="6919495149026354355">"तुमची परवानगी विचारणार्‍या अॅप्सना तुमची स्थान माहिती वापरु द्या"</string>
+    <string name="location_access_title" msgid="8587974819606800029">"माझी स्थाने ॲक्सेस करा"</string>
+    <string name="location_access_summary" msgid="6919495149026354355">"तुमची परवानगी विचारणार्‍या ॲप्सना तुमची स्थान माहिती वापरु द्या"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"स्थान स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"टॅबलेट विषयी"</string>
     <string name="about_settings" product="default" msgid="6019547763377294261">"फोन विषयी"</string>
@@ -1767,7 +1769,7 @@
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"अनलॉक पॅटर्न बदला"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"अनलॉक पॅटर्न कसा काढावा"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="3043127997770535921">"खूप चुकीचे प्रयत्न. <xliff:g id="NUMBER">%d</xliff:g> सेकंदांमध्‍ये पुन्हा प्रयत्न करा."</string>
-    <string name="activity_not_found" msgid="3492413375341165453">"अॅप्लिकेशन आपल्या फोनवर इंस्टॉल केलेला नाही."</string>
+    <string name="activity_not_found" msgid="3492413375341165453">"ॲप्लिकेशन आपल्या फोनवर इंस्टॉल केलेला नाही."</string>
     <string name="lock_settings_profile_title" msgid="3928992050074556160">"कार्य प्रोफाइल सुरक्षा"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="285267471459162203">"कार्य प्रोफाईल स्क्रीन लॉक"</string>
     <string name="lock_settings_profile_unification_title" msgid="2629698644191935287">"एक लॉक वापरा"</string>
@@ -1779,9 +1781,9 @@
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8046452284593057185">"एक लॉक वापरा"</string>
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"डिव्हाइस स्क्रीन लॉक सारखेच"</string>
     <string name="manageapplications_settings_title" msgid="6876782217962262376">"अ‍ॅप्स व्यवस्थापित करा"</string>
-    <string name="manageapplications_settings_summary" msgid="5092964799412478962">"इंस्टॉल अॅप्स व्यवस्थापित करा आणि काढा"</string>
+    <string name="manageapplications_settings_summary" msgid="5092964799412478962">"इंस्टॉल अ‍ॅप्स व्यवस्थापित करा आणि काढा"</string>
     <string name="applications_settings" msgid="368331725658793179">"अ‍ॅप माहिती"</string>
-    <string name="applications_settings_summary" msgid="8888258399577123906">"अॅप्स व्यवस्थापित करा, द्रुत लाँच शॉर्टकट सेट करा"</string>
+    <string name="applications_settings_summary" msgid="8888258399577123906">"अ‍ॅप्स व्यवस्थापित करा, द्रुत लाँच शॉर्टकट सेट करा"</string>
     <string name="applications_settings_header" msgid="3766501606045211098">"अ‍ॅप सेटिंग्ज"</string>
     <string name="install_applications" msgid="7745902974984889179">"अज्ञात स्रोत"</string>
     <string name="install_applications_title" msgid="8164828577588659496">"सर्व अ‍ॅप स्त्रोतांना अनुमती द्या"</string>
@@ -1822,10 +1824,10 @@
     <string name="clear_user_data_text" msgid="8894073247302821764">"स्‍टोरेज साफ करा"</string>
     <string name="app_factory_reset" msgid="8718986000278776272">"अपडेट अनइंस्टॉल करा"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"तुम्ही काही क्रियांसाठी डीफॉल्टनुसार हा अ‍ॅप लाँच करणे निवडले आहे."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"तुम्ही या अॅपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"तुम्ही या ॲपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
     <string name="auto_launch_disable_text" msgid="8560921288036801416">"कोणताही डीफॉल्ट सेट केलेला नाही."</string>
     <string name="clear_activities" msgid="2068014972549235347">"डीफॉल्ट साफ करा"</string>
-    <string name="screen_compatibility_text" msgid="1768064020294301496">"आपल्या स्क्रीनसाठी या अॅपची रचना केली जाऊ शकत नाही. तुम्ही येथे आपल्या स्क्रीनवर तो कसा समायोजित करतो हे नियंत्रित करू शकता."</string>
+    <string name="screen_compatibility_text" msgid="1768064020294301496">"आपल्या स्क्रीनसाठी या ॲपची रचना केली जाऊ शकत नाही. तुम्ही येथे आपल्या स्क्रीनवर तो कसा समायोजित करतो हे नियंत्रित करू शकता."</string>
     <string name="ask_compatibility" msgid="6687958195768084807">"लाँच केल्यानंतर विचारा"</string>
     <string name="enable_compatibility" msgid="1754177974320410195">"अ‍ॅप स्केल करा"</string>
     <string name="unknown" msgid="2780743426415501227">"अज्ञात"</string>
@@ -1860,7 +1862,7 @@
     <string name="dlg_cancel" msgid="2434951039156262467">"रद्द करा"</string>
     <string name="app_not_found_dlg_title" msgid="394147475018718483"></string>
     <string name="app_not_found_dlg_text" msgid="8807428608938210212">"इंस्टॉल अ‍ॅप्सच्या सूचीमध्ये अ‍ॅप आढळला नाही."</string>
-    <string name="clear_failed_dlg_text" msgid="8072859778950498232">"अॅपसाठी स्‍टोरेज साफ करता आले नाही."</string>
+    <string name="clear_failed_dlg_text" msgid="8072859778950498232">"ॲपसाठी स्‍टोरेज साफ करता आले नाही."</string>
     <string name="join_two_items" msgid="3833831843199356403">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> आणि <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="8257688498236358394">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="2234106107535318136">"संगणन…"</string>
@@ -1880,7 +1882,7 @@
     <string name="force_stop_dlg_title" msgid="8822779487097246675">"सक्तीने थांबवायचे?"</string>
     <string name="force_stop_dlg_text" msgid="7435245769456493398">"तुम्ही अ‍ॅप थांबविण्याची सक्ती केल्यास, ते गैरवर्तन करू शकते."</string>
     <string name="app_install_location_title" msgid="5121617802063021720">"प्राधान्यकृत स्थापना स्थान"</string>
-    <string name="app_install_location_summary" msgid="109719780117187797">"नवीन अॅप्स साठी प्राधान्यीकृत स्थापना स्थान बदला"</string>
+    <string name="app_install_location_summary" msgid="109719780117187797">"नवीन अ‍ॅप्स साठी प्राधान्यीकृत स्थापना स्थान बदला"</string>
     <string name="app_disable_dlg_positive" msgid="5508828271100168073">"अ‍ॅप अक्षम करा"</string>
     <string name="app_disable_dlg_text" msgid="9221864774943530281">"तुम्ही हे अ‍ॅप बंद केल्यास, Android आणि इतर अ‍ॅप्स कदाचित अपेक्षेप्रमाणे काम करणार नाहीत. लक्षात ठेवा, हे अ‍ॅप तुमच्या डिव्हाइसवर आधीच इंस्टॉल करून आलेले असल्यामुळे तुम्ही ते हटवू शकत नाही. बंद करून, तुम्ही हे अ‍ॅप बंद करता आणि ते तुमच्या डिव्हाइसवर लपवता."</string>
     <string name="app_disable_notifications_dlg_title" msgid="699530661413553928">"सूचना बंद करायच्या?"</string>
@@ -1892,7 +1894,7 @@
     <string name="app_ops_never_used" msgid="8305262378162525813">"(कधीही न वापरलेले)"</string>
     <string name="no_default_apps" msgid="4519038578011412532">"कोणतेही डीफॉल्‍ट अ‍ॅप्स नाहीत."</string>
     <string name="storageuse_settings_title" msgid="3390798597982116048">"संचयन वापर"</string>
-    <string name="storageuse_settings_summary" msgid="3013328092465903687">"अॅप्सद्वारे वापरलेले संचयन पहा"</string>
+    <string name="storageuse_settings_summary" msgid="3013328092465903687">"ॲप्सद्वारे वापरलेले संचयन पहा"</string>
     <string name="service_restarting" msgid="1190995225643385568">"रीस्टार्ट करत आहे"</string>
     <string name="cached" msgid="4019482949725020855">"पार्श्वभूमी प्रक्रिया कॅश   केली"</string>
     <string name="no_running_services" msgid="618823924559385173">"काहीही चालत नाही."</string>
@@ -1913,7 +1915,7 @@
     <string name="running_processes_header_title" msgid="6505983796524910467">"डिव्हाइस मेमरी"</string>
     <string name="running_processes_header_footer" msgid="6365963816942632771">"अ‍ॅप RAM वापर"</string>
     <string name="running_processes_header_system_prefix" msgid="3812089317725567449">"सिस्टम"</string>
-    <string name="running_processes_header_apps_prefix" msgid="4024980745400903746">"अॅप्स"</string>
+    <string name="running_processes_header_apps_prefix" msgid="4024980745400903746">"अ‍ॅप्स"</string>
     <string name="running_processes_header_free_prefix" msgid="1092348393136753031">"मोकळी"</string>
     <string name="running_processes_header_used_prefix" msgid="2984090414986096084">"वापरलेली"</string>
     <string name="running_processes_header_cached_prefix" msgid="8398315634778729026">"कॅश   केलेले"</string>
@@ -1954,7 +1956,7 @@
     <string name="auto_punctuate_summary" msgid="245694025030386370">"\".\" घालण्यासाठी Space की दोनदा दाबा"</string>
     <string name="show_password" msgid="620964020348073739">"पासवर्ड दाखवा"</string>
     <string name="show_password_summary" msgid="1403805089582258620">"तुम्ही टाइप कराल त्‍याप्रमाणे वर्ण थोडक्‍यात डिस्प्ले करा"</string>
-    <string name="spellchecker_security_warning" msgid="792070474432612097">"हा शब्दलेखन तपासक तुम्ही पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक डेटासह, टाइप करता तो सर्व मजकूर संकलित करण्यात सक्षम होऊ शकतो. हा <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> अॅपवरून येतो. हा शब्दलेखन तपासक वापरायचा?"</string>
+    <string name="spellchecker_security_warning" msgid="792070474432612097">"हा शब्दलेखन तपासक तुम्ही पासवर्ड आणि क्रेडिट कार्ड नंबर यासारख्या वैयक्तिक डेटासह, टाइप करता तो सर्व मजकूर संकलित करण्यात सक्षम होऊ शकतो. हा <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ॲपवरून येतो. हा शब्दलेखन तपासक वापरायचा?"</string>
     <string name="spellchecker_quick_settings" msgid="5193036510190696655">"सेटिंग्ज"</string>
     <string name="spellchecker_language" msgid="5168501692418112444">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="5870292843201629800">"कीबोर्ड"</string>
@@ -2032,7 +2034,7 @@
     <string name="accessibility_settings_title" msgid="1687226556576913576">"प्रवेशयोग्यता सेटिंग्ज"</string>
     <string name="accessibility_settings_summary" msgid="5742379519336396561">"स्क्रीन रीडर, डिस्प्ले, परस्‍परसंवाद नियंत्रणे"</string>
     <string name="vision_settings_title" msgid="7315352351051423944">"दृष्टी सेटिंग्ज"</string>
-    <string name="vision_settings_description" msgid="3476589459009287332">"तुम्ही तुमच्या गरजेनुसार हे डिव्हाइस कस्टमाइझ करू शकता. ही अॅक्सेसिबिलिटी वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलता येतात."</string>
+    <string name="vision_settings_description" msgid="3476589459009287332">"तुम्ही तुमच्या गरजेनुसार हे डिव्हाइस कस्टमाइझ करू शकता. ही ॲक्सेसिबिलिटी वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलता येतात."</string>
     <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"फाँटचा आकार बदला"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"स्क्रीन वाचक"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
@@ -2052,7 +2054,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="753307741814376312">"स्क्रीनवर झूम इन करा"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"झूम करण्यासाठी 3 वेळा टॅप करा"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"झूम करण्यासाठी बटणावर टॅप करा"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटांनी ड्रॅग करा"</li>\n<li>"झूम अॅडजस्ट करण्यासाठी 2 किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा आणि तिसर्‍या टॅपवर तुमचे बोट धरून ठेवा.\n"<ul><li>"स्क्रीनवर इथेतिथे जाण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटांनी ड्रॅग करा"</li>\n<li>"झूम ॲडजस्ट करण्यासाठी 2 किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा आणि तिसर्‍या टॅपवर तुमचे बोट धरून ठेवा.\n"<ul><li>"स्क्रीनवर इथेतिथे जाण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"मोठे करणे चालू केले असताना, त्वरित मोठे करण्यासाठी, स्क्रीनच्या तळाशी असलेले प्रवेशयोग्यता बटण वापरा.\n\n"<b>"झूम करण्यासाठी"</b>", प्रवेशयोग्यता बटण टॅप करा, नंतर स्क्रीनवर कुठेही टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटे ड्रॅग करा"</li>\n<li>"झूम समायोजित करण्यासाठी 2 किंवा अधिक बोटे पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", प्रवेशयोग्यता बटण दाबा, नंतर स्क्रीनवर कुठेही स्पर्श करा आणि धरून ठेवा.\n"<ul><li>"स्क्रीनवर अवतीभवती हलवण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"आपण कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"प्रवेशयोग्यता बटण <xliff:g id="SERVICE">%1$s</xliff:g> वर सेट केले आहे. मोठे करणे वापरण्यासाठी, प्रवेशयोग्यता बटणाला स्पर्श करा आणि धरून ठेवा, नंतर मोठे करणे निवडा."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"आवाज की शॉर्टकट"</string>
@@ -2175,7 +2177,7 @@
     <string name="capabilities_list_title" msgid="8177719542886123788">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
     <string name="touch_filtered_warning" msgid="3072665526993043879">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपल्या प्रतिसादाची पडताळणी करू शकत नाहीत."</string>
     <string name="enable_service_encryption_warning" msgid="3580275420826492351">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"तुम्ही अॅक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
+    <string name="secure_lock_encryption_warning" msgid="8724670910924531152">"तुम्ही ॲक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
     <string name="enable_service_pattern_reason" msgid="7415969807374459848">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पॅटर्नची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="enable_service_pin_reason" msgid="2899057249007636608">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने एंक्रिप्शन डेटा प्रभावित होतो, तुम्हाला तुमच्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="enable_service_password_reason" msgid="5210815233227388083">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पासवर्डची पुष्टी करण्याची आवश्यकता आहे."</string>
@@ -2229,10 +2231,10 @@
     <string name="power_charge_remaining" msgid="2730510256218879651">"चार्ज करण्यासाठी <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
     <string name="background_activity_title" msgid="7207836362312111483">"बॅकग्राउंड वापर मर्यादा"</string>
     <string name="background_activity_summary" msgid="582372194738538145">"अ‍ॅपला पार्श्वभूमीत चालण्याची अनुमती द्या"</string>
-    <string name="background_activity_summary_disabled" msgid="457944930942085876">"अॅपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
+    <string name="background_activity_summary_disabled" msgid="457944930942085876">"ॲपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
     <string name="background_activity_summary_whitelisted" msgid="4713321059375873828">"बॅकग्राउंड वापर मर्यादित केला जाऊ शकत नाही"</string>
-    <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवायची?"</string>
-    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"तुम्‍ही एखाद्या अॅपसाठी बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
+    <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवायची?"</string>
+    <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"तुम्‍ही एखाद्या ॲपसाठी बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"हे अ‍ॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअ‍ॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
     <string name="device_screen_usage" msgid="4470485475363132750">"पूर्ण चार्ज झाल्यानंतरचा स्क्रीन वापर"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"पूर्ण चार्ज केल्यापासूनचा बॅटरी वापर"</string>
@@ -2252,7 +2254,7 @@
     <string name="battery_stats_phone_signal_label" msgid="2502589944816260503">"मोबाईल नेटवर्क सिग्नल"</string>
     <!-- no translation found for battery_stats_last_duration (8190573267292309839) -->
     <skip />
-    <string name="awake" msgid="8956720170442161285">"डिव्हाइस अॅक्टिव्हेट होण्याची वेळ"</string>
+    <string name="awake" msgid="8956720170442161285">"डिव्हाइस ॲक्टिव्हेट होण्याची वेळ"</string>
     <string name="wifi_on_time" msgid="2487820618265936068">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="bluetooth_on_time" msgid="6400569492287292639">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="advanced_battery_title" msgid="5026866913848464170">"बॅटरी वापर"</string>
@@ -2261,7 +2263,7 @@
     <string name="details_subtitle" msgid="7279638828004951382">"तपशील वापरा"</string>
     <string name="controls_subtitle" msgid="6920199888882834620">"पॉवर वापर समायोजित करा"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"समाविष्ट पॅकेज"</string>
-    <string name="battery_tip_summary_title" msgid="2750922152518825526">"अॅप्स नेहमीप्रमाणे चालत आहेत"</string>
+    <string name="battery_tip_summary_title" msgid="2750922152518825526">"अ‍ॅप्स नेहमीप्रमाणे चालत आहेत"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"फोनमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"टॅबलेटमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"डिव्हाइसमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
@@ -2292,7 +2294,7 @@
       <item quantity="one">%1$s नुकतेच निर्बंधित केले</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="984148373944071669">
-      <item quantity="other">%2$d अॅप्सचा बॅकग्राउंड बॅटरी वापर जास्त आहे</item>
+      <item quantity="other">%2$d ॲप्सचा बॅकग्राउंड बॅटरी वापर जास्त आहे</item>
       <item quantity="one">%1$s चा बॅकग्राउंड बॅटरी वापर जास्त आहे</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="469696766640020557">
@@ -2304,32 +2306,32 @@
       <item quantity="one">अ‍ॅप प्रतिबंधित करायचे?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="6905822297507947381">"बॅटरीची बचत करण्यासाठी, <xliff:g id="APP">%1$s</xliff:g> ला बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. हे अ‍ॅप योग्यरीत्या काम करणार नाही आणि सूचना येण्यास उशीर होऊ शकतो."</string>
-    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"बॅटरीची बचत करण्यासाठी, या अॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअॅप्स:"</string>
-    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"बॅटरीची बचत करण्यासाठी, या अॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअॅप्स:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
+    <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="4225881888543582456">"बॅटरीची बचत करण्यासाठी, या अ‍ॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अ‍ॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअ‍ॅप्स:"</string>
+    <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="1748375562539446634">"बॅटरीची बचत करण्यासाठी, या अ‍ॅप्सना बॅकग्राउंडवर बॅटरीचा वापर करण्यापासून थांबवा. प्रतिबंधित अ‍ॅप्स योग्यरीत्या काम करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो.\n\nअ‍ॅप्स:\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
     <string name="battery_tip_restrict_app_dialog_ok" msgid="2573410775701913487">"प्रतिबंधित करा"</string>
     <string name="battery_tip_unrestrict_app_dialog_title" msgid="812458516399125710">"निर्बंध काढायचा?"</string>
-    <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"या अॅपला बॅकग्राउंडमध्ये बॅटरी वापरता येईल. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते."</string>
+    <string name="battery_tip_unrestrict_app_dialog_message" msgid="8120081438825031335">"या ॲपला बॅकग्राउंडमध्ये बॅटरी वापरता येईल. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते."</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="9154938931448151479">"काढा"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="7331148618292397166">"रद्द करा"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"तुमची अॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अॅप्स जास्त बॅटरी वापरत असल्यास तुमचा फोन तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"तुमची अॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अॅप्स जास्त बॅटरी वापरत असल्यास तुमचा टॅब्लेट तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"तुमची अॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अॅप्स जास्त बॅटरी वापरत असल्यास तुमचे डिव्हाइस तुम्ही करू शकता अशा क्रिया सुचवेल. \n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="7244950433272770280">"तुमची अ‍ॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अ‍ॅप्स जास्त बॅटरी वापरत असल्यास तुमचा फोन तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="1721081030632329647">"तुमची अ‍ॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अ‍ॅप्स जास्त बॅटरी वापरत असल्यास तुमचा टॅब्लेट तुम्ही करू शकता अशा कृत्या सुचवेल.\n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="146872407040848465">"तुमची अ‍ॅप्स योग्य प्रमाणात बॅटरी वापरत आहेत. तुमची अ‍ॅप्स जास्त बॅटरी वापरत असल्यास तुमचे डिव्हाइस तुम्ही करू शकता अशा क्रिया सुचवेल. \n\nबॅटरी संपत आली असल्यास तुम्ही कायम बॅटरी सेव्हर सुरू करू शकता."</string>
     <string name="smart_battery_manager_title" msgid="5744035036663849515">"बॅटरी व्यवस्थापक"</string>
-    <string name="smart_battery_title" msgid="4919670408532804351">"अॅप्स आपोआप व्यवस्थापित करा"</string>
-    <string name="smart_battery_summary" msgid="640027046471198174">"तुम्ही नेहमी वापरत नसलेल्या अॅप्सचा बॅटरी वापर मर्यादित करा"</string>
-    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
-    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
-    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="smart_battery_title" msgid="4919670408532804351">"अ‍ॅप्स आपोआप व्यवस्थापित करा"</string>
+    <string name="smart_battery_summary" msgid="640027046471198174">"तुम्ही नेहमी वापरत नसलेल्या ॲप्सचा बॅटरी वापर मर्यादित करा"</string>
+    <string name="smart_battery_footer" product="default" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अ‍ॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अ‍ॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="smart_battery_footer" product="tablet" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अ‍ॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अ‍ॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="smart_battery_footer" product="device" msgid="3971715848890205632">"जेव्हा बॅटरी व्यवस्थापकाला अ‍ॅप्सद्वारे बॅटरी जास्त वापरली जात आहे असे लक्षात येईल, तेव्हा तुमच्याकडे या अ‍ॅप्सचा वापर मर्यादित राखण्याचा पर्याय असेल. प्रतिबंधित अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
     <string name="restricted_app_title" msgid="4957644700640127606">"प्रतिबंधित अ‍ॅप्स"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="7609538735465186040">
-      <item quantity="other">%1$d अॅप्ससाठी बॅटरीचा वापर मर्यादित करत आहे</item>
-      <item quantity="one">%1$d अॅपसाठी बॅटरीचा वापर मर्यादित करत आहे</item>
+      <item quantity="other">%1$d ॲप्ससाठी बॅटरीचा वापर मर्यादित करत आहे</item>
+      <item quantity="one">%1$d ॲपसाठी बॅटरीचा वापर मर्यादित करत आहे</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="5205881852523135226">"<xliff:g id="TIME">%1$s</xliff:g> दिवसांपूर्वी प्रतिबंधित केलेले"</string>
-    <string name="restricted_app_detail_footer" msgid="482460517275754465">"ही अॅप्स बॅकग्राउंडवर बॅटरी वापरत आहेत. प्रतिबंधित अॅप्स व्यवस्थित काम करू शकणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
+    <string name="restricted_app_detail_footer" msgid="482460517275754465">"ही अ‍ॅप्स बॅकग्राउंडवर बॅटरी वापरत आहेत. प्रतिबंधित अ‍ॅप्स व्यवस्थित काम करू शकणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
     <string name="battery_auto_restriction_title" msgid="488905332794794076">"बॅटरी व्यवस्थापक वापरा"</string>
     <string name="battery_auto_restriction_summary" msgid="1638072655581821837">"अ‍ॅप्सची बॅटरी केव्हा संंपते ते ओळखा"</string>
-    <string name="battery_manager_on" msgid="5626982529932239656">"अॅप्सची बॅटरी केव्हा संपते ते ओळखत आहे / सुरू आहे"</string>
+    <string name="battery_manager_on" msgid="5626982529932239656">"ॲप्सची बॅटरी केव्हा संपते ते ओळखत आहे / सुरू आहे"</string>
     <string name="battery_manager_off" msgid="9114027524232450371">"बंद"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6721813588142691216">
       <item quantity="other">%1$d अ‍ॅप्स प्रतिबंधित केली</item>
@@ -2406,7 +2408,7 @@
     <string name="battery_desc_bluetooth" msgid="3468061900485447679">"ब्लूटूथ द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"तुम्ही ब्लूटूथ वापरत नसता तेव्हा ते बंद करा"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"एका भिन्न ब्लूटूथ उपकरणावर कनेक्ट करून पहा"</string>
-    <string name="battery_desc_apps" msgid="6826726880149226823">"अॅपद्वारे वापरलेली बॅटरी"</string>
+    <string name="battery_desc_apps" msgid="6826726880149226823">"ॲपद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_apps_info" msgid="9175761965559743977">"अ‍ॅप थांबवा किंवा अनइंस्टॉल करा"</string>
     <string name="battery_sugg_apps_gps" msgid="489694612870772770">"बॅटरी बचत मोड निवडा"</string>
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"बॅटरी वापर कमी करण्यासाठी अ‍ॅप सेटिंग्ज ऑफर करू शकतो"</string>
@@ -2502,7 +2504,7 @@
     <string name="voice_service_preference_section_title" msgid="2984112696100778038">"व्‍हॉइस इनपुट सेवा"</string>
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"पूर्ण हॉटवर्ड आणि परस्परसंवाद"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"मजकूर पाठविण्यासाठी सोपे उच्चारण"</string>
-    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"आपल्या वतीने व्हॉइस परीक्षण नेहमी-चालू कार्यप्रदर्शन करण्यासाठी आणि व्हॉइस सक्षम अॅप्लिकेशन नियंत्रित करण्यासाठी व्हॉइस इनपुट सेवा सक्षम असेल. हे <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> अॅप्लिकेशनावरून येते. या सेवेचा वापर सक्षम करायचा?"</string>
+    <string name="voice_interaction_security_warning" msgid="4986261746316889768">"आपल्या वतीने व्हॉइस परीक्षण नेहमी-चालू कार्यप्रदर्शन करण्यासाठी आणि व्हॉइस सक्षम ॲप्लिकेशन नियंत्रित करण्यासाठी व्हॉइस इनपुट सेवा सक्षम असेल. हे <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ॲप्लिकेशनावरून येते. या सेवेचा वापर सक्षम करायचा?"</string>
     <string name="tts_engine_preference_title" msgid="1183116842356275061">"प्राधान्य इंजिन"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"इंजिन सेटिंग्ज"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"भाषण गती आणि पिच"</string>
@@ -2510,7 +2512,7 @@
     <string name="tts_install_voice_title" msgid="3143328760690690254">"व्हॉइस"</string>
     <string name="tts_spoken_language" msgid="8057256621711361944">"बोलली जाणारी भाषा"</string>
     <string name="tts_install_voices_title" msgid="363811937643579286">"आवाज इंस्टॉल करा"</string>
-    <string name="tts_install_voices_text" msgid="7464832428439739995">"आवाज इंस्टॉल करण्यासाठी <xliff:g id="TTS_APP_NAME">%s</xliff:g> अॅपकडे जा"</string>
+    <string name="tts_install_voices_text" msgid="7464832428439739995">"आवाज इंस्टॉल करण्यासाठी <xliff:g id="TTS_APP_NAME">%s</xliff:g> ॲपकडे जा"</string>
     <string name="tts_install_voices_open" msgid="686776451008134790">"अ‍ॅप उघडा"</string>
     <string name="tts_install_voices_cancel" msgid="1622512922523479646">"रद्द करा"</string>
     <string name="tts_reset" msgid="8864073594540705579">"रीसेट करा"</string>
@@ -2532,7 +2534,7 @@
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"हार्डवेअर बॅकअप घेतला"</string>
     <string name="credential_storage_type_software" msgid="1335905150062717150">"केवळ सॉफ्टवेअर"</string>
     <string name="credentials_settings_not_available" msgid="5490259681690183274">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
-    <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"VPN आणि अॅप्ससाठी इंस्टॉल केले"</string>
+    <string name="credential_for_vpn_and_apps" msgid="2462642486949593841">"VPN आणि ॲप्ससाठी इंस्टॉल केले"</string>
     <string name="credential_for_wifi" msgid="2903295786961726388">"वाय-फाय साठी इंस्टॉल केले"</string>
     <string name="credentials_reset_hint" msgid="3484350477764088169">"सर्व आशय काढायचा?"</string>
     <string name="credentials_erased" msgid="7287088033523869085">"क्रेडेन्शियल स्टोरेज मिटवले आहे."</string>
@@ -2564,19 +2566,19 @@
     <string name="uninstall_device_admin" msgid="9017499299961719830">"अ‍ॅप अनइंस्टॉल करा"</string>
     <string name="remove_and_uninstall_device_admin" msgid="5607703579731496253">"निष्क्रिय करा आणि अनइंस्टॉल करा"</string>
     <string name="select_device_admin_msg" msgid="4173769638399075387">"डिव्हाइस प्रशासक अ‍ॅप्स"</string>
-    <string name="no_device_admins" msgid="4129231900385977460">"कोणतेही डिव्हाइस प्रशासक अॅप्स उपलब्ध नाहीत"</string>
+    <string name="no_device_admins" msgid="4129231900385977460">"कोणतेही डिव्हाइस प्रशासक अ‍ॅप्स उपलब्ध नाहीत"</string>
     <string name="personal_device_admin_title" msgid="759440849188565661">"वैयक्तिक"</string>
     <string name="managed_device_admin_title" msgid="8021522755492551726">"कार्य"</string>
-    <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"एसएमएस आणि कॉल लॉग अॅक्सेस प्रतिबंधित करा"</string>
-    <string name="sms_access_restriction_enabled_summary" msgid="9011946580977780063">"फक्त डीफॉल्ट फोन आणि मेसेजिंग अॅप्सना एसएमएस आणि कॉल लॉग परवानग्या आहेत"</string>
+    <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"एसएमएस आणि कॉल लॉग ॲक्सेस प्रतिबंधित करा"</string>
+    <string name="sms_access_restriction_enabled_summary" msgid="9011946580977780063">"फक्त डीफॉल्ट फोन आणि मेसेजिंग ॲप्सना एसएमएस आणि कॉल लॉग परवानग्या आहेत"</string>
     <string name="no_trust_agents" msgid="5757792915019113084">"कोणतेही विश्वासू एजंट उपलब्ध नाहीत"</string>
-    <string name="add_device_admin_msg" msgid="3573765823476931173">"डिव्हाइस प्रशासक अ‍ॅप अॅक्टिव्हेट करायचे?"</string>
-    <string name="add_device_admin" msgid="1621152410207260584">"हे डिव्हाइस प्रशासक अ‍ॅप अॅक्टिव्हेट करा"</string>
+    <string name="add_device_admin_msg" msgid="3573765823476931173">"डिव्हाइस प्रशासक अ‍ॅप ॲक्टिव्हेट करायचे?"</string>
+    <string name="add_device_admin" msgid="1621152410207260584">"हे डिव्हाइस प्रशासक अ‍ॅप ॲक्टिव्हेट करा"</string>
     <string name="device_admin_add_title" msgid="6097881332139146897">"डिव्हाइस प्रशासक"</string>
     <string name="device_admin_warning" msgid="4421817419326480449">"हे प्रशासक अ‍ॅप सक्रिय केल्याने ते <xliff:g id="APP_NAME">%1$s</xliff:g> अ‍ॅपला पुढील ऑपरेशन करण्याची अनुमती देईल:"</string>
     <string name="device_admin_status" msgid="5424944611789040723">"हे अ‍ॅडमिन अ‍ॅप सक्रिय आहे आणि ते <xliff:g id="APP_NAME">%1$s</xliff:g> अ‍ॅपला पुढील ऑपरेशन करण्याची अनुमती देते:"</string>
     <string name="profile_owner_add_title" msgid="735805919754362791">"प्रोफाईल व्‍यवस्‍थापक सक्रिय करायचे?"</string>
-    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"पुढे सुरू ठेवून, तुमच्या वापरकर्त्याचे व्यवस्थापन तुमच्या प्रशासकाद्वारे केले जाईल. हा प्रशासक तुमच्या वैयक्तिक डेटाव्यतिरिक्त संबंधित डेटा स्टोअर करण्यासही सक्षम असेल.\n\nतुमच्या प्रशासकाकडे तुमच्या नेटवर्क अॅक्टिव्हिटी तसेच वापरकर्त्याशी संबधित सेटिंग्ज, अॅक्सेस, अॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
+    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"पुढे सुरू ठेवून, तुमच्या वापरकर्त्याचे व्यवस्थापन तुमच्या प्रशासकाद्वारे केले जाईल. हा प्रशासक तुमच्या वैयक्तिक डेटाव्यतिरिक्त संबंधित डेटा स्टोअर करण्यासही सक्षम असेल.\n\nतुमच्या प्रशासकाकडे तुमच्या नेटवर्क ॲक्टिव्हिटी तसेच वापरकर्त्याशी संबधित सेटिंग्ज, ॲक्सेस, अ‍ॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
     <string name="admin_disabled_other_options" msgid="8097063307730025707">"आपल्या प्रशासकाने इतर पर्याय अक्षम केले आहेत"</string>
     <string name="admin_more_details" msgid="1719819589822345585">"अधिक तपशील"</string>
     <string name="notification_log_title" msgid="4200467765474474753">"सूचना लॉग"</string>
@@ -2594,12 +2596,12 @@
     <string name="managed_profile_not_available_label" msgid="8784246681719821917">"कार्य प्रोफाईल अद्याप उपलब्ध नाही"</string>
     <string name="work_mode_label" msgid="6845849194740195757">"कार्य प्रोफाइल"</string>
     <string name="work_mode_on_summary" msgid="1682781113156323592">"तुमच्या संस्थेकडून व्यवस्थापित"</string>
-    <string name="work_mode_off_summary" msgid="1688885392211178315">"अॅप्स आणि सूचना बंद आहेत"</string>
+    <string name="work_mode_off_summary" msgid="1688885392211178315">"अ‍ॅप्स आणि सूचना बंद आहेत"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"कार्य प्रोफाईल काढा"</string>
     <string name="background_data" msgid="8275750862371471171">"पार्श्वभूमीवरील डेटा"</string>
-    <string name="background_data_summary" msgid="799640633948841990">"अॅप्स कोणत्याही वेळी डेटा संकालित करू, पाठवू आणि प्राप्त करू शकतात."</string>
+    <string name="background_data_summary" msgid="799640633948841990">"अ‍ॅप्स कोणत्याही वेळी डेटा संकालित करू, पाठवू आणि प्राप्त करू शकतात."</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"पार्श्वभूमीवरील डेटा अक्षम करायचा?"</string>
-    <string name="background_data_dialog_message" msgid="8126774244911656527">"पार्श्वभूमीवरील डेटा बंद केल्याने बॅटरी लाइफ वाढते आणि डेटा वापर कमी होतो. तरीही, काही अॅप्स पार्श्वभूमीवर डेटा कनेक्शन वापरतात."</string>
+    <string name="background_data_dialog_message" msgid="8126774244911656527">"पार्श्वभूमीवरील डेटा बंद केल्याने बॅटरी लाइफ वाढते आणि डेटा वापर कमी होतो. तरीही, काही अ‍ॅप्स पार्श्वभूमीवर डेटा कनेक्शन वापरतात."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"अ‍ॅप डेटा स्वयं-संकालित करा"</string>
     <string name="sync_enabled" msgid="535172627223336983">"सिंक चालू आहे"</string>
     <string name="sync_disabled" msgid="713721807204805062">"सिंक बंद आहे"</string>
@@ -2613,7 +2615,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"आता संकालित करण्यासाठी टॅप करा<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"कॅलेंडर"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"संपर्क"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google सिंकामध्ये स्वागत आहे!"</font>" \nतुम्ही जेथे आहात तेथून आपल्या संपर्क, भेटी आणि अधिक मध्ये प्रवेश करण्याची अनुमती देण्यासाठी डेटा सिंक करण्याकरिता एक Google दृष्टिकोन."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"अ‍ॅप सिंक सेटिंग्ज"</string>
@@ -2668,7 +2670,7 @@
     <string name="account_settings_menu_auto_sync_work" msgid="5721442464286552815">"कार्य डेटा स्‍वयं-संकालित करा"</string>
     <string name="data_usage_change_cycle" msgid="447761920472170031">"आवर्तन बदला…"</string>
     <string name="data_usage_pick_cycle_day" msgid="6319750879145917066">"डेटा वापर चक्र रीसेट करण्यासाठी महिन्याचा दिवस:"</string>
-    <string name="data_usage_empty" msgid="7981405723435034032">"या कालावधी दरम्यान कोणत्याही अॅप्स नी डेटा वापरला नाही."</string>
+    <string name="data_usage_empty" msgid="7981405723435034032">"या कालावधी दरम्यान कोणत्याही अ‍ॅप्स नी डेटा वापरला नाही."</string>
     <string name="data_usage_label_foreground" msgid="2471091128648754601">"अग्रभाग"</string>
     <string name="data_usage_label_background" msgid="1618794447370396845">"पार्श्वभूमी"</string>
     <string name="data_usage_app_restricted" msgid="7569077654579299326">"प्रतिबंधित"</string>
@@ -2693,7 +2695,7 @@
     <string name="data_usage_app_settings" msgid="3276444867375694809">"अ‍ॅप सेटिंग्ज"</string>
     <string name="data_usage_app_restrict_background" msgid="649167881583859169">"पार्श्वभूमीवरील डेटा"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2703967920234671881">"पार्श्वभूमीमध्‍ये मोबाइल डेटाचा वापर सुरू करा"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"या अॅपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाईल डेटा मर्यादा सेट करा."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7211921499365814638">"या ॲपसाठी पार्श्वभूमीवरील डेटा प्रतिबंधित करताना प्रथम मोबाईल डेटा मर्यादा सेट करा."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="750037964591673167">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="4022530391896478031">"जेव्हा फक्त मोबाईल नेटवर्क उपलब्ध असतात तेव्हा या वैशिष्ट्यामुळे पार्श्वभूमी डेटावर अवलंबून असलेला अ‍ॅप कार्य करणे थांबवते.\n\nतुम्ही अ‍ॅप मध्ये उपलब्ध असलेल्या सेटिंग्जमध्ये अधिक योग्य डेटा वापर नियंत्रणे शोधू शकता."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="18928292832775805">"तुम्ही मोबाइल डेटा मर्यादा सेट करता तेव्हाच पार्श्वभूमीवरील डेटा प्रतिबंधित करणे शक्य आहे."</string>
@@ -2711,13 +2713,13 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="2000713577999830647">"आपल्या टॅबलेटने तुम्ही सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या टॅबलेटद्वारे डेटा वापर मोजला जात असल्याने आणि तुमचा वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="943546278705619205">"मोबाइल डेटावर घातलेली मर्यादा गाठल्यावर तुमचा फोन मोबाइल डेटा बंद करेल.\n\nतुमचा डेटा वापर तुमच्या फोनद्वारे मोजला जात असल्याने आणि वाहक वापराची गणना वेगळ्या प्रकारे होत असल्याने, कमी मर्यादा सेट करण्याची शिफारस केली जाते."</string>
     <string name="data_usage_restrict_background_title" msgid="3568746530413220844">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
-    <string name="data_usage_restrict_background" msgid="995811034744808575">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
+    <string name="data_usage_restrict_background" msgid="995811034744808575">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अ‍ॅप्स आणि सेवा काम करणार नाहीत."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="6032810839234864814">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अ‍ॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अ‍ॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावणी"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"मर्यादा"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"काढलेले अॅप्स"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"काढलेले अॅप्स आणि वापरकर्ते"</string>
+    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"काढलेले अ‍ॅप्स"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"काढलेले अ‍ॅप्स आणि वापरकर्ते"</string>
     <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> प्राप्त झाले, <xliff:g id="SENT">%2$s</xliff:g> पाठविले"</string>
     <string name="data_usage_total_during_range" msgid="7307562900020512747">"<xliff:g id="RANGE">%2$s</xliff:g>: सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: आपल्या टॅब्लेटच्या मापनाप्रमाणे सुमारे <xliff:g id="TOTAL">%1$s</xliff:g> वापरले. आपल्या वाहकाच्या डेटा वापराची गणना भिन्न असू शकते."</string>
@@ -2786,7 +2788,7 @@
     <string name="vpn_menu_lockdown" msgid="6951452279924808089">"नेहमी सुरू असलेले VPN"</string>
     <string name="vpn_no_vpns_added" msgid="6616183541896197147">"कोणतेही VPN जोडलेले नाहीत"</string>
     <string name="vpn_always_on_summary" msgid="3639994551631437397">"VPN शी नेहमी कनेक्ट केलेले रहा"</string>
-    <string name="vpn_always_on_summary_not_supported" msgid="9077720997795965133">"या अॅपद्वारे समर्थित नाही"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="9077720997795965133">"या ॲपद्वारे समर्थित नाही"</string>
     <string name="vpn_always_on_summary_active" msgid="8962619701962239088">"नेहमी-चालू सक्रिय"</string>
     <string name="vpn_require_connection" msgid="5413746839457797350">"VPN शिवायची कनेक्शन ब्लॉक करा"</string>
     <string name="vpn_require_connection_title" msgid="8361434328767853717">"VPN कनेक्शन आवश्यक आहे?"</string>
@@ -2829,14 +2831,14 @@
       <item quantity="one">प्रमाणपत्रावर विश्वास ठेवा अथवा काढून टाका</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="9046046586061880100">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतो.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क ॲक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क ॲक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतो.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="8271858091418779584">
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देतो.\n\nया प्रमाणपत्राविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"एक तृतीय पक्ष ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डीव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेंशियल हे शक्य करते."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"एक तृतीय पक्ष ईमेल, अ‍ॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क ॲक्टिव्हिटीचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डीव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेंशियल हे शक्य करते."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
       <item quantity="other">प्रमाणपत्रे तपासा</item>
       <item quantity="one">प्रमाणपत्र तपासा</item>
@@ -2849,7 +2851,7 @@
     <string name="user_add_user_or_profile_menu" msgid="4220679989900149336">"वापरकर्ता किंवा प्रोफाइल जोडा"</string>
     <string name="user_add_user_menu" msgid="9006572936456324794">"वापरकर्ता जोडा"</string>
     <string name="user_summary_restricted_profile" msgid="5214838615043574917">"प्रतिबंधित प्रोफाईल"</string>
-    <string name="user_need_lock_message" msgid="3421243467724322311">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी तुम्हाला तुमचे अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
+    <string name="user_need_lock_message" msgid="3421243467724322311">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी तुम्हाला तुमचे अ‍ॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
     <string name="user_set_lock_button" msgid="4660971133148866612">"लॉक सेट करा"</string>
     <string name="user_summary_not_set_up" msgid="6436691939044332679">"सेट केलेले नाही"</string>
     <string name="user_summary_restricted_not_set_up" msgid="896552290436689508">"सेट केलेले नाही - प्रति‍बंधित प्रोफाईल"</string>
@@ -2859,13 +2861,13 @@
     <string name="user_nickname" msgid="1088216221559125529">"टोपणनाव"</string>
     <string name="user_add_user_type_title" msgid="8672326434351387845">"जोडा"</string>
     <string name="user_add_max_count" msgid="4524573950126500416">"तुम्ही सुमारे <xliff:g id="USER_COUNT">%1$d</xliff:g> वापरकर्ते जोडू शकता"</string>
-    <string name="user_add_user_item_summary" msgid="6114355152711455716">"वापरकर्त्यांकडे त्यांचे स्वत:चे अॅप्स आणि सामग्री आहे"</string>
-    <string name="user_add_profile_item_summary" msgid="6386283837789573755">"तुम्ही आपल्या खात्यावरुन अॅप्स आणि सामग्रीमध्ये प्रवेश करण्यास प्रतिबंध करु शकता"</string>
+    <string name="user_add_user_item_summary" msgid="6114355152711455716">"वापरकर्त्यांकडे त्यांचे स्वत:चे अ‍ॅप्स आणि सामग्री आहे"</string>
+    <string name="user_add_profile_item_summary" msgid="6386283837789573755">"तुम्ही आपल्या खात्यावरुन अ‍ॅप्स आणि सामग्रीमध्ये प्रवेश करण्यास प्रतिबंध करु शकता"</string>
     <string name="user_add_user_item_title" msgid="6835385073795492410">"वापरकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"प्रतिबंधित प्रोफाईल"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"नवीन वापरकर्ता जोडायचा?"</string>
-    <string name="user_add_user_message_long" msgid="686637203224195465">"अतिरिक्त वापरकर्ते तयार करून तुम्ही इतर लोकांसोबत हे डिव्हाइस शेअर करू शकता. प्रत्येक वापरकर्त्यास त्यांची स्वतःची स्पेस असते, जी ते अ‍ॅप्स, वॉलपेपर आणि यासारख्या गोष्टींनी कस्टमाइझ करू शकतात. वापरकर्ते प्रत्येकाला प्रभावित करणाऱ्या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज अ‍ॅडजस्ट देखील करू शकतात.\n\nतुम्ही एक नवीन वापरकर्ता जोडता, तेव्हा त्या व्यक्तीला त्याची स्पेस सेट अप करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप अपडेट करू शकतो. अॅक्सेसिबिलिटी सेटिंग्ज आणि सेवा नवीन वापरकर्त्याला कदाचित ट्रान्सफर होणार नाहीत."</string>
-    <string name="user_add_user_message_short" msgid="1802594476285458254">"तुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अॅप्स अपडेट करू शकतो."</string>
+    <string name="user_add_user_message_long" msgid="686637203224195465">"अतिरिक्त वापरकर्ते तयार करून तुम्ही इतर लोकांसोबत हे डिव्हाइस शेअर करू शकता. प्रत्येक वापरकर्त्यास त्यांची स्वतःची स्पेस असते, जी ते अ‍ॅप्स, वॉलपेपर आणि यासारख्या गोष्टींनी कस्टमाइझ करू शकतात. वापरकर्ते प्रत्येकाला प्रभावित करणाऱ्या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज अ‍ॅडजस्ट देखील करू शकतात.\n\nतुम्ही एक नवीन वापरकर्ता जोडता, तेव्हा त्या व्यक्तीला त्याची स्पेस सेट अप करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप अपडेट करू शकतो. ॲक्सेसिबिलिटी सेटिंग्ज आणि सेवा नवीन वापरकर्त्याला कदाचित ट्रान्सफर होणार नाहीत."</string>
+    <string name="user_add_user_message_short" msgid="1802594476285458254">"तुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप्स अपडेट करू शकतो."</string>
     <string name="user_setup_dialog_title" msgid="6748950002206392396">"आता वापरकर्ता सेट करायचा?"</string>
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"डिव्हाइस घेण्यासाठी आणि त्यांचे स्थान सेट करण्यासाठी व्यक्ती उपलब्ध असल्याची खात्री करा"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"आता प्रोफाईल सेट करायचा?"</string>
@@ -2885,8 +2887,8 @@
     <string name="work_profile_confirm_remove_title" msgid="3168910958076735800">"कार्य प्रोफाईल काढायचे?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2889456786320157545">"तुम्ही या टॅब्लेटवरील तुमचे स्थान आणि डेटा गमवाल. तुम्ही ही क्रिया पूर्ववत करु शकत नाही."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="8441729423565705183">"तुम्ही या फोनवरील तुमचे स्थान आणि डेटा गमवाल. तुम्ही ही क्रिया पूर्ववत करु शकत नाही."</string>
-    <string name="user_confirm_remove_message" msgid="5202150470271756013">"सर्व अॅप्स आणि डेटा हटवला जाईल."</string>
-    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"तुम्ही सुरु ठेवल्यास या प्रोफाईलमधील सर्व अॅप्स आणि डेटा हटवला जाईल."</string>
+    <string name="user_confirm_remove_message" msgid="5202150470271756013">"सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
+    <string name="work_profile_confirm_remove_message" msgid="1220672284385083128">"तुम्ही सुरु ठेवल्यास या प्रोफाईलमधील सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
     <string name="user_profile_confirm_remove_message" msgid="8376289888144561545">"सर्व अ‍ॅप्स आणि डेटा हटवला जाईल."</string>
     <string name="user_adding_new_user" msgid="381717945749193417">"नवीन वापरकर्त्यास जोडत आहे…"</string>
     <string name="user_delete_user_description" msgid="3627684990761268859">"वापरकर्ता हटवा"</string>
@@ -2905,8 +2907,8 @@
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"या वापरकर्त्याशी कॉल आणि SMS इतिहास शेअर केला जाईल."</string>
     <string name="emergency_info_title" msgid="1522609271881425375">"आणीबाणी माहिती"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी माहिती आणि संपर्क"</string>
-    <string name="application_restrictions" msgid="6871981013736536763">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
-    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"प्रतिबंध असलेले अॅप्लिकेशन"</string>
+    <string name="application_restrictions" msgid="6871981013736536763">"अ‍ॅप्स आणि सामग्रीला अनुमती द्या"</string>
+    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"प्रतिबंध असलेले ॲप्लिकेशन"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"अनुप्रयोगासाठी सेटिंग्ज विस्तृत करा"</string>
     <string name="nfc_payment_settings_title" msgid="5070077706735415291">"टॅप करा आणि पे करा"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"हे कसे काम करते"</string>
@@ -2971,7 +2973,7 @@
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3292205836938064931">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="226439584043333608">"फोन दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="restriction_location_enable_title" msgid="358506740636434856">"स्थान"</string>
-    <string name="restriction_location_enable_summary" msgid="4159500201124004463">"अॅप्सना तुमची स्थान माहिती वापरु द्या"</string>
+    <string name="restriction_location_enable_summary" msgid="4159500201124004463">"ॲप्सना तुमची स्थान माहिती वापरु द्या"</string>
     <string name="wizard_back" msgid="223654213898117594">"परत"</string>
     <string name="wizard_next" msgid="5239664512608113542">"पुढील"</string>
     <string name="wizard_finish" msgid="3742102879981212094">"समाप्‍त"</string>
@@ -2983,7 +2985,7 @@
     <string name="sim_settings_title" msgid="8818243954752261922">"सिम कार्ड"</string>
     <string name="sim_settings_summary" msgid="6516330865408217800">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="1012486903583092731">"सिम कार्डे बदलली"</string>
-    <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"अॅक्टिव्हिटी सेट करण्यासाठी टॅप करा"</string>
+    <string name="sim_cards_changed_message_summary" msgid="5753692480107865077">"ॲक्टिव्हिटी सेट करण्यासाठी टॅप करा"</string>
     <string name="sim_cellular_data_unavailable" msgid="1832472508352891641">"मोबाइल डेटा अनुपलब्‍ध आहे"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="3093797406601964131">"डेटा सिम निवडण्यासाठी टॅप करा"</string>
     <string name="sim_calls_always_use" msgid="5322696995795851734">"कॉल साठी हे नेहमी वापरा"</string>
@@ -3029,14 +3031,14 @@
     <string name="network_dashboard_summary_mobile" msgid="5560545061217580626">"मोबाइल"</string>
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"डेटा वापर"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"हॉटस्पॉट"</string>
-    <string name="connected_devices_dashboard_title" msgid="7795222675849060444">"कनेक्‍ट केलेले डिव्‍हाइस"</string>
+    <string name="connected_devices_dashboard_title" msgid="7795222675849060444">"कनेक्‍ट केलेली डिव्‍हाइस"</string>
     <string name="connected_devices_dashboard_summary" msgid="1072664369515033179">"ब्लूटूथ, ड्रायव्हिंग मोड, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"ब्लूटूथ, ड्रायव्हिंग मोड"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"ब्लूटूथ, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"ब्लूटूथ"</string>
-    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"अॅप्स आणि सूचना"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"अ‍ॅप्स आणि सूचना"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"असिस्टंट, अलीकडील अ‍ॅप्स, डीफॉल्ट अ‍ॅप्स"</string>
-    <string name="notification_settings_work_profile" msgid="7190550347842400029">"कार्य प्रोफाइलमधील अॅप्ससाठी सूचनेचा अॅक्सेस उपलब्ध नाही."</string>
+    <string name="notification_settings_work_profile" msgid="7190550347842400029">"कार्य प्रोफाइलमधील ॲप्ससाठी सूचनेचा ॲक्सेस उपलब्ध नाही."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"खाती"</string>
     <string name="account_dashboard_default_summary" msgid="6822549669771936206">"कोणतीही खाती जोडली नाहीत"</string>
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"डीफॉल्ट अ‍ॅप्स"</string>
@@ -3049,7 +3051,7 @@
     <string name="keywords_time_format" msgid="8265826377023617424">"२४-तास फॉरमॅट वापरा"</string>
     <string name="keywords_storage_files" msgid="1995055540202216399">"डाउनलोड करा"</string>
     <string name="keywords_app_default" msgid="1265502485415708667">"याने उघडा"</string>
-    <string name="keywords_applications_settings" msgid="2078776051110952597">"अॅप्लिकेशन"</string>
+    <string name="keywords_applications_settings" msgid="2078776051110952597">"ॲप्लिकेशन"</string>
     <string name="keywords_time_zone" msgid="1571973084865023954">"टाइमझोन"</string>
     <string name="keywords_draw_overlay" msgid="3855954419750744775">"चॅट हेड"</string>
     <string name="keywords_flashlight" msgid="7733996050628473024">"फ्लॅशलाइट, लाइट, टॉर्च"</string>
@@ -3077,10 +3079,10 @@
     <string name="keywords_location" msgid="6439463166207072559">"जवळपासचे, स्थान, इतिहास, अहवाल देणे, GPS"</string>
     <string name="keywords_accounts" msgid="5908945725229306088">"खाते"</string>
     <string name="keywords_users" msgid="5880705776023155640">"प्रतिबंध, प्रतिबंधित करा, प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"मजकूर सुधारणा, योग्य, ध्वनी, व्हायब्रेट, अॉटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
+    <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"मजकूर सुधारणा, योग्य, ध्वनी, व्हायब्रेट, ऑटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="2645701455052020435">"रीसेट करा, प्राधान्ये, डीफॉल्‍ट"</string>
-    <string name="keywords_all_apps" msgid="846444448435698930">"अॅप्स, डाउनलोड, अॅप्लिकेशन, सिस्टम"</string>
-    <string name="keywords_app_permissions" msgid="8539841019997048500">"अॅप्स, परवानग्या, सुरक्षितता"</string>
+    <string name="keywords_all_apps" msgid="846444448435698930">"अ‍ॅप्स, डाउनलोड, ॲप्लिकेशन, सिस्टम"</string>
+    <string name="keywords_app_permissions" msgid="8539841019997048500">"अ‍ॅप्स, परवानग्या, सुरक्षितता"</string>
     <string name="keywords_default_apps" msgid="7435952699323965532">"अ‍ॅप्‍स, डीफॉल्‍ट"</string>
     <string name="keywords_ignore_optimizations" msgid="9127632532176249438">"ऑप्टिमायझेशन, डोझ, अ‍ॅप स्टँडबायकडे दुर्लक्ष करा"</string>
     <string name="keywords_color_mode" msgid="8893345199519181751">"चैतन्यपूर्ण, rgb, srgb, रंग, नैसर्गिक, मानक"</string>
@@ -3136,7 +3138,7 @@
     <string name="notification_volume_option_title" msgid="1358512611511348260">"सूचना व्हॉल्यूम"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"डीफॉल्ट सूचना ध्वनी"</string>
-    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"अॅपने प्रदान केलेला ध्वनी"</string>
+    <string name="notification_unknown_sound_title" msgid="8043718667804838398">"ॲपने प्रदान केलेला ध्वनी"</string>
     <string name="notification_sound_default" msgid="2664544380802426260">"डीफॉल्ट सूचना ध्वनी"</string>
     <string name="alarm_ringtone_title" msgid="6411326147408635902">"डीफॉल्ट अलार्म ध्वनी"</string>
     <string name="vibrate_when_ringing_title" msgid="2757996559847126952">"कॉलसाठी कंपन सुरू करा"</string>
@@ -3219,7 +3221,7 @@
     <string name="zen_mode_block_effect_summary_sound" msgid="4907185880913861880">"ध्वनी आणि व्हायब्रेट"</string>
     <string name="zen_mode_block_effect_summary_some" msgid="6035118904496072665">"ध्वनी, व्हायब्रेट आणि काही व्हिज्युअल चिन्हांच्या काही सूचना"</string>
     <string name="zen_mode_block_effect_summary_all" msgid="2830443565687247759">"सूचनांचा ध्वनी, व्हायब्रेट आणि व्हिज्युअल चिन्ह"</string>
-    <string name="zen_mode_blocked_effects_footer" msgid="4375156159613413924">"मूलभूत फोन अॅक्टिव्हिटी आणि स्थितीसाठी आवश्यक सूचना कधीही लपवल्या जाणार नाहीत"</string>
+    <string name="zen_mode_blocked_effects_footer" msgid="4375156159613413924">"मूलभूत फोन ॲक्टिव्हिटी आणि स्थितीसाठी आवश्यक सूचना कधीही लपवल्या जाणार नाहीत"</string>
     <string name="zen_mode_no_exceptions" msgid="3099578343994492857">"काहीही नाही"</string>
     <string name="zen_mode_other_options" msgid="7216192179063769057">"इतर पर्याय"</string>
     <string name="zen_mode_add" msgid="2533484377786927366">"जोडा"</string>
@@ -3229,7 +3231,7 @@
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="4307574188962071429">"व्यत्यय आणू नका <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर्यंत चालू असणार आहे"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="3701005376825238752">"तुम्ही बंद करेपर्यंत व्यत्यय आणू नका सुरू राहील"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"(<xliff:g id="RULE_NAME">%s</xliff:g>) शेड्युलने व्यत्यय आणू नका आपोआप सुरू केले"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> या अॅपने व्यत्यय आणू नका आपोआप चालू केले"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"<xliff:g id="APP_NAME">%s</xliff:g> या ॲपने व्यत्यय आणू नका आपोआप चालू केले"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"<xliff:g id="RULE_NAMES">%s</xliff:g>साठी व्यत्यय आणू नका कस्टम सेटिंग्ज सह सुरू आहे."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" कस्टम सेटिंग्ज पाहा"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"केवळ प्राधान्य"</string>
@@ -3301,7 +3303,7 @@
     <string name="hide_silent_icons_summary" msgid="2624346914488256888">"स्टेटस बारमध्ये शांत सूचनांसाठी आयकन लपवा"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"सूचना बिंदूंना अनुमती द्या"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"बबल"</string>
-    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ्लोटिंग शॉर्टकट वापरून कुठूनही अॅप आशय झटपट अॅक्सेस करा"</string>
+    <string name="notification_bubbles_summary" msgid="4624512775901949578">"फ्लोटिंग शॉर्टकट वापरून कुठूनही ॲप आशय झटपट ॲक्सेस करा"</string>
     <string name="bubbles_feature_education" msgid="8979109826818881018">"काही सूचना आणि इतर आशय स्क्रीनवर बबल म्हणून दिसू शकतात. बबल उघडण्यासाठी, त्यावर टॅप करा. डिसमिस करण्यासाठी, तो स्क्रीनच्या खालच्या बाजूला ड्रॅग करा."</string>
     <string name="bubbles_app_toggle_title" msgid="6401217027603326439">"बबल"</string>
     <string name="bubbles_app_toggle_summary" msgid="7707611139796553855">"<xliff:g id="APP_NAME">%1$s</xliff:g> ला काही सूचना बबल म्हणून दाखवू द्या"</string>
@@ -3344,7 +3346,7 @@
     <string name="notification_silence_title" msgid="6959637402003838093">"सायलंट पद्धतीने दाखवा"</string>
     <string name="notification_alert_title" msgid="750683027055192648">"इशारा"</string>
     <string name="allow_interruption" msgid="3548841026410702850">"व्‍यत्‍ययांना अनुमती द्या"</string>
-    <string name="allow_interruption_summary" msgid="5207637026831135377">"अॅपचा आवाज येऊ द्या, व्हायब्रेट करू द्या आणि/किंवा स्‍क्रीनवर पॉप सूचना येऊ द्या"</string>
+    <string name="allow_interruption_summary" msgid="5207637026831135377">"ॲपचा आवाज येऊ द्या, व्हायब्रेट करू द्या आणि/किंवा स्‍क्रीनवर पॉप सूचना येऊ द्या"</string>
     <string name="notification_channel_summary_min" msgid="8646305539478179811">"कमी महत्त्व"</string>
     <string name="notification_channel_summary_low" msgid="7753266237705850510">"मध्यम महत्त्व"</string>
     <string name="notification_channel_summary_default" msgid="7529537115678964164">"सर्वाधिक महत्व"</string>
@@ -3355,8 +3357,8 @@
     <string name="notifications_sent_weekly" msgid="5859675428990259432">"~<xliff:g id="NUMBER">%1$s</xliff:g> प्रति आठवडा"</string>
     <string name="notifications_sent_never" msgid="237997329598144638">"कधीही नाही"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"सूचना प्रवेश"</string>
-    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"कार्य प्रोफाइल सूचनांचा अॅक्‍सेस ब्‍लॉक आहे"</string>
-    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"अॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"कार्य प्रोफाइल सूचनांचा ॲक्‍सेस ब्‍लॉक आहे"</string>
+    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"अ‍ॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
       <item quantity="other">%d अ‍ॅप्स सूचना वाचू शकतात</item>
       <item quantity="one">%d अ‍ॅप सूचना वाचू शकतो</item>
@@ -3365,29 +3367,29 @@
     <string name="no_notification_assistant" msgid="9140123568386413264">"असिस्टंट नाही"</string>
     <string name="no_notification_listeners" msgid="1366386609506834717">"इंस्टॉल केलेल्या कोणत्याही अ‍ॅप्सने सूचना प्रवेशाची विनंती केली नाही."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> ला सूचना अ‍ॅक्सेस करण्याची अनुमती द्यायची का?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"संपर्क नावे आणि तुम्हाला येणारे एसएमएस यासारख्या वैयक्तिक माहितीच्या समावेशासह <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> सर्व सूचना पाहू शकेल. ते त्यांच्यामधील सूचनांमध्ये बदल करू शकेल किंवा त्यांना डिसमिस करू शकेल अथवा त्यामध्ये असलेली अ‍ॅक्शन बटणे ट्रिगर करू शकेल. \n\nयामुळे अॅपला व्यत्यय आणू नका सुरू किंवा बंद करता येईल आणि संबंधित सेटिंग्ज बदलता येतील."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"संपर्क नावे आणि तुम्हाला येणारे एसएमएस यासारख्या वैयक्तिक माहितीच्या समावेशासह <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> सर्व सूचना पाहू शकेल. ते त्यांच्यामधील सूचनांमध्ये बदल करू शकेल किंवा त्यांना डिसमिस करू शकेल अथवा त्यामध्ये असलेली अ‍ॅक्शन बटणे ट्रिगर करू शकेल. \n\nयामुळे ॲपला व्यत्यय आणू नका सुरू किंवा बंद करता येईल आणि संबंधित सेटिंग्ज बदलता येतील."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी सूचना प्रवेशास अनुमती द्यायची?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर मेसेज यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे अॅपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर मेसेज यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे ॲपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"तुम्ही <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> साठी सूचनांमधील प्रवेश बंद केल्यास, व्यत्यय आणू नका मधील प्रवेश देखील बंद केला जाऊ शकतो."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"बंद करा"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"रद्द करा"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"VR मदतकर्ता सेवा"</string>
-    <string name="no_vr_listeners" msgid="7675484190394450979">"कोणत्याही इंस्टॉल अॅप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
+    <string name="no_vr_listeners" msgid="7675484190394450979">"कोणत्याही इंस्टॉल ॲप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
     <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी VR सेवा प्रवेशाची अनुमती द्यायची?"</string>
-    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"तुम्ही आभासी वास्तविकता मोडमध्ये अॅप्लिकेशन वापरता तेव्हा <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चालविण्यास सक्षम असेल."</string>
+    <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"तुम्ही आभासी वास्तविकता मोडमध्ये ॲप्लिकेशन वापरता तेव्हा <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चालविण्यास सक्षम असेल."</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"डिव्हाइस VR मध्ये असताना"</string>
     <string name="display_vr_pref_low_persistence" msgid="3132583929174794245">"अस्पष्टता कमी करा (शिफारस केलेले)"</string>
     <string name="display_vr_pref_off" msgid="4681320968818852691">"फ्लिकर कमी करा"</string>
     <string name="picture_in_picture_title" msgid="4960733106166035448">"चित्रा-मध्ये-चित्र"</string>
-    <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"कोणतेही इंस्टॉल केलेली अॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
+    <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"कोणतेही इंस्टॉल केलेली अ‍ॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"चि. म. चि. चित्रामध्ये"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"चित्रा मध्‍ये चित्र"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"चित्रामध्‍ये चित्राची अनुमती द्या"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"अ‍ॅप खुले असताना किंवा तुम्ही ते सोडल्यानंतर या अ‍ॅपला चित्रामध्ये चित्र विंडो तयार करण्याची परवानगी द्या (उदाहरणार्थ, व्हिडिओ पाहणे सुरू ठेवणे). ही विंडो तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या वरती दिसते."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"व्यत्यय आणू नका ची अनुमती द्या"</string>
-    <string name="zen_access_empty_text" msgid="7667538993781607731">"कोणत्याही इंस्टॉल केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
-    <string name="loading_notification_apps" msgid="1978345231934072091">"अॅप्स लोड करत आहे..."</string>
+    <string name="zen_access_empty_text" msgid="7667538993781607731">"कोणत्याही इंस्टॉल केलेल्या ॲप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
+    <string name="loading_notification_apps" msgid="1978345231934072091">"अ‍ॅप्स लोड करत आहे..."</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"तुमच्या विनंतीनुसार Android या अ‍ॅपच्या सूचना, या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"तुमच्या विनंतीनुसार Android, सूचनांच्या या वर्गवारीचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"तुमच्या विनंतीनुसार Android, सूचनांच्या या समूहाचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
@@ -3397,9 +3399,9 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्गवाऱ्या</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> वर्गवारी</item>
     </plurals>
-    <string name="no_channels" msgid="8884254729302501652">"या अॅपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
+    <string name="no_channels" msgid="8884254729302501652">"या ॲपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
     <string name="app_settings_link" msgid="8465287765715790984">"अ‍ॅपमधील अतिरिक्त सेटिंग्ज"</string>
-    <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"सर्व अॅप्ससाठी सुरू"</string>
+    <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"सर्व ॲप्ससाठी सुरू"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अ‍ॅप्ससाठी बंद</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अ‍ॅपसाठी बंद</item>
@@ -3502,7 +3504,7 @@
     <string name="zen_mode_reminders" msgid="7560664194610054038">"रिमाइंडरना अनुमती द्या"</string>
     <string name="zen_mode_reminders_list" msgid="7347061314032326677">"रिमाइंडर्स"</string>
     <string name="zen_mode_events" msgid="5784076928339534984">"इव्हेंटना अनुमती द्या"</string>
-    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"अॅप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
+    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"ॲप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"अ‍ॅप अपवाद"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
       <item quantity="other"><xliff:g id="NUMBER">%1$d</xliff:g> अ‍ॅप्सच्या सूचना व्यत्यय आणू नका ला ओव्हरराइड करू शकतात</item>
@@ -3626,7 +3628,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="3477934429220828771">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="3901636077467389637">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
     <string name="filter_all_apps" msgid="4042756539846043675">"सर्व अ‍ॅप्स"</string>
-    <string name="filter_enabled_apps" msgid="5888459261768538489">"इंस्टॉल केलेली अॅप्स"</string>
+    <string name="filter_enabled_apps" msgid="5888459261768538489">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="filter_instant_apps" msgid="8087483282854072366">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"वैयक्तिक"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"कार्य"</string>
@@ -3640,9 +3642,9 @@
     <string name="configure_apps" msgid="4066683118857400943">"अ‍ॅप्स कॉन्‍फिगर करा"</string>
     <string name="unknown_app" msgid="2312052973570376877">"अज्ञात अ‍ॅप"</string>
     <string name="app_permissions" msgid="3215958256821756086">"परवानगी व्यवस्थापक"</string>
-    <string name="app_permissions_summary" msgid="8785798165776061594">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अॅप्स"</string>
+    <string name="app_permissions_summary" msgid="8785798165776061594">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अ‍ॅप्स"</string>
     <string name="tap_to_wake" msgid="1902991239401652323">"सक्रिय करण्यासाठी टॅप करा"</string>
-    <string name="tap_to_wake_summary" msgid="8485222120721006793">"डिव्हाइस अॅक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
+    <string name="tap_to_wake_summary" msgid="8485222120721006793">"डिव्हाइस ॲक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
     <string name="domain_urls_title" msgid="7939209950373945367">"उघडणाऱ्या लिंक"</string>
     <string name="domain_urls_summary_none" msgid="5401203416941265109">"सपोर्टेड लिंक उघडू नका"</string>
     <string name="domain_urls_summary_one" msgid="3893975485064803435">"<xliff:g id="DOMAIN">%s</xliff:g> उघडा"</string>
@@ -3660,7 +3662,7 @@
     <string name="assist_and_voice_input_title" msgid="324148194703846130">"साहाय्य आणि व्हॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="2060846994203235317">"साहाय्य अ‍ॅप"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला तुमचा साहाय्यक बनवायचे?"</string>
-    <string name="assistant_security_warning" msgid="1304057692847069938">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा अॅप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्‍यात साहाय्यक सक्षम असेल."</string>
+    <string name="assistant_security_warning" msgid="1304057692847069938">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा ॲप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टम वरील वापरात असलेल्या ॲप्सविषयी माहिती वाचण्‍यात साहाय्यक सक्षम असेल."</string>
     <string name="assistant_security_warning_agree" msgid="5105692801460137289">"सहमत आहे"</string>
     <string name="assistant_security_warning_disagree" msgid="4217490999193100459">"सहमत नाही"</string>
     <string name="choose_voice_input_title" msgid="5369311838580756359">"व्हॉइस इनपुट निवडा"</string>
@@ -3691,14 +3693,14 @@
     <string name="high_power_apps" msgid="2518319744362028920">"बॅटरी ऑप्टिमायझेशन"</string>
     <string name="additional_battery_info" msgid="6877663897819271203">"वापरासंबंधी सूचना"</string>
     <string name="show_all_apps" msgid="5442552004569634846">"पूर्ण डिव्हाइस वापर दाखवा"</string>
-    <string name="hide_extra_apps" msgid="6798261081113299441">"अॅपचा वापर दाखवा"</string>
+    <string name="hide_extra_apps" msgid="6798261081113299441">"ॲपचा वापर दाखवा"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="4658343710126205199">
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> अ‍ॅप्‍स अस्वाभाविकपणे काम करत आहेत</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> अस्वाभाविकपणे काम करत आहे</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="63134064262760835">
       <item quantity="other">बॅटरी संपवणारे अ‍ॅप्स</item>
-      <item quantity="one">बॅटरी संपवण्‍ाारे <xliff:g id="APP">%1$s</xliff:g></item>
+      <item quantity="one">बॅटरी संपवणारे <xliff:g id="APP">%1$s</xliff:g></item>
     </plurals>
     <string name="high_power_filter_on" msgid="5294209328473386403">"ऑप्टिमाइझ न केलेले"</string>
     <string name="high_power_on" msgid="3573501822510580334">"ऑप्टिमाइझ न केलेले"</string>
@@ -3715,8 +3717,8 @@
     <string name="additional_permissions" msgid="3142290772324571654">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="714264060348056246">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1390719492733882678">"बग रीपोर्ट शेअर करायचा?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="5133489230646384192">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अ‍ॅप्स आणि डेटा शेअर केले जाऊ शकतात."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="6680361103125933760">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अ‍ॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="3814787466701526359">"हा बग रीपोर्ट आपल्या IT प्रशासकासह शेअर केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
     <string name="share_remote_bugreport_action" msgid="8600797271670537888">"शेअर करा"</string>
     <string name="decline_remote_bugreport_action" msgid="706319275774199033">"नकार द्या"</string>
@@ -3753,12 +3755,12 @@
     <string name="background_check_pref" msgid="664081406854758392">"पार्श्वभूमी तपासणे"</string>
     <string name="background_check_title" msgid="4136736684290307970">"पूर्ण पार्श्वभूमी प्रवेश"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"स्क्रीनवरील मजकूर वापरा"</string>
-    <string name="assist_access_context_summary" msgid="5867997494395842785">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_context_summary" msgid="5867997494395842785">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक ॲपला अनुमती द्या"</string>
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"स्क्रीनशॉट वापरा"</string>
-    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक ॲपला अनुमती द्या"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"स्क्रीन फ्लॅश करा"</string>
-    <string name="assist_flash_summary" msgid="6697095786317559129">"साहाय्य अ‍ॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूर अॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
-    <string name="assist_footer" msgid="7030121180457472165">"साहाय्यक अॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर तुम्हाला मदत करू शकतात. काही अॅप्स तुम्हाला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना सपोर्ट करतात."</string>
+    <string name="assist_flash_summary" msgid="6697095786317559129">"साहाय्य अ‍ॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूर ॲक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
+    <string name="assist_footer" msgid="7030121180457472165">"साहाय्यक अ‍ॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर तुम्हाला मदत करू शकतात. काही अ‍ॅप्स तुम्हाला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना सपोर्ट करतात."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"सरासरी मेमरी वापर"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"कमाल मेमरी वापर"</string>
     <string name="memory_usage" msgid="7963253555330830906">"मेमरी वापर"</string>
@@ -3780,11 +3782,11 @@
     <string name="running_frequency" msgid="7545170806968474449">"वारंवारता"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"कमाल वापर"</string>
     <string name="no_data_usage" msgid="903383745620135746">"डेटा वापरला गेलेला नाही"</string>
-    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> वर व्यत्यय आणू नका ला अॅक्सेस द्यायचा का?"</string>
+    <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> वर व्यत्यय आणू नका ला ॲक्सेस द्यायचा का?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"व्यत्यय आणू नका चालू/बंद करण्‍यात आणि संबंधित स्‍ट्रिंगमध्‍ये बदल करण्‍यात अ‍ॅप सक्षम असेल."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"सूचना प्रवेश चालू असल्याने चालू केलेले ठेवणे आवश्यक आहे"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका मध्‍ये प्रवेश करणे रद्द करायचे?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"या अॅपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"या ॲपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
     <string name="ignore_optimizations_on" msgid="4373971641328943551">"ऑप्टिमाइझ करू नका"</string>
     <string name="ignore_optimizations_off" msgid="4372289432580282870">"ऑप्टिमाइझ करा"</string>
     <string name="ignore_optimizations_on_desc" msgid="2904484569799521559">"तुमची बॅटरी खूप लवकर संपवू शकते. यापुढे अ‍ॅप बॅकग्राउंड बॅटरी वापरण्यापासून प्रतिबंधित नसेल."</string>
@@ -3795,7 +3797,7 @@
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"<xliff:g id="COUNT_0">%1$d</xliff:g> पैकी <xliff:g id="COUNT_1">%2$d</xliff:g> वर्ण वापरले"</string>
     <string name="draw_overlay" msgid="2878665072530660668">"इतर अ‍ॅप्सवर डिस्प्ले करा"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
-    <string name="system_alert_window_apps_title" msgid="9188448296493699566">"अॅप्स"</string>
+    <string name="system_alert_window_apps_title" msgid="9188448296493699566">"अ‍ॅप्स"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="permit_draw_overlay" msgid="9039092257052422344">"इतर अ‍ॅप्सच्या वर प्रदर्शित करू द्या"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"या अ‍ॅपला तुम्ही वापरत असलेल्या इतर अ‍ॅप्सच्या शीर्षस्थानी प्रदर्शित होण्याची अनुमती द्या. ते आपल्या त्या अ‍ॅप्सच्या वापरात हस्तक्षेप करू शकते किंवा त्यांच्या दिसण्यात किंवा वर्तणुकीत बदल करू शकते."</string>
@@ -3809,14 +3811,14 @@
     <string name="keywords_install_other_apps" msgid="5383559540695847668">"अज्ञात स्रोत अ‍ॅप्स इंस्टॉल करा"</string>
     <string name="write_settings" msgid="9009040811145552108">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"सिस्टम सेटिंग्ज सुधारित करा लिहा"</string>
-    <string name="write_settings_summary" msgid="4650251358459404247">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍यासाठी <xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अॅप्सनी अनुमती दिली"</string>
+    <string name="write_settings_summary" msgid="4650251358459404247">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍यासाठी <xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> ॲप्सनी अनुमती दिली"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"वित्तीय अ‍ॅप्स एसएमएस अ‍ॅक्सेस"</string>
-    <string name="filter_install_sources_apps" msgid="4519839764020866701">"इतर अॅप्स इंस्टॉल करू शकतात"</string>
+    <string name="filter_install_sources_apps" msgid="4519839764020866701">"इतर अ‍ॅप्स इंस्टॉल करू शकतात"</string>
     <string name="filter_write_settings_apps" msgid="6864144615530081121">"सिस्‍टीम सेटिंग्ज सुधारित करू शकतात"</string>
     <string name="write_settings_title" msgid="5852614614193830632">"सिस्‍टीम सेटिंग्ज सुधारित करू शकतात"</string>
     <string name="write_system_settings" msgid="20450765210832463">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"सिस्‍टम सेटिंग्‍ज सुधारण्‍याची अनुमती द्या"</string>
-    <string name="write_settings_description" msgid="2536706293042882500">"ही परवानगी अॅपला सिस्टम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
+    <string name="write_settings_description" msgid="2536706293042882500">"ही परवानगी ॲपला सिस्टम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
     <string name="write_settings_on" msgid="7328986337962635118">"होय"</string>
     <string name="write_settings_off" msgid="5708257434958406202">"नाही"</string>
     <string name="external_source_switch_title" msgid="5947220058496373178">"या स्त्रोतातून अनुमती द्या"</string>
@@ -3827,7 +3829,7 @@
     <string name="screen_zoom_title" msgid="164369086350486104">"डिस्प्ले आकार"</string>
     <string name="screen_zoom_short_summary" msgid="5508079362742276703">"स्क्रीनवरील आयटम आणखी लहान-मोठे करा"</string>
     <string name="screen_zoom_keywords" msgid="8358462497896524092">"डिस्प्ले घनता, स्क्रीन झूम, मापन, मापन करत आहे"</string>
-    <string name="screen_zoom_summary" msgid="5294003755961312560">"तुमच्या स्क्रीनवरील आयटम आणखी लहानमोठे करा. त्याने तुमच्या स्क्रीनवरील काही अॅप्सची जागा बदलू शकते."</string>
+    <string name="screen_zoom_summary" msgid="5294003755961312560">"तुमच्या स्क्रीनवरील आयटम आणखी लहानमोठे करा. त्याने तुमच्या स्क्रीनवरील काही ॲप्सची जागा बदलू शकते."</string>
     <string name="screen_zoom_preview_title" msgid="2924312934036753091">"पूर्वावलोकन"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="1374501139722916729">"आणखी लहान करा"</string>
     <string name="screen_zoom_make_larger_desc" msgid="5306684807895846141">"आणखी मोठे करा"</string>
@@ -3849,16 +3851,16 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्ससाठी बंद</item>
       <item quantity="one">1 अ‍ॅपसाठी बंद</item>
     </plurals>
-    <string name="notification_summary_none" msgid="5003043219430054784">"सर्व अॅप्ससाठी चालू"</string>
-    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> अॅप्स इंस्टॉल केले"</string>
-    <string name="apps_summary_example" msgid="3011143598675185269">"24 अॅप्स इंस्टॉल केली"</string>
+    <string name="notification_summary_none" msgid="5003043219430054784">"सर्व ॲप्ससाठी चालू"</string>
+    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्स इंस्टॉल केले"</string>
+    <string name="apps_summary_example" msgid="3011143598675185269">"24 अ‍ॅप्स इंस्टॉल केली"</string>
     <string name="storage_summary" msgid="4835916510511133784">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> वापरले - <xliff:g id="FREE_SPACE">%2$s</xliff:g> मोकळे"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"अंतर्गत स्टोरेज: <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापरले - <xliff:g id="FREE_SPACE">%2$s</xliff:g> मोकळे"</string>
     <string name="display_summary" msgid="5725269449657325797">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> च्या निष्क्रियतेनंतर निष्क्रिय करा"</string>
     <string name="display_dashboard_summary" msgid="7678566148167010682">"वॉलपेपर, निष्क्रिय करा, फॉंट आकार"</string>
     <string name="display_dashboard_summary_with_style" msgid="8981059474501210956">"शैली आणि वॉलपेपर, स्लीप, फॉंटचा आकार"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="8612534364908229000">"झोप, फाँटचा आकार"</string>
-    <string name="display_summary_example" msgid="4555020581960719296">"10 मिनिटे काहीच अॅक्टिव्हिटी नसेल तर निष्क्रिय करा"</string>
+    <string name="display_summary_example" msgid="4555020581960719296">"10 मिनिटे काहीच ॲक्टिव्हिटी नसेल तर निष्क्रिय करा"</string>
     <string name="memory_summary" msgid="9121871336058042600">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> पैकी सरासरी <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमरी वापरली"</string>
     <string name="users_summary" msgid="6693338169439092387">"<xliff:g id="USER_NAME">%1$s</xliff:g> म्हणून साइन इन केले"</string>
     <string name="payment_summary" msgid="1381646849276543242">"<xliff:g id="APP_NAME">%1$s</xliff:g> डीफॉल्ट आहे"</string>
@@ -3874,9 +3876,9 @@
     <string name="disabled_by_policy_title_suspend_packages" msgid="4254714213391802322">"हे अ‍ॅप उघडू शकत नाही"</string>
     <string name="default_admin_support_msg" msgid="5789424433689798637">"तुम्हाला कोणतेही प्रश्न असल्यास, तुमच्या आयटी प्रशासकाशी संपर्क साधा"</string>
     <string name="admin_support_more_info" msgid="8737842638087863477">"अधिक तपशील"</string>
-    <string name="admin_profile_owner_message" msgid="3199544166281052845">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट अॅक्सेस, नेटवर्क अॅक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित अॅप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
-    <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट अॅक्सेस, नेटवर्क अॅक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित अॅप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
-    <string name="admin_device_owner_message" msgid="1823477572459610869">"तुमच्या प्रशासकाकडे तुमच्या नेटवर्क अॅक्टिव्हिटी तसेच या डीव्हाइसशी संबधित सेटिंग्ज, कॉर्पोरेट अॅक्सेस, परवानग्या यांसह अॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
+    <string name="admin_profile_owner_message" msgid="3199544166281052845">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट ॲक्सेस, नेटवर्क ॲक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित ॲप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
+    <string name="admin_profile_owner_user_message" msgid="2991249382056855531">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट ॲक्सेस, नेटवर्क ॲक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित ॲप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
+    <string name="admin_device_owner_message" msgid="1823477572459610869">"तुमच्या प्रशासकाकडे तुमच्या नेटवर्क ॲक्टिव्हिटी तसेच या डीव्हाइसशी संबधित सेटिंग्ज, कॉर्पोरेट ॲक्सेस, परवानग्या यांसह अ‍ॅप्स आणि डेटा यांचे परीक्षण आणि व्यवस्थापन करण्याची क्षमता आहे."</string>
     <string name="condition_turn_off" msgid="4395150881365143558">"बंद करा"</string>
     <string name="condition_turn_on" msgid="1699088245481841159">"चालू करा"</string>
     <string name="condition_expand_show" msgid="4118818022763913777">"दर्शवा"</string>
@@ -3894,7 +3896,7 @@
     <string name="condition_bg_data_title" msgid="184684435298857712">"डेटा सेव्‍हर"</string>
     <string name="condition_bg_data_summary" msgid="5194942860807136682">"वैशिष्ट्ये प्रतिबंधित केलेली आहेत"</string>
     <string name="condition_work_title" msgid="9046811302347490371">"कार्य प्रोफाइल बंद आहे"</string>
-    <string name="condition_work_summary" msgid="5586134491975748565">"अॅप्स आणि सूचनांसाठी"</string>
+    <string name="condition_work_summary" msgid="5586134491975748565">"अ‍ॅप्स आणि सूचनांसाठी"</string>
     <string name="condition_device_muted_action_turn_on_sound" msgid="5849285946804815263">"ध्वनी सुरू करा"</string>
     <string name="condition_device_muted_title" msgid="3930542786434609976">"रिंगर म्यूट केला आहे"</string>
     <string name="condition_device_muted_summary" msgid="3101055117680109021">"कॉल आणि सूचनांसाठी"</string>
@@ -3956,7 +3958,7 @@
     <string name="data_limit" msgid="5793521160051596228">"डेटा मर्यादा"</string>
     <string name="data_usage_template" msgid="6848274347956096882">"<xliff:g id="ID_1">%1$s</xliff:g> दरम्यान <xliff:g id="ID_2">%2$s</xliff:g> वापरले"</string>
     <string name="configure" msgid="8232696842838580549">"कॉन्फिगर करा"</string>
-    <string name="data_usage_other_apps" msgid="7002491980141402084">"वापरामध्ये समाविष्‍ट केलेली इतर अॅप्स"</string>
+    <string name="data_usage_other_apps" msgid="7002491980141402084">"वापरामध्ये समाविष्‍ट केलेली इतर अ‍ॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
       <item quantity="other">डेटा सेव्हर चालू असताना <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगांना अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
       <item quantity="one"> डेटा सेव्हर चालू असताना 1 अनुप्रयोगास अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
@@ -4061,7 +4063,7 @@
     <string name="page_tab_title_summary" msgid="4824744863994538006">"सर्व"</string>
     <string name="page_tab_title_support" msgid="5569262185010367870">"टिपा आणि सपोर्ट"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"सर्वात लहान रुंदी"</string>
-    <string name="premium_sms_none" msgid="940723020871007898">"इंस्टॉल केलेल्या कोणत्याही अॅप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
+    <string name="premium_sms_none" msgid="940723020871007898">"इंस्टॉल केलेल्या कोणत्याही ॲप्सनी प्रीमियम SMS प्रवेशाची विनंती केली नाही"</string>
     <string name="premium_sms_warning" msgid="7604011651486294515">"प्रीमियम SMS मुळे तुम्हाला कदाचित शुल्क द्यावे लागू शकेल आणि आपल्या कॅरियर बिलिंग मध्ये जोडले जाईल. तुम्ही अ‍ॅपसाठी परवानगी सक्षम केल्यास, तो अ‍ॅप वापरून तुम्ही प्रीमियम SMS पाठविण्यात सक्षम असाल."</string>
     <string name="premium_sms_access" msgid="4550027460595822851">"प्रीमियम SMS प्रवेश"</string>
     <string name="bluetooth_disabled" msgid="6588102116819268238">"बंद"</string>
@@ -4113,7 +4115,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="5932411386316771246">"अधिक जलद सेल्फी घ्या"</string>
     <string name="swipe_up_to_switch_apps_summary" msgid="4644068184114154787">"अ‍ॅप्स स्विच करण्यासाठी, होम बटणास वरील बाजूस स्वाइप करा. सर्व अ‍ॅप्स पाहण्यासाठी पुन्हा वर स्वाइप करा. हे कोणत्याही स्क्रीनवरून काम करते. तुमच्या स्क्रीनच्या तळाशी उजवीकडे यापुढे ओव्हरव्ह्यू बटण असणार नाही."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="7641846365137536128">"नवीन होम बटण वापरून पाहा"</string>
-    <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"अॅप्स स्विच करण्यासाठी नवीन जेश्चर सुरू करा"</string>
+    <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="7338653224520387852">"अ‍ॅप्स स्विच करण्यासाठी नवीन जेश्चर सुरू करा"</string>
     <string name="ambient_display_title" product="default" msgid="6785677099744344088">"फोन तपासण्‍यासाठी दोनदा टॅप करा"</string>
     <string name="ambient_display_title" product="tablet" msgid="1106285490888683613">"टॅब्लेट तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="device" msgid="5064644474876041478">"डिव्हाइस तपासण्‍यासाठी दोनदा टॅप करा"</string>
@@ -4147,7 +4149,7 @@
     <string name="web_action_enable_summary" msgid="1729016644691793085">"अ‍ॅप्समध्ये लिंक उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
     <string name="web_action_section_title" msgid="5563229447734734662">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="instant_apps_settings" msgid="879003203555847537">"इंस्टंट अ‍ॅप्स प्राधान्ये"</string>
-    <string name="domain_url_section_title" msgid="206403507921518321">"इंस्टॉल केलेली अॅप्स"</string>
+    <string name="domain_url_section_title" msgid="206403507921518321">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="2630083316417707308">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
     <string name="account_for_section_header" msgid="5975241715840642563">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
     <string name="configure_section_header" msgid="6988981883075615136">"कॉन्फिगर करा"</string>
@@ -4173,11 +4175,11 @@
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"सर्वात अलीकडील बग रीपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"सर्वात अलीकडील सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"काहीही नाही"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"इंस्टॉल केलेली अॅप्स"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"इंस्टॉल केलेली अ‍ॅप्स"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"अ‍ॅपची संख्या अंदाजित आहे. त्यामध्ये कदाचित Play स्टोअर च्या बाहेर इंस्टॉल केलेली अ‍ॅप्स समाविष्ट नसतील."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
       <item quantity="other">किमान <xliff:g id="COUNT_1">%d</xliff:g> अ‍ॅप्स</item>
-      <item quantity="one">किमान <xliff:g id="COUNT_0">%d</xliff:g> अॅप</item>
+      <item quantity="one">किमान <xliff:g id="COUNT_0">%d</xliff:g> ॲप</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"स्थान परवानग्या"</string>
     <string name="enterprise_privacy_microphone_access" msgid="4586428105675460207">"मायक्रोफोन परवानग्या"</string>
@@ -4214,25 +4216,25 @@
     <string name="learn_more" msgid="6844160787130206258">"अधिक जाणून घ्या"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8762954032197483848">
       <item quantity="other">कॅमेरा अ‍ॅप्स</item>
-      <item quantity="one">कॅमेरा अॅप</item>
+      <item quantity="one">कॅमेरा ॲप</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="6484001237347739255">"कॅलेंडर अ‍ॅप"</string>
     <string name="default_contacts_app_title" msgid="1050372162465746272">"संपर्क अ‍ॅप"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="6875559046625447168">
       <item quantity="other">ईमेल क्लायंट अ‍ॅप्स</item>
-      <item quantity="one">ईमेल क्लायंट अॅप</item>
+      <item quantity="one">ईमेल क्लायंट ॲप</item>
     </plurals>
     <string name="default_map_app_title" msgid="6919751358166607185">"नकाशा अ‍ॅप"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="7593838689002912108">
       <item quantity="other">फोन अ‍ॅप्स</item>
-      <item quantity="one">फोन अॅप</item>
+      <item quantity="one">फोन ॲप</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="5129064036161862327">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="1890829312367477559">"फोटो आणि व्हिडिओ"</string>
     <string name="storage_music_audio" msgid="3661289086715297149">"संगीत आणि ऑडिओ"</string>
     <string name="storage_games" msgid="7740038143749092373">"गेम"</string>
-    <string name="storage_other_apps" msgid="3202407095387420842">"अन्य अॅप्स"</string>
+    <string name="storage_other_apps" msgid="3202407095387420842">"अन्य अ‍ॅप्स"</string>
     <string name="storage_files" msgid="2087824267937487880">"फायली"</string>
     <string name="storage_size_large_alternate" msgid="1317796542509105857">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
     <string name="storage_volume_total" msgid="5021484171514159913">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
@@ -4247,7 +4249,7 @@
     <string name="webview_disabled_for_user" msgid="8057805373224993504">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="3990765434980280073">"ऑटोफिल सेवा"</string>
     <string name="autofill_keywords" msgid="7717726766232862218">"स्वयं, भरा, स्वयंभरण"</string>
-    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;तुमचा या अॅपवर विश्वास असल्याची खात्री करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
+    <string name="autofill_confirmation_message" msgid="1385894598730361304">"&lt;b&gt;तुमचा या ॲपवर विश्वास असल्याची खात्री करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
     <string name="debug_autofill_category" msgid="6262526615416295645">"ऑटोफिल"</string>
     <string name="autofill_logging_level_title" msgid="2577340324541102626">"लॉगिंग पातळी"</string>
     <string name="autofill_max_partitions" msgid="125269645910590057">"प्रति सेशन कमाल विनंत्या"</string>
@@ -4263,7 +4265,7 @@
     <string name="storage_manager_indicator_on" msgid="5295306384982062320">"चालू"</string>
     <string name="install_type_instant" msgid="6248487669862821874">"इन्सटंट अ‍ॅप"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"स्टोरेज व्यवस्थापक बंद करायचा?"</string>
-    <string name="storage_movies_tv" msgid="7282484273991655296">"चित्रपट आणि टीव्ही अॅप्स"</string>
+    <string name="storage_movies_tv" msgid="7282484273991655296">"चित्रपट आणि टीव्ही अ‍ॅप्स"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"वाहक तरतूद माहिती"</string>
     <string name="trigger_carrier_provisioning" msgid="6284005970057901477">"वाहक तरतूद ट्रिगर करा"</string>
     <string name="zen_suggestion_title" msgid="2134699720214231950">"व्यत्यय आणू नका अपडेट करा"</string>
@@ -4273,13 +4275,15 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"हे तुमच्या फोनला धिमे करेल"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"पूर्ण GNSS मापांची सक्ती करा"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
-    <string name="allow_background_activity_starts" msgid="6754016668813082728">"बॅकग्राउंड अॅक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
-    <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"सर्व बॅकग्राउंड अॅक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"वापरकर्ता स्विच करताना डीबग करा"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"वापरकर्ता स्विच करताना तपशीलवार माहिती दाखवा"</string>
+    <string name="allow_background_activity_starts" msgid="6754016668813082728">"बॅकग्राउंड ॲक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
+    <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"सर्व बॅकग्राउंड ॲक्टिव्हिटीला सुरू होण्याची अनुमती द्या"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"नेहमी क्रॅश डायलॉग दाखवा"</string>
     <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"अ‍ॅप क्रॅश झाल्यावर प्रत्येक वेळी डायलॉग दाखवा"</string>
     <string name="angle_enabled_app" msgid="4359266182151708733">"ANGLE सुरू केलेले अ‍ॅप निवडा"</string>
-    <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"कोणतेही ANGLE सुरू केलेले अॅप्लिकेशन सेट करा"</string>
-    <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE सुरू केलेले अॅप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"कोणतेही ANGLE सुरू केलेले ॲप्लिकेशन सेट करा"</string>
+    <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE सुरू केलेले ॲप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="game_driver_dashboard_title" msgid="219443350404091201">"गेम ड्रायव्हर प्राधान्ये"</string>
     <string name="game_driver_dashboard_summary" msgid="1500674075618790528">"गेम ड्रायव्हर सेटिंग्जमध्ये सुधारणा करा"</string>
     <string name="game_driver_footer_text" msgid="1540158284161797913">"गेम ड्रायव्हर सुरू केल्यावर, तुम्ही डिव्हाइसवर इंस्टॉल केलेल्या अ‍ॅप्ससाठी अपडेट केलेले ग्राफिक्स वापरण्याचे निवडू शकता."</string>
@@ -4300,8 +4304,8 @@
     <string name="my_device_info_account_preference_title" msgid="7965847995028952373">"खाते"</string>
     <string name="my_device_info_device_name_preference_title" msgid="7384446683248009296">"डिव्हाइसचे नाव"</string>
     <string name="change_wifi_state_title" msgid="5140754955787584174">"वाय-फाय नियंत्रण"</string>
-    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"अॅपला वाय-फाय नियंत्रित करू द्या"</string>
-    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"या अॅपला वाय-फाय चालू किंवा बंद करू द्या, वाय-फाय नेटवर्क स्कॅन करू द्या आणि त्याच्याशी कनेक्ट करू द्या, नेटवर्क जोडू किंवा काढू द्या किंवा केवळ-स्थानिक हॉटस्पॉट सुरू करू द्या"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="6489090744937816260">"ॲपला वाय-फाय नियंत्रित करू द्या"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="614854822469259860">"या ॲपला वाय-फाय चालू किंवा बंद करू द्या, वाय-फाय नेटवर्क स्कॅन करू द्या आणि त्याच्याशी कनेक्ट करू द्या, नेटवर्क जोडू किंवा काढू द्या किंवा केवळ-स्थानिक हॉटस्पॉट सुरू करू द्या"</string>
     <string name="media_output_title" msgid="8710632337456601848">"मीडिया प्‍ले करा"</string>
     <string name="media_output_default_summary" msgid="3159237976830415584">"हे डिव्हाइस"</string>
     <string name="media_output_summary" product="default" msgid="6294261435613551178">"फोन"</string>
@@ -4325,7 +4329,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="3509459199090688328">"सुरू (म्‍यूट)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="5152618221093037451">"बंद"</string>
     <string name="pref_title_network_details" msgid="3971074015034595956">"नेटवर्क तपशील"</string>
-    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील अॅप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
+    <string name="about_phone_device_name_warning" msgid="9088572775969880106">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील ॲप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
     <string name="devices_title" msgid="4768432575951993648">"डिव्हाइस"</string>
     <string name="homepage_all_settings" msgid="3201220879559136116">"सर्व सेटिंग्ज"</string>
     <string name="homepage_personal_settings" msgid="7472638597249114564">"सूचना"</string>
@@ -4377,7 +4381,7 @@
     <string name="carrier_settings_title" msgid="7989949967020825268">"वाहक सेटिंग्ज"</string>
     <string name="cdma_lte_data_service" msgid="8996857851150069339">"डेटा सेवा सेट करा"</string>
     <string name="mobile_data_settings_title" msgid="3439626666647519547">"मोबाइल डेटा"</string>
-    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क वापरून डेटा अॅक्सेस करा"</string>
+    <string name="mobile_data_settings_summary" msgid="6492798151325636912">"मोबाइल नेटवर्क वापरून डेटा ॲक्सेस करा"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="3665863214578471494">"रेंजमध्ये असताना फोन आपोआप या वाहकावर स्विच करेल"</string>
     <string name="calls_preference" msgid="2076353032705811243">"कॉल प्राधान्य"</string>
     <string name="sms_preference" msgid="8449270011976880">"एसएमएस प्राधान्य"</string>
@@ -4399,7 +4403,7 @@
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"अधिक जोडा"</string>
     <string name="mobile_network_active_sim" msgid="7660119090716084589">"अ‍ॅक्टिव्ह / सिम"</string>
     <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"अ‍ॅक्टिव्ह नसलेले / सिम"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"अॅक्टिव्ह / डाउनलोड केलेले सिम"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"ॲक्टिव्ह / डाउनलोड केलेले सिम"</string>
     <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"अ‍ॅक्टिव्ह नसलेले / डाउनलोड केलेले सिम"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"सिम नाव"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"नाव बदला"</string>
@@ -4435,7 +4439,7 @@
     <string name="roaming_check_price_warning" msgid="5883499714594419439">"किमतींबद्दल तुमच्या नेटवर्क पुरवठादाराला विचारा."</string>
     <string name="mobile_data_usage_title" msgid="2376358672434990037">"अ‍ॅप डेटा वापर"</string>
     <string name="mobile_network_mode_error" msgid="6818434186286086554">"चुकीचा नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. दुर्लक्ष करा."</string>
-    <string name="mobile_network_apn_title" msgid="5628635067747404382">"अॅक्सेस पॉइंट"</string>
+    <string name="mobile_network_apn_title" msgid="5628635067747404382">"ॲक्सेस पॉइंट"</string>
     <string name="manual_mode_disallowed_summary" msgid="799800630000340665">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
     <string name="emergency_info_contextual_card_summary" msgid="5541444321969803486">"वैद्यकीय माहिती, आणीबाणी संपर्क"</string>
     <string name="see_more" msgid="7463940160389802632">"आणखी पाहा"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ms-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ms-nokeys/strings.xml
new file mode 100644
index 0000000..7cecc06
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ms-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Urus aplikasi"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ms/arrays.xml b/tests/CarDeveloperOptions/res/values-ms/arrays.xml
new file mode 100644
index 0000000..e7eead6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ms/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Eropah"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pasifik"</item>
+    <item msgid="7044520255415007865">"Semua"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 saat"</item>
+    <item msgid="772029947136115322">"30 saat"</item>
+    <item msgid="8743663928349474087">"1 minit"</item>
+    <item msgid="1506508631223164814">"2 minit"</item>
+    <item msgid="8664703938127907662">"5 minit"</item>
+    <item msgid="5827960506924849753">"10 minit"</item>
+    <item msgid="6677424950124253938">"30 minit"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Jangan sekali-kali"</item>
+    <item msgid="2517785806387977252">"15 saat"</item>
+    <item msgid="6347954399441173672">"30 saat"</item>
+    <item msgid="4858305253279921789">"1 minit"</item>
+    <item msgid="8109273437140044073">"2 minit"</item>
+    <item msgid="2788593551142462622">"5 minit"</item>
+    <item msgid="8012672183888404961">"10 minit"</item>
+    <item msgid="8271452751594598661">"30 minit"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Serta-merta"</item>
+    <item msgid="2038544972632026612">"5 saat"</item>
+    <item msgid="5558060663472279597">"15 saat"</item>
+    <item msgid="45341168505452037">"30 saat"</item>
+    <item msgid="227647485917789272">"1 minit"</item>
+    <item msgid="3367011891231217504">"2 minit"</item>
+    <item msgid="4376575879222393045">"5 minit"</item>
+    <item msgid="811192536981678974">"10 minit"</item>
+    <item msgid="7258394417241706272">"30 minit"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Kecil"</item>
+    <item msgid="591935967183159581">"Lalai"</item>
+    <item msgid="1714184661981538355">"Besar"</item>
+    <item msgid="6195563047686707484">"Terbesar"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Mengimbas..."</item>
+    <item msgid="5597394826455877834">"Menyambung..."</item>
+    <item msgid="5848277343965362748">"Mengesahkan…"</item>
+    <item msgid="3391238031431440676">"Mendapatkan alamat IP..."</item>
+    <item msgid="5257597310494000224">"Disambungkan"</item>
+    <item msgid="8472497592913050396">"Digantung"</item>
+    <item msgid="1228072488815999109">"Memutuskan sambungan..."</item>
+    <item msgid="7253087004422991731">"Diputuskan sambungan"</item>
+    <item msgid="4169850917304751227">"Tidak berjaya"</item>
+    <item msgid="6266658166690831131">"Disekat"</item>
+    <item msgid="4517230805854909775">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Mengimbas..."</item>
+    <item msgid="8058143476674427024">"Menyambung kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Mengesahkan dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Mendapatkan alamat IP daripada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Disambungkan kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Digantung"</item>
+    <item msgid="4133290864821295785">"Memutuskan sambungan dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Diputuskan sambungan"</item>
+    <item msgid="2847316776634969068">"Tidak berjaya"</item>
+    <item msgid="4390990424746035383">"Disekat"</item>
+    <item msgid="3618248791367063949">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Butang tekan"</item>
+    <item msgid="7401896200768713930">"PIN daripada peranti rakan"</item>
+    <item msgid="4526848028011846710">"PIN dari peranti ini"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Disambungkan"</item>
+    <item msgid="983792611851499732">"Dijemput"</item>
+    <item msgid="5438273405428201793">"Tidak berjaya"</item>
+    <item msgid="4646663015449312554">"Tersedia"</item>
+    <item msgid="3230556734162006146">"Di luar liputan"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minit"</item>
+    <item msgid="2759776603549270587">"5 minit"</item>
+    <item msgid="167772676068860015">"1 jam"</item>
+    <item msgid="5985477119043628504">"Jangan sekali-kali tamat masa"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gunakan Lalai Sistem: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Lemah"</item>
+    <item msgid="7882129634982603782">"Lemah"</item>
+    <item msgid="6457357501905996224">"Sederhana"</item>
+    <item msgid="405271628162918841">"Bagus"</item>
+    <item msgid="999948812884919584">"Sangat baik"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 hari terakhir"</item>
+    <item msgid="3211287705232736964">"Ttpkn kitar penggunaan..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Masa penggunaan"</item>
+    <item msgid="2784401352592276015">"Kali terakhir digunakan"</item>
+    <item msgid="249854287216326349">"Nama aplikasi"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Tiada"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Tiada"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Tiada"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statik"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Tiada"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Auto Konfigurasi Proksi"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Tiada"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP atau CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Tidak ditentukan"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Tiada"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Storan dalaman peranti"</item>
+    <item msgid="3186681694079967527">"Kad SD boleh tanggal"</item>
+    <item msgid="6902033473986647035">"Biar sistem menentukan"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokasi"</item>
+    <item msgid="6842381562497597649">"Peribadi"</item>
+    <item msgid="3966700236695683444">"Pemesejan"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Peranti"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"lokasi kasar"</item>
+    <item msgid="1830619568689922920">"lokasi terperinci"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"bergetar"</item>
+    <item msgid="8632513128515114092">"baca kenalan"</item>
+    <item msgid="3741042113569620272">"ubah suai kenalan"</item>
+    <item msgid="4204420969709009931">"baca log panggilan"</item>
+    <item msgid="2260380357119423209">"ubah suai log panggilan"</item>
+    <item msgid="6550710385014530934">"baca kalendar"</item>
+    <item msgid="3575906174264853951">"ubah suai kalendar"</item>
+    <item msgid="4319843242568057174">"imbasan wi-fi"</item>
+    <item msgid="2981791890467303819">"pemberitahuan"</item>
+    <item msgid="6617825156152476692">"imbasan sel"</item>
+    <item msgid="8865260890611559753">"Hubungi telefon"</item>
+    <item msgid="3254999273961542982">"baca SMS"</item>
+    <item msgid="7711446453028825171">"tulis SMS"</item>
+    <item msgid="6123238544099198034">"terima SMS"</item>
+    <item msgid="838342167431596036">"terima SMS kecemasan"</item>
+    <item msgid="8554432731560956686">"terima MMS"</item>
+    <item msgid="7464863464299515059">"terima penolakan WAP"</item>
+    <item msgid="310463075729606765">"hantar SMS"</item>
+    <item msgid="7338021933527689514">"baca SMS ICC"</item>
+    <item msgid="6130369335466613036">"tulis SMS ICC"</item>
+    <item msgid="6536865581421670942">"ubah suai tetapan"</item>
+    <item msgid="4547203129183558973">"lukiskan di atas"</item>
+    <item msgid="9080347512916542840">"pemberitahuan akses"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"rakam audio"</item>
+    <item msgid="9182794235292595296">"mainkan audio"</item>
+    <item msgid="8760743229597702019">"baca papan keratan"</item>
+    <item msgid="2266923698240538544">"ubah suai papan keratan"</item>
+    <item msgid="1801619438618539275">"butang media"</item>
+    <item msgid="31588119965784465">"tumpuan audio"</item>
+    <item msgid="7565226799008076833">"kelantangan induk"</item>
+    <item msgid="5420704980305018295">"kelantangan suara"</item>
+    <item msgid="5797363115508970204">"kelantangan deringan"</item>
+    <item msgid="8233154098550715999">"kelantangan media"</item>
+    <item msgid="5196715605078153950">"kelantangan penggera"</item>
+    <item msgid="394030698764284577">"kelantangan pemberitahuan"</item>
+    <item msgid="8952898972491680178">"kelantangan bluetooth"</item>
+    <item msgid="8506227454543690851">"kekal berjaga"</item>
+    <item msgid="1108160036049727420">"pantau lokasi"</item>
+    <item msgid="1496205959751719491">"awasi lokasi kuasa tinggi"</item>
+    <item msgid="3776296279910987380">"dapatkan statistik penggunaan"</item>
+    <item msgid="8827100324471975602">"redam/nyahredam mikrofon"</item>
+    <item msgid="6880736730520126864">"tunjukkan toast"</item>
+    <item msgid="4933375960222609935">"media projek"</item>
+    <item msgid="8357907018938895462">"aktifkan VPN"</item>
+    <item msgid="8143812849911310973">"tulis kertas dinding"</item>
+    <item msgid="6266277260961066535">"bantu struktur"</item>
+    <item msgid="7715498149883482300">"bantu tangkapan skrin"</item>
+    <item msgid="4046679376726313293">"baca keadaan telefon"</item>
+    <item msgid="6329507266039719587">"tambahkan mel suara"</item>
+    <item msgid="7692440726415391408">"gunakan sip"</item>
+    <item msgid="8572453398128326267">"proses panggilan keluar"</item>
+    <item msgid="7775674394089376306">"cap jari"</item>
+    <item msgid="3182815133441738779">"penderia badan"</item>
+    <item msgid="2793100005496829513">"baca siaran sel"</item>
+    <item msgid="2633626056029384366">"lokasi palsu"</item>
+    <item msgid="8356842191824684631">"baca storan"</item>
+    <item msgid="5671906070163291500">"tulis storan"</item>
+    <item msgid="2791955098549340418">"hidupkan skrin"</item>
+    <item msgid="5599435119609178367">"dapatkan akaun"</item>
+    <item msgid="1165623660533024666">"jalankan di latar belakang"</item>
+    <item msgid="6423861043647911030">"kelantangan kebolehaksesan"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Pendek"</item>
+    <item msgid="4816511817309094890">"Sederhana"</item>
+    <item msgid="8305084671259331134">"Panjang"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Lalai"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif diringkaskan"</item>
+    <item msgid="6529379119163117545">"Sans-serif monoruang"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monoruang"</item>
+    <item msgid="4448481989108928248">"Kasual"</item>
+    <item msgid="4627069151979553527">"Tulisan sambung"</item>
+    <item msgid="6896773537705206194">"Huruf besar bersaiz kecil"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Sangat kecil"</item>
+    <item msgid="5091603983404027034">"Kecil"</item>
+    <item msgid="176844712416932112">"Biasa"</item>
+    <item msgid="2784236342175159295">"Besar"</item>
+    <item msgid="218913203203160606">"Sangat besar"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Lalai"</item>
+    <item msgid="6488643537808152001">"Tiada"</item>
+    <item msgid="552332815156010137">"Garis bentuk"</item>
+    <item msgid="7187891159463789272">"Huruf bayang"</item>
+    <item msgid="8019330250538856521">"Timbul"</item>
+    <item msgid="8987385315647049787">"Direndahkan"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Gunakan tetapan lalai apl"</item>
+    <item msgid="8611890312638868524">"Putih pada hitam"</item>
+    <item msgid="5891360837786277638">"Hitam pada putih"</item>
+    <item msgid="2798457065945456853">"Kuning pada hitam"</item>
+    <item msgid="5799049811524553967">"Kuning pada biru"</item>
+    <item msgid="3673930830658169860">"Tersuai"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"VPN L2TP/IPSec dengan kunci prakongsi"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec dengan sijil"</item>
+    <item msgid="312397853907741968">"VPN IPSec dengan kunci prakongsi dan pengesahan Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec dengan sijil dan pengesahan Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec dengan sijil dan pengesahan hibrid"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Tiada"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Diputuskan sambungan"</item>
+    <item msgid="8754480102834556765">"Memulakan..."</item>
+    <item msgid="3351334355574270250">"Menyambung..."</item>
+    <item msgid="8303882153995748352">"Disambungkan"</item>
+    <item msgid="9135049670787351881">"Tamat masa"</item>
+    <item msgid="2124868417182583926">"Tidak berjaya"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Tanya"</item>
+    <item msgid="7718817231348607934">"Jangan benarkan"</item>
+    <item msgid="8184570120217958741">"Sentiasa benarkan"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Berterusan"</item>
+    <item msgid="167418068739176448">"Aktiviti popular"</item>
+    <item msgid="4760813290195199773">"Penting (latar depan)"</item>
+    <item msgid="2328684826817647595">"Penting (latar belakang)"</item>
+    <item msgid="7746406490652867365">"Sandaran"</item>
+    <item msgid="5597404364389196754">"Berat"</item>
+    <item msgid="1290888779300174556">"Perkhidmatan (berjalan)"</item>
+    <item msgid="7241098542073939046">"Perkhidmatan (bermula semula)"</item>
+    <item msgid="6610439017684111046">"Penerima"</item>
+    <item msgid="7367606086319921117">"Laman Utama"</item>
+    <item msgid="3344660712396741826">"Aktiviti terakhir"</item>
+    <item msgid="5006559348883303865">"Cache (aktiviti)"</item>
+    <item msgid="8633480732468137525">"Cache (klien aktiviti)"</item>
+    <item msgid="6248998242443333892">"Cache (kosong)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Hijau kebiruan"</item>
+    <item msgid="3228505970082457852">"Biru"</item>
+    <item msgid="6590260735734795647">"Biru nila"</item>
+    <item msgid="3521763377357218577">"Ungu"</item>
+    <item msgid="5932337981182999919">"Merah jambu"</item>
+    <item msgid="5642914536624000094">"Merah"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Lebih 30 hari"</item>
+    <item msgid="8699273238891265610">"Lebih 60 hari"</item>
+    <item msgid="8346279419423837266">"Lebih 90 hari"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Kesan secara automatik"</item>
+    <item msgid="773943026484148895">"Anggap sebagai bermeter"</item>
+    <item msgid="1008268820118852416">"Anggap sebagai tidak bermeter"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Gunakan MAC terawak (lalai)"</item>
+    <item msgid="214234417308375326">"Gunakan MAC peranti"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Tidak"</item>
+    <item msgid="1930581185557754880">"Ya"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Gelap"</item>
+    <item msgid="5079453644557603349">"Cerah"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Mati"</item>
+    <item msgid="4072198137051566919">"Nyahpepijat"</item>
+    <item msgid="2473005316958868509">"Berjela-jela"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Rumah sahaja"</item>
+    <item msgid="1161026694891024702">"Automatik"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA diutamakan"</item>
+    <item msgid="7581481130337402578">"GSM sahaja"</item>
+    <item msgid="8579197487913425819">"WCDMA sahaja"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA auto"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo auto"</item>
+    <item msgid="4219607161971472471">"CDMA tanpa EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo sahaja"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA sahaja"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ms/strings.xml b/tests/CarDeveloperOptions/res/values-ms/strings.xml
index d110893..f21e428 100644
--- a/tests/CarDeveloperOptions/res/values-ms/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ms/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Lindungi tablet anda dengan pilihan kunci skrin supaya tiada sesiapa yang dapat menggunakan tablet itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan pengesahan wajah. Ketik Batal, kemudian tetapkan PIN atau buat pilihan kunci skrin yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Lindungi peranti anda dengan pilihan kunci skrin supaya tiada sesiapa yang dapat menggunakan peranti itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan pengesahan wajah. Ketik Batal, kemudian tetapkan PIN atau buat pilihan kunci skrin yang lain."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Lindungi telefon anda dengan pilihan kunci skrin supaya tiada sesiapa yang dapat menggunakan telefon itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan pengesahan wajah. Ketik Batal, kemudian tetapkan PIN atau buat pilihan kunci skrin yang lain."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Langkau Persediaan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Langkau Persediaan Kta Laluan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Langkau Persediaan Corak?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Sediakan kunci skrin"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mudah alih"</item>
+    <item msgid="6007360612667098926">"Wi-Fi sahaja"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2623,7 +2625,7 @@
     <string name="header_add_an_account" msgid="8482614556580804956">"Tambah akaun"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Alih keluar akaun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Mengalih keluar akaun ini akan memadamkan semua mesej, kenalan dan data lain daripada tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Mengalih keluar akaun ini akan memadamkan semua mesej, kenalan dan data lainnya daripada telefon!"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Pengalihan keluar akaun ini akan memadamkan semua mesej, kenalan dan data lainnya daripada telefon!"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Pengalihan keluar akaun ini akan memadamkan semua mesej, kenalan dan data lainnya daripada peranti!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Perubahan ini tidak dibenarkan oleh pentadbir anda"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Tidak boleh menyegerakkan secara manual"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ciri akan memperlahan telefon ini"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Paksa ukuran GNSS penuh"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Jejak semua gugusan dan kekerapan GNSS tanpa kitaran tugas"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Nyahpepijat penukaran pengguna"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Tunjukkan maklumat terperinci semasa penukaran pengguna"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Benarkan aktiviti latar belakang bermula"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Membenarkan semua aktiviti latar belakang bermula"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Sentiasa tunjukkan dialog ranap sistem"</string>
diff --git a/tests/CarDeveloperOptions/res/values-my-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-my-nokeys/strings.xml
new file mode 100644
index 0000000..8323908
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-my-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"အပလီကေးရှင်းများကို စီမံကွပ်ကဲရန်"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-my/arrays.xml b/tests/CarDeveloperOptions/res/values-my/arrays.xml
new file mode 100644
index 0000000..c87c35c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-my/arrays.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"အမေရိကား"</item>
+    <item msgid="4791956477275129121">"ဥရောပ"</item>
+    <item msgid="3812126832016254559">"အာဖရိက"</item>
+    <item msgid="2765816300353408280">"အာရှ"</item>
+    <item msgid="6683489385344409742">"သြစတေးလျ"</item>
+    <item msgid="5194868215515664953">"ပစိဖိတ်"</item>
+    <item msgid="7044520255415007865">"အားလုံး"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ချက်ချင်း"</item>
+    <item msgid="2038544972632026612">"၅ စက္ကန့်"</item>
+    <item msgid="5558060663472279597">"၁၅ စက္ကန့်"</item>
+    <item msgid="45341168505452037">"စက္ကန့် ၃၀"</item>
+    <item msgid="227647485917789272">"၁ မိနစ်"</item>
+    <item msgid="3367011891231217504">"၂ မိနစ်"</item>
+    <item msgid="4376575879222393045">"၅ မိနစ်"</item>
+    <item msgid="811192536981678974">"၁၀ မိနစ်"</item>
+    <item msgid="7258394417241706272">"၃၀ မိနစ်"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"ချိတ်ဆက်ထားသည်"</item>
+    <item msgid="983792611851499732">"ဖိတ်ခေါ်ထားပြီး"</item>
+    <item msgid="5438273405428201793">"မအောင်မြင်ပါ"</item>
+    <item msgid="4646663015449312554">"အသုံးပြုနိုင်သည်"</item>
+    <item msgid="3230556734162006146">"စက်ကွင်းပြင်ပ"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"စနစ်မူရင်းကို အသုံးပြုရန်− <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"၁"</item>
+    <item msgid="5318020123964299318">"၂"</item>
+    <item msgid="6429260054182662738">"၃"</item>
+    <item msgid="1644506614010085798">"၄"</item>
+    <item msgid="3132506679404897150">"၅"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"နောက်ဆုံး ရက် ၃၀"</item>
+    <item msgid="3211287705232736964">"သုံးစွဲမှု စက်ဝန်း သတ်မှတ်ရန်..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"အသုံးပြုအချိန်"</item>
+    <item msgid="2784401352592276015">"နောက်ဆုံး အကြိမ် အသုံးပြုခဲ့"</item>
+    <item msgid="249854287216326349">"အပ်ပလီကေးရှင်းအမည်"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"မရှိ"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"သုံးမထားပါ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"ဆင်းမ်ကဒ်"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"မရှိ"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"မရှိ"</item>
+    <item msgid="1464741437353223198">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</item>
+    <item msgid="5793600062487886090">"ပရောက်စီ အော်တို-စီစဉ်"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"မရှိ"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP သို့မဟုတ် CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"သတ်မှတ်မထားပါ"</item>
+    <item msgid="2740477081395679090">"မြန်နှုန်းမြင့်လိုင်း"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"မြန်နှုန်းမြင့်အချက်အလက်ပို့လွှတ်ချက် (HSPA)"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"မရှိ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"စက်တွင်းသိုလှောင်ကိရိယာ"</item>
+    <item msgid="3186681694079967527">"ဖယ်ရှား၍ရသောSDကတ်"</item>
+    <item msgid="6902033473986647035">"စနစ်အား ဆုံးဖြတ်ပါစေ"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"တည်နေရာ"</item>
+    <item msgid="6842381562497597649">"ကိုယ်ရေး"</item>
+    <item msgid="3966700236695683444">"စာပို့ခြင်း"</item>
+    <item msgid="8563996233342430477">"မီဒီယာ"</item>
+    <item msgid="5323851085993963783">"စက်ပစ္စည်း"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"တည်နေရာအကြမ်း"</item>
+    <item msgid="1830619568689922920">"တည်နေရာအချော"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"တုန်ခါခြင်း"</item>
+    <item msgid="8632513128515114092">"အဆက်အသွယ်များဖတ်ရန်"</item>
+    <item msgid="3741042113569620272">"အဆက်အသွယ်များအား ပြင်ဆင်ရန်"</item>
+    <item msgid="4204420969709009931">"ခေါ်ဆိုထားသော မှတ်တမ်းကိုဖတ်ရန်"</item>
+    <item msgid="2260380357119423209">"ခေါ်ဆိုထားသော မှတ်တမ်းကို ပြင်ဆင်ရန်"</item>
+    <item msgid="6550710385014530934">"ပြက္ခဒိန်ဖတ်ရန်"</item>
+    <item msgid="3575906174264853951">"ပြက္ခဒိန်ပြင်ဆင်ရန်"</item>
+    <item msgid="4319843242568057174">"Wi-Fi  ရှာဖွေရန်"</item>
+    <item msgid="2981791890467303819">"အကြောင်းကြားချက်"</item>
+    <item msgid="6617825156152476692">"ဆဲလ်ဖြန့်ကြက်စူးစမ်းသည်"</item>
+    <item msgid="8865260890611559753">"ဖုန်းခေါ်ရန်"</item>
+    <item msgid="3254999273961542982">"စာတိုဖတ်ရန်"</item>
+    <item msgid="7711446453028825171">"စာတိုရေးရန်"</item>
+    <item msgid="6123238544099198034">"စာတိုလက်ခံရန်"</item>
+    <item msgid="838342167431596036">"အရေးပေါ်စာတိုလက်ခံရန်"</item>
+    <item msgid="8554432731560956686">"ရုပ်သံစာလက်ခံရန်"</item>
+    <item msgid="7464863464299515059">"WAP push လက်ခံရန်"</item>
+    <item msgid="310463075729606765">"စာတိုပို့ရန်"</item>
+    <item msgid="7338021933527689514">"ကဒ်ထဲမှ စာတိုဖတ်ရန်"</item>
+    <item msgid="6130369335466613036">"ICC စာတိုရေးရန်"</item>
+    <item msgid="6536865581421670942">"ဆက်တင်များ ပြင်ဆင်ရန်"</item>
+    <item msgid="4547203129183558973">"အပေါ်မှ ဆွဲရန်"</item>
+    <item msgid="9080347512916542840">"အကြောင်းကြားချက်များအား အသုံးပြုခွင့်"</item>
+    <item msgid="5332718516635907742">"ကင်မရာ"</item>
+    <item msgid="6098422447246167852">"အသံဖမ်းခြင်း"</item>
+    <item msgid="9182794235292595296">"အသံဖွင့်ခြင်း"</item>
+    <item msgid="8760743229597702019">"နောက်ခံမှတ်တမ်း ဖတ်ရန်"</item>
+    <item msgid="2266923698240538544">"နောက်ခံမှတ်တမ်းပြင်ဆင်ရန်"</item>
+    <item msgid="1801619438618539275">"မီဒီယာခလုတ်များ"</item>
+    <item msgid="31588119965784465">"အသံပြတ်သားအောင်ချိန်ရန်"</item>
+    <item msgid="7565226799008076833">"ပင်မအသံအတိုးအကျယ်"</item>
+    <item msgid="5420704980305018295">"စကားသံအတိုးအကျယ်"</item>
+    <item msgid="5797363115508970204">"ဖုန်းမြည်သံ အတိုးအကျယ်"</item>
+    <item msgid="8233154098550715999">"မီဒီယာအသံအတိုးအကျယ်"</item>
+    <item msgid="5196715605078153950">"နှိုးစက်သံအတိုးအကျယ်"</item>
+    <item msgid="394030698764284577">"အကြောင်းကြားသံအတိုးအကျယ်"</item>
+    <item msgid="8952898972491680178">"ဘလူးတုသ်သံအတိုးအကျယ်"</item>
+    <item msgid="8506227454543690851">"ဖွင့်လျှက်ထားရှိရန်"</item>
+    <item msgid="1108160036049727420">"တည်နေရာအား စောင့်ကြည့်စစ်ဆေးရန်"</item>
+    <item msgid="1496205959751719491">"စွမ်းအားမြင့် ဖန်သားပြင် တည်နေရာ"</item>
+    <item msgid="3776296279910987380">"သုံးစွဲမှု စာရင်းအင်းများကို ရယူရန်"</item>
+    <item msgid="8827100324471975602">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
+    <item msgid="6880736730520126864">"အမည်ကို ပြပါ"</item>
+    <item msgid="4933375960222609935">"ပရိုဂျက် မီဒီယာ"</item>
+    <item msgid="8357907018938895462">"VPN ကို စဖွင့်သုံးပါ"</item>
+    <item msgid="8143812849911310973">"နောက်ခံကို ရေးပါ"</item>
+    <item msgid="6266277260961066535">"ဖွဲ့စည်းပုံကို ကူညီပါ"</item>
+    <item msgid="7715498149883482300">"မျက်နှာပြင်ကို ကူညီပါ"</item>
+    <item msgid="4046679376726313293">"ဖုန်း အခြေအနေကို ဖတ်ပါ"</item>
+    <item msgid="6329507266039719587">"အသံမေးလ်ကို ထည့်ပါ"</item>
+    <item msgid="7692440726415391408">"ငုံခြင်းကို သုံးပါ"</item>
+    <item msgid="8572453398128326267">"အထွက် ခေါ်ဆိုမှုများကို စီမံဆောင်ရွက်ပါ"</item>
+    <item msgid="7775674394089376306">"လက်ဗွေ"</item>
+    <item msgid="3182815133441738779">"ခန္ဓာကိုယ် အာရုံခံကိရိယာများ"</item>
+    <item msgid="2793100005496829513">"ဆဲလ် ထုတ်လွှင့်မှုများကို ဖတ်ပါ"</item>
+    <item msgid="2633626056029384366">"တည်နေရာကို အတုဖန်တီးပါ"</item>
+    <item msgid="8356842191824684631">"သိုလှောင်ခန်းကို ဖတ်ပါ"</item>
+    <item msgid="5671906070163291500">"သိုလှောင်ခန်းကို ရေးပါ"</item>
+    <item msgid="2791955098549340418">"မျက်နှာပြင်ကို ဖွင့်ပါ"</item>
+    <item msgid="5599435119609178367">"အကောင့်များကို ရယူပါ"</item>
+    <item msgid="1165623660533024666">"နောက်ခံမှာ အလုပ်လုပ်ပါ"</item>
+    <item msgid="6423861043647911030">"အများသုံးစွဲနိုင်မှု အသံ"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"အတို"</item>
+    <item msgid="4816511817309094890">"အတော်အသင့်"</item>
+    <item msgid="8305084671259331134">"အရှည်"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"မူရင်း"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casua"</item>
+    <item msgid="4627069151979553527">"Cursiv"</item>
+    <item msgid="6896773537705206194">"စာလုံးကြီး ဆိုဒ်သေးများ"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"မူရင်း"</item>
+    <item msgid="6488643537808152001">"မရှိ"</item>
+    <item msgid="552332815156010137">"အနားသတ်"</item>
+    <item msgid="7187891159463789272">"အရိပ်ချပေး"</item>
+    <item msgid="8019330250538856521">"မြှင့်ရန်"</item>
+    <item msgid="8987385315647049787">"နှိမ့်ချရန်"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"၂၅%"</item>
+    <item msgid="4665048002584838262">"၅၀%"</item>
+    <item msgid="1874668269931014581">"၇၅%"</item>
+    <item msgid="6462911487571123954">"၁၀၀%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"ကြိုတင် ပေးထားတဲ့ ကီးပါရှိသောL2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"အသိအမှတ်ပြုလက်မှတ်ပါရှိသောL2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"ကြိုတင်ပေးထားတဲ့ ကီးနှင့်Xauthစစ်မှန်ကြောင်းပါရှိသောIPSec VPN"</item>
+    <item msgid="3319427315593649917">"အသိအမှတ်ပြုလက်မှတ်နှင့်Xauthစစ်မှန်ကြောင်းပါရှိသောIPSec VPN"</item>
+    <item msgid="8258927774145391041">"အသိအမှတ်ပြုလက်မှတ်များနှင့် ရောနှောထားတဲ့ စစ်မှန်ကြောင်းပါရှိသောIPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"မရှိ"</item>
+    <item msgid="1157046369795346308">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"မေးပါ"</item>
+    <item msgid="7718817231348607934">"ဘယ်တော့မှခွင့်မပြုပါ"</item>
+    <item msgid="8184570120217958741">"အမြဲခွင့်ပြုပါ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"တချိန်လုံး"</item>
+    <item msgid="167418068739176448">"အသုံး အများဆုံး"</item>
+    <item msgid="4760813290195199773">"အရေးကြီး (ရှေ့ပိုင်း)"</item>
+    <item msgid="2328684826817647595">"အရေးကြီး (နောက်ခံ)"</item>
+    <item msgid="7746406490652867365">"အရန်သိမ်းရန်"</item>
+    <item msgid="5597404364389196754">"အထူး ကြီးလေး"</item>
+    <item msgid="1290888779300174556">"ဝန်ဆောင်မှု (ဖွင့်ထား)"</item>
+    <item msgid="7241098542073939046">"ဝန်ဆောင်မှု (ပြန်ဖွင့်နေ)"</item>
+    <item msgid="6610439017684111046">"လက်ခံယူသူ"</item>
+    <item msgid="7367606086319921117">"ပင်မ"</item>
+    <item msgid="3344660712396741826">"နောက်ဆုံးအကြိမ် အသုံးပြုမှု"</item>
+    <item msgid="5006559348883303865">"ကက်ရှ လုပ်ထား (အသုံးပြုမှု)"</item>
+    <item msgid="8633480732468137525">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
+    <item msgid="6248998242443333892">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"စိမ်းပြာ"</item>
+    <item msgid="3228505970082457852">"အပြာ"</item>
+    <item msgid="6590260735734795647">"မဲနယ်"</item>
+    <item msgid="3521763377357218577">"ခရမ်း"</item>
+    <item msgid="5932337981182999919">"ပန်းရောင်"</item>
+    <item msgid="5642914536624000094">"အနီ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"ရက်ပေါင်း ၃၀ ထက်ကျော်သော"</item>
+    <item msgid="8699273238891265610">"ရက်ပေါင်း ၆၀ ထက်ကျော်သော"</item>
+    <item msgid="8346279419423837266">"ရက်ပေါင်း ၉၀ ထက်ကျော်သော"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"၁"</item>
+    <item msgid="3118234477029486741">"၀"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"အလိုအလျောက် ရှာရန်"</item>
+    <item msgid="773943026484148895">"အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
+    <item msgid="1008268820118852416">"အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ကျပန်း MAC ကို အသုံးပြုရန် (မူရင်း)"</item>
+    <item msgid="214234417308375326">"စက်၏ MAC သုံးရန်"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"No"</item>
+    <item msgid="1930581185557754880">"Yes"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"အမှောင်"</item>
+    <item msgid="5079453644557603349">"အလင်း"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ပိတ်ထားသည်"</item>
+    <item msgid="4072198137051566919">"အမှားရှာပြင်ခြင်း"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"အိမ်ကိုသာ"</item>
+    <item msgid="1161026694891024702">"အလိုအလျောက်"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA သုံးလိုပါသည်"</item>
+    <item msgid="7581481130337402578">"GSM သာ"</item>
+    <item msgid="8579197487913425819">"WCDMA သာ"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA အလိုအလျောက်ပြောင်းရန်"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo အလိုအလျောက်ပြောင်းရန်"</item>
+    <item msgid="4219607161971472471">"EvDo မပါသည့် CDMA"</item>
+    <item msgid="7278975240951052041">"EvDo သာ"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ကမ္ဘာအနှံ့"</item>
+    <item msgid="5713723042183940349">"မြန်နှုန်းမြင့်လိုင်း"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA သာ"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ကမ္ဘာအနှံ့"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-my/strings.xml b/tests/CarDeveloperOptions/res/values-my/strings.xml
index 172be49..d7c0f31 100644
--- a/tests/CarDeveloperOptions/res/values-my/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-my/strings.xml
@@ -239,7 +239,7 @@
     <string name="ping_test_label" msgid="4759194831308897624">"Ping စမ်းသပ်ခြင်း လုပ်ဆောင်ပါ"</string>
     <string name="radio_info_smsc_label" msgid="4561160340649588034">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="3992739670219389246">"အပ်ဒိတ်"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="5343925292858337909">"ပြန်လည်ဆန်းသစ်ရန်"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="5343925292858337909">"ပြန်လည်စတင်ရန်"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="3058615074503857400">"DNS စစ်ဆေးမှုခလုတ်နှိပ်ပါ"</string>
     <string name="oem_radio_info_label" msgid="8679815523111164378">"ထုတ်လုပ်သူနှင့် သက်ဆိုင်သော အချက်အလက်/ဆက်တင်များ"</string>
     <string name="band_mode_title" msgid="8180320100446559884">"ရေဒီယိုလိုင်းမုဒ်သို့ သတ်မှတ်ပါ"</string>
@@ -383,7 +383,7 @@
     <string name="decryption_settings_summary" product="default" msgid="7401802133199522441">"ဖုန်းကို အသွင်ဝှက်မထားပါ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"စက်ပစ္စည်းကို အသွင်ဝှက်ထားသည်"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"စက်ပစ္စည်းကို အသွင်ဝှက်မထားပါ"</string>
-    <string name="lockscreen_settings_title" msgid="1221505938891948413">"လော့ခ်ချထားချိန် မျက်နှာပြင်ပြသမှု"</string>
+    <string name="lockscreen_settings_title" msgid="1221505938891948413">"လော့ခ်ချထားချိန် ဖန်သားပြင်ပြသမှု"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"ပြသမည့်အရာ"</string>
     <string name="security_settings_summary" msgid="5210109100643223686">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="1783066617800041869">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"သင့်တက်ဘလက်ကို မျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာ အထောက်အထားစိစစ်ခြင်း ထည့်သွင်းရန် မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ \'မလုပ်တော့\' ကိုတို့ပါ၊ ထို့နောက် ပင်နံပါတ် သတ်မှတ်ပါ သို့မဟုတ် အခြား မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခု ရွေးချယ်ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"သင့်စက်ပစ္စည်းကို မျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာ အထောက်အထားစိစစ်ခြင်း ထည့်သွင်းရန် မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ \'မလုပ်တော့\' ကိုတို့ပါ၊ ထို့နောက် ပင်နံပါတ် သတ်မှတ်ပါ သို့မဟုတ် အခြား မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခု ရွေးချယ်ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"သင့်ဖုန်းကို မျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာ အထောက်အထားစိစစ်ခြင်း ထည့်သွင်းရန် မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ \'မလုပ်တော့\' ကိုတို့ပါ၊ ထို့နောက် ပင်နံပါတ် သတ်မှတ်ပါ သို့မဟုတ် အခြား မျက်နှာပြင်လော့ခ်ချစနစ်တစ်ခု ရွေးချယ်ပါ။"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ပင်နံပါတ်သတ်မှတ်မှု ကျော်မလား။"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"စကားဝှက် ထည့်ခြင်း ကျော်မလား။"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ပုံစံ ထည့်သွင်းမှု ကျော်မလား။"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ဖုန်းဖန်သားပြင် သော့စနစ် သတ်မှတ်ပါ"</string>
@@ -743,7 +742,7 @@
     <string name="bluetooth_error_title" msgid="5718761586633101960"></string>
     <string name="bluetooth_connecting_error_message" msgid="8473359363469518478">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို ချိတ်ဆက်မရပါ။"</string>
     <string name="bluetooth_preference_scan_title" msgid="457781003962324807">"စက်များကိုရှာဖွေရန် စကင်ပြုလုပ်နေသည်"</string>
-    <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"ပြန်လည်ဆန်းသစ်ရန်"</string>
+    <string name="bluetooth_search_for_devices" msgid="6796307228261078451">"ပြန်လည်စတင်ရန်"</string>
     <string name="bluetooth_searching_for_devices" msgid="7820814625522702494">"ရှာဖွေနေသည်…"</string>
     <string name="bluetooth_preference_device_settings" msgid="4247085616427015908">"စက်ပစ္စည်း အပြင်အဆင်များ"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="3567187438908143693">"ချိတ်တွဲထားသည့် ကိရိယာ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"မိုဘိုင်း"</item>
+    <item msgid="6007360612667098926">"Wi-Fi သာလျှင်"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2435,7 +2437,7 @@
     <string name="menu_stats_unplugged" msgid="774132771877485277">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> အားသွင်းကြိုးဖြုတ်စဥ်မှ"</string>
     <string name="menu_stats_last_unplugged" msgid="197591229866380225">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>မှ ကြိုးဖြုတ်ထားသည်"</string>
     <string name="menu_stats_total" msgid="2270006562448894071">"အသုံးပြုမှု စုစုပေါင်း"</string>
-    <string name="menu_stats_refresh" msgid="9017362786647223203">"ပြန်လည်ဆန်းသစ်ရန်"</string>
+    <string name="menu_stats_refresh" msgid="9017362786647223203">"ပြန်လည်စတင်ရန်"</string>
     <string name="process_kernel_label" msgid="4175060316414593760">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="8591722404282619153">"မီဒီယာဆာဗာ"</string>
     <string name="process_dex2oat_label" msgid="8249082119748556085">"အက်ပ်ပိုမိုကောင်းအောင်ပြုခြင်း"</string>
@@ -3585,7 +3587,7 @@
     <string name="app_launch_domain_links_title" msgid="2987289657348349133">"လင့်ခ်များကို ဖွင့်ခြင်း"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8595126859922391331">"ထောက်ပံ့ထားသည့် လင့်များကို ဖွင့်မည်"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="6803029846855502366">"မမ​ေးမြန်းဘဲ ဖွင့်မည်"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"ထောက်ပံ့ထားသည့်လင့်ခ်များ"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="503976327533974142">"ပံ့ပိုးထားသည့်လင့်ခ်များ"</string>
     <string name="app_launch_other_defaults_title" msgid="2986685757258232543">"အခြား မူရင်းများ"</string>
     <string name="storage_summary_format" msgid="2166430500147022935">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ထဲတွင် <xliff:g id="SIZE">%1$s</xliff:g>သုံးထားသည်"</string>
     <string name="storage_type_internal" msgid="4434212376539293892">"စက်တွင်း သိုလှောင်ထားမှု"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"၎င်းကြောင့် ဤဖုန်းနှေးသွားပါမည်"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GNSS အတိုင်းအတာအပြည့် သက်ရောက်ရန်"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"လည်ပတ်ချိန်မပါဘဲ GNSS စက်ဝိုင်းပုံမြင်ကွင်းကျယ်ပုံများနှင့် ကြိမ်နှုန်းအားလုံးကို ခြေရာခံပါ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"အသုံးပြုသူ အပြောင်းအလဲတွင် အမှားရှာပြင်ခြင်း"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"အသုံးပြုသူ အပြောင်းအလဲအတွင်း အသေးစိတ်အချက်အလက်များ ပြသည်"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"နောက်ခံ လုပ်ဆောင်ချက် စတင်မှုများ ခွင့်ပြုပါ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"နောက်ခံ လုပ်ဆောင်ချက် စတင်မှုအားလုံး ခွင့်ပြုသည်"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ရပ်တန့်သွားမှု ဒိုင်ယာလော့ကို အမြဲပြရန်"</string>
diff --git a/tests/CarDeveloperOptions/res/values-nb-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-nb-nokeys/strings.xml
new file mode 100644
index 0000000..4319eff
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-nb-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Installerte apper, hurtigtaster"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-nb/arrays.xml b/tests/CarDeveloperOptions/res/values-nb/arrays.xml
new file mode 100644
index 0000000..04b22b6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-nb/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Stillehavet"</item>
+    <item msgid="7044520255415007865">"Alle"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekunder"</item>
+    <item msgid="772029947136115322">"30 sekunder"</item>
+    <item msgid="8743663928349474087">"1 minutt"</item>
+    <item msgid="1506508631223164814">"2 minutter"</item>
+    <item msgid="8664703938127907662">"5 minutter"</item>
+    <item msgid="5827960506924849753">"10 minutter"</item>
+    <item msgid="6677424950124253938">"30 minutter"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Aldri"</item>
+    <item msgid="2517785806387977252">"15 sekunder"</item>
+    <item msgid="6347954399441173672">"30 sekunder"</item>
+    <item msgid="4858305253279921789">"1 minutt"</item>
+    <item msgid="8109273437140044073">"2 minutter"</item>
+    <item msgid="2788593551142462622">"5 minutter"</item>
+    <item msgid="8012672183888404961">"10 minutter"</item>
+    <item msgid="8271452751594598661">"30 minutter"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Umiddelbart"</item>
+    <item msgid="2038544972632026612">"5 sekunder"</item>
+    <item msgid="5558060663472279597">"15 sekunder"</item>
+    <item msgid="45341168505452037">"30 sekunder"</item>
+    <item msgid="227647485917789272">"1 minutt"</item>
+    <item msgid="3367011891231217504">"2 minutter"</item>
+    <item msgid="4376575879222393045">"5 minutter"</item>
+    <item msgid="811192536981678974">"10 minutter"</item>
+    <item msgid="7258394417241706272">"30 minutter"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Liten"</item>
+    <item msgid="591935967183159581">"Standard"</item>
+    <item msgid="1714184661981538355">"Stor"</item>
+    <item msgid="6195563047686707484">"Størst"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skanner ..."</item>
+    <item msgid="5597394826455877834">"Kobler til …"</item>
+    <item msgid="5848277343965362748">"Autentiserer …"</item>
+    <item msgid="3391238031431440676">"Henter IP-adresse …"</item>
+    <item msgid="5257597310494000224">"Tilkoblet"</item>
+    <item msgid="8472497592913050396">"Satt på vent"</item>
+    <item msgid="1228072488815999109">"Kobler fra…"</item>
+    <item msgid="7253087004422991731">"Frakoblet"</item>
+    <item msgid="4169850917304751227">"Mislykket"</item>
+    <item msgid="6266658166690831131">"Blokkert"</item>
+    <item msgid="4517230805854909775">"Unngår dårlig tilkobling midlertidig"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skanner …"</item>
+    <item msgid="8058143476674427024">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="7547609081339573756">"Autentiserer med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="5145158315060185414">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="3283243151651124831">"Koblet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Satt på vent"</item>
+    <item msgid="4133290864821295785">"Kobler fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="3980154971187953257">"Frakoblet"</item>
+    <item msgid="2847316776634969068">"Mislykket"</item>
+    <item msgid="4390990424746035383">"Blokkert"</item>
+    <item msgid="3618248791367063949">"Unngår dårlig tilkobling midlertidig"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Knapp for autokonfig."</item>
+    <item msgid="7401896200768713930">"Personlig kode fra motpart"</item>
+    <item msgid="4526848028011846710">"Kode fra enheten"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Tilkoblet"</item>
+    <item msgid="983792611851499732">"Invitert"</item>
+    <item msgid="5438273405428201793">"Mislykket"</item>
+    <item msgid="4646663015449312554">"Tilgjengelig"</item>
+    <item msgid="3230556734162006146">"Utenfor rekkevidde"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutter"</item>
+    <item msgid="2759776603549270587">"5 minutter"</item>
+    <item msgid="167772676068860015">"1 time"</item>
+    <item msgid="5985477119043628504">"Aldri tidsavbrudd"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Bruk systemstandarden: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dårlig"</item>
+    <item msgid="7882129634982603782">"Dårlig"</item>
+    <item msgid="6457357501905996224">"OK"</item>
+    <item msgid="405271628162918841">"Bra"</item>
+    <item msgid="999948812884919584">"Utmerket"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"De siste 30 dagene"</item>
+    <item msgid="3211287705232736964">"Angi brukssyklus"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Brukstid"</item>
+    <item msgid="2784401352592276015">"Sist brukt"</item>
+    <item msgid="249854287216326349">"Navn på app"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ingen"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ingen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ingen"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statisk"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ingen"</item>
+    <item msgid="1464741437353223198">"Brukerveiledning"</item>
+    <item msgid="5793600062487886090">"Auto-oppsett av proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ingen"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Uspesifisert"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ingen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Intern lagringsenhet"</item>
+    <item msgid="3186681694079967527">"Flyttbart minnekort"</item>
+    <item msgid="6902033473986647035">"La systemet bestemme"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Sted"</item>
+    <item msgid="6842381562497597649">"Personlig"</item>
+    <item msgid="3966700236695683444">"Meldinger"</item>
+    <item msgid="8563996233342430477">"Medier"</item>
+    <item msgid="5323851085993963783">"Enhet"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"anslått posisjon"</item>
+    <item msgid="1830619568689922920">"nøyaktig posisjon"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrer"</item>
+    <item msgid="8632513128515114092">"lesing av kontakter"</item>
+    <item msgid="3741042113569620272">"Endre kontaktene"</item>
+    <item msgid="4204420969709009931">"Lese anropsloggen"</item>
+    <item msgid="2260380357119423209">"Endre anropsloggen"</item>
+    <item msgid="6550710385014530934">"lesing av kalender"</item>
+    <item msgid="3575906174264853951">"Endre kalenderen"</item>
+    <item msgid="4319843242568057174">"Wi-Fi-skann"</item>
+    <item msgid="2981791890467303819">"varsel"</item>
+    <item msgid="6617825156152476692">"mobiltelefonskann"</item>
+    <item msgid="8865260890611559753">"ring til telefon"</item>
+    <item msgid="3254999273961542982">"Les SMS"</item>
+    <item msgid="7711446453028825171">"Skriv SMS"</item>
+    <item msgid="6123238544099198034">"Motta SMS"</item>
+    <item msgid="838342167431596036">"Motta nød-SMS"</item>
+    <item msgid="8554432731560956686">"Motta MMS"</item>
+    <item msgid="7464863464299515059">"Motta WAP-push"</item>
+    <item msgid="310463075729606765">"Send SMS"</item>
+    <item msgid="7338021933527689514">"Les ICC SMS"</item>
+    <item msgid="6130369335466613036">"Skriv ICC SMS"</item>
+    <item msgid="6536865581421670942">"Endre innstillingene"</item>
+    <item msgid="4547203129183558973">"tegn øverst"</item>
+    <item msgid="9080347512916542840">"varseltilgang"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"ta opp lyd"</item>
+    <item msgid="9182794235292595296">"spill av lyd"</item>
+    <item msgid="8760743229597702019">"lesing av utklippstavlen"</item>
+    <item msgid="2266923698240538544">"endring av utklippstavlen"</item>
+    <item msgid="1801619438618539275">"medieknapper"</item>
+    <item msgid="31588119965784465">"audiofokus"</item>
+    <item msgid="7565226799008076833">"hovedvolum"</item>
+    <item msgid="5420704980305018295">"stemmevolum"</item>
+    <item msgid="5797363115508970204">"ringevolum"</item>
+    <item msgid="8233154098550715999">"medievolum"</item>
+    <item msgid="5196715605078153950">"alarmvolum"</item>
+    <item msgid="394030698764284577">"varselvolum"</item>
+    <item msgid="8952898972491680178">"bluetooth-volum"</item>
+    <item msgid="8506227454543690851">"hold aktiv"</item>
+    <item msgid="1108160036049727420">"overvåk posisjon"</item>
+    <item msgid="1496205959751719491">"overvåk plassering med høyt strømforbruk"</item>
+    <item msgid="3776296279910987380">"få bruksstatistikk"</item>
+    <item msgid="8827100324471975602">"slå mikrofonen av eller på"</item>
+    <item msgid="6880736730520126864">"vis brukervarsel"</item>
+    <item msgid="4933375960222609935">"projiser media"</item>
+    <item msgid="8357907018938895462">"aktivér VPN"</item>
+    <item msgid="8143812849911310973">"angi bakgrunn"</item>
+    <item msgid="6266277260961066535">"assistansestruktur"</item>
+    <item msgid="7715498149883482300">"assistanseskjermdump"</item>
+    <item msgid="4046679376726313293">"les telefontilstand"</item>
+    <item msgid="6329507266039719587">"legg til talepost"</item>
+    <item msgid="7692440726415391408">"bruk SIP"</item>
+    <item msgid="8572453398128326267">"behandle utgående anrop"</item>
+    <item msgid="7775674394089376306">"fingeravtrykk"</item>
+    <item msgid="3182815133441738779">"kroppssensorer"</item>
+    <item msgid="2793100005496829513">"les kringkastede meldinger"</item>
+    <item msgid="2633626056029384366">"fiktiv plassering"</item>
+    <item msgid="8356842191824684631">"les fra lagring"</item>
+    <item msgid="5671906070163291500">"skriv til lagring"</item>
+    <item msgid="2791955098549340418">"slå på skjermen"</item>
+    <item msgid="5599435119609178367">"hent kontoer"</item>
+    <item msgid="1165623660533024666">"kjør i bakgrunnen"</item>
+    <item msgid="6423861043647911030">"tilgjengelighetsvolum"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Sted"</item>
+    <item msgid="6656077694190491067">"Sted"</item>
+    <item msgid="8790228218278477369">"Sted"</item>
+    <item msgid="7836406246005211990">"Vibrer"</item>
+    <item msgid="3951439024549922598">"Lese kontakter"</item>
+    <item msgid="8802152411647068">"Endre kontaktene"</item>
+    <item msgid="229544934599698735">"Les anropsloggen"</item>
+    <item msgid="7396102294405899613">"Endre anropsloggen"</item>
+    <item msgid="3597797992398484655">"Les kalender"</item>
+    <item msgid="2705975774250907343">"Endre kalenderen"</item>
+    <item msgid="4668747371441932697">"Sted"</item>
+    <item msgid="1487578921720243646">"Send varsel"</item>
+    <item msgid="4636080349724146638">"Sted"</item>
+    <item msgid="673510900286463926">"Ring til telefon"</item>
+    <item msgid="542083422784609790">"Les SMS/SMS"</item>
+    <item msgid="1033780373029588436">"Skriv SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Motta SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Motta SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Motta SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Motta SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Send SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Les SMS/SMS"</item>
+    <item msgid="6555678522277865572">"Skriv SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Endre innstillingene"</item>
+    <item msgid="8705854389991425629">"Tegn øverst"</item>
+    <item msgid="5861356020344153651">"Varseltilgang"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Spill inn lyd"</item>
+    <item msgid="4516840825756409490">"Spill av lyd"</item>
+    <item msgid="6811712502798183957">"Lesing av utklippstavlen"</item>
+    <item msgid="2780369012602289114">"Endring av utklippstavlen"</item>
+    <item msgid="2331359440170850868">"Medieknapper"</item>
+    <item msgid="6133599737122751231">"Audiofokus"</item>
+    <item msgid="6844485713404805301">"Hovedvolum"</item>
+    <item msgid="1600379420669104929">"Stemmevolum"</item>
+    <item msgid="6296768210470214866">"Ringevolum"</item>
+    <item msgid="510690696071629241">"Medievolum"</item>
+    <item msgid="406861638631430109">"Alarmvolum"</item>
+    <item msgid="4715864795872233884">"Varselvolum"</item>
+    <item msgid="2311478519251301183">"Bluetooth-volum"</item>
+    <item msgid="5133991377896747027">"Behold aktiv"</item>
+    <item msgid="2464189519136248621">"Plassering"</item>
+    <item msgid="2062677934050803037">"Posisjon"</item>
+    <item msgid="1735171933192715957">"Få bruksstatistikk"</item>
+    <item msgid="1014093788778383554">"Slå mikrofonen av eller på"</item>
+    <item msgid="4199297950608622850">"Vis brukervarsel"</item>
+    <item msgid="2527962435313398821">"Projiser media"</item>
+    <item msgid="5117506254221861929">"Aktivér VPN"</item>
+    <item msgid="8291198322681891160">"Angi bakgrunn"</item>
+    <item msgid="7106921284621230961">"Assistansestruktur"</item>
+    <item msgid="4496533640894624799">"Assistanseskjermdump"</item>
+    <item msgid="2598847264853993611">"Les telefontilstand"</item>
+    <item msgid="9215610846802973353">"Legg til talepost"</item>
+    <item msgid="9186411956086478261">"Bruk SIP"</item>
+    <item msgid="6884763100104539558">"Behandle utgående anrop"</item>
+    <item msgid="125513972170580692">"Fingeravtrykk"</item>
+    <item msgid="2556071024281275619">"Kroppssensorer"</item>
+    <item msgid="617168514928339387">"Les kringkastede meldinger"</item>
+    <item msgid="7134693570516523585">"Fiktiv plassering"</item>
+    <item msgid="7224489175375229399">"Les fra lagring"</item>
+    <item msgid="8472735063903258202">"Skriv til lagring"</item>
+    <item msgid="4069276819909595110">"Slå på skjermen"</item>
+    <item msgid="1228338896751121025">"Hent kontoer"</item>
+    <item msgid="3181581793459233672">"Kjør i bakgrunnen"</item>
+    <item msgid="2340936043025374076">"Tilgjengelighetsvolum"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kort"</item>
+    <item msgid="4816511817309094890">"Middels"</item>
+    <item msgid="8305084671259331134">"Lang"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Standard"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Kondensert sans-serif"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Uformell"</item>
+    <item msgid="4627069151979553527">"Kursiv"</item>
+    <item msgid="6896773537705206194">"Små forbokstaver"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Veldig liten"</item>
+    <item msgid="5091603983404027034">"Liten"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Stor"</item>
+    <item msgid="218913203203160606">"Veldig stor"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Standard"</item>
+    <item msgid="6488643537808152001">"Ingen"</item>
+    <item msgid="552332815156010137">"Omriss"</item>
+    <item msgid="7187891159463789272">"Bakgrunnsskygge"</item>
+    <item msgid="8019330250538856521">"Hevet"</item>
+    <item msgid="8987385315647049787">"Preget"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Bruk appens standardvalg"</item>
+    <item msgid="8611890312638868524">"Hvitt på svart"</item>
+    <item msgid="5891360837786277638">"Svart på hvitt"</item>
+    <item msgid="2798457065945456853">"Gult på svart"</item>
+    <item msgid="5799049811524553967">"Gult på blått"</item>
+    <item msgid="3673930830658169860">"Tilpasset"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN med forhåndsdelte nøkler"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN med sertifikater"</item>
+    <item msgid="312397853907741968">"IPSec VPN med forhåndsdelte taster og Xauth-autentisering"</item>
+    <item msgid="3319427315593649917">"IPSec VPN med sertifikater og Xauth-autentisering"</item>
+    <item msgid="8258927774145391041">"IPSec VPN med sertifikater og hybridautentisering"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ingen"</item>
+    <item msgid="1157046369795346308">"Brukerveiledning"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Frakoblet"</item>
+    <item msgid="8754480102834556765">"Initialiserer …"</item>
+    <item msgid="3351334355574270250">"Kobler til …"</item>
+    <item msgid="8303882153995748352">"Tilkoblet"</item>
+    <item msgid="9135049670787351881">"Tidsavbrudd"</item>
+    <item msgid="2124868417182583926">"Mislykket"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Spør"</item>
+    <item msgid="7718817231348607934">"Aldri tillat"</item>
+    <item msgid="8184570120217958741">"Alltid tillat"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Vedvarende"</item>
+    <item msgid="167418068739176448">"Høyeste aktivitet"</item>
+    <item msgid="4760813290195199773">"Viktig (i forgrunnen)"</item>
+    <item msgid="2328684826817647595">"Viktig (i bakgrunnen)"</item>
+    <item msgid="7746406490652867365">"Sikkerhetskopiering"</item>
+    <item msgid="5597404364389196754">"Tungvekt"</item>
+    <item msgid="1290888779300174556">"Tjeneste (kjører)"</item>
+    <item msgid="7241098542073939046">"Tjeneste (starter på nytt)"</item>
+    <item msgid="6610439017684111046">"Mottaker"</item>
+    <item msgid="7367606086319921117">"Hjemme"</item>
+    <item msgid="3344660712396741826">"Siste aktivitet"</item>
+    <item msgid="5006559348883303865">"Bufret (aktivitet)"</item>
+    <item msgid="8633480732468137525">"Bufret (aktivitetsklient)"</item>
+    <item msgid="6248998242443333892">"Bufret (tom)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Blågrønn"</item>
+    <item msgid="3228505970082457852">"Blå"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Lilla"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Rød"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Over 30 dager gamle"</item>
+    <item msgid="8699273238891265610">"Over 60 dager gamle"</item>
+    <item msgid="8346279419423837266">"Over 90 dager gamle"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Oppdag automatisk"</item>
+    <item msgid="773943026484148895">"Behandle som med datamåling"</item>
+    <item msgid="1008268820118852416">"Behandle som uten datamåling"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Bruk tilfeldig valgt MAC-adresse (standard)"</item>
+    <item msgid="214234417308375326">"Bruk enhetens MAC-adresse"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nei"</item>
+    <item msgid="1930581185557754880">"Ja"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Mørk"</item>
+    <item msgid="5079453644557603349">"Lys"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Av"</item>
+    <item msgid="4072198137051566919">"Feilsøk"</item>
+    <item msgid="2473005316958868509">"Omfattende"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Kun hjemmenett"</item>
+    <item msgid="1161026694891024702">"Automatisk"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA er foretrukket"</item>
+    <item msgid="7581481130337402578">"Bare GSM"</item>
+    <item msgid="8579197487913425819">"Bare WCDMA"</item>
+    <item msgid="8465243227505412498">"Automatisk GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automatisk CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA uten EvDo"</item>
+    <item msgid="7278975240951052041">"Bare EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalt"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Bare TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalt"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-nb/strings.xml b/tests/CarDeveloperOptions/res/values-nb/strings.xml
index d9ba284..2e57216 100644
--- a/tests/CarDeveloperOptions/res/values-nb/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nb/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Beskytt nettbrettet ditt med et alternativ for skjermlås, slik at ingen andre kan bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere ansiktsautentisering. For å avbryte, angi en PIN-kode eller velg et annet alternativ for skjermlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Beskytt enheten din med et alternativ for skjermlås, slik at ingen andre kan bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere ansiktsautentisering. For å avbryte, angi en PIN-kode eller velg et annet alternativ for skjermlås."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Beskytt telefonen din med et alternativ for skjermlås, slik at ingen andre kan bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere ansiktsautentisering. For å avbryte, angi en PIN-kode eller velg et annet alternativ for skjermlås."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Hopp over PIN-konfigurering?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Hopp over passordkonfig.?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Hopp over mønsterkonfig.?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfigurer skjermlås"</string>
@@ -792,7 +791,7 @@
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3103296701913705646">"Deler lokal internettilkobling med enhet"</string>
     <string name="bluetooth_dock_settings" msgid="3193180757893817101">"Innstillinger for forankringsstasjon"</string>
     <string name="bluetooth_dock_settings_title" msgid="4444650787249778130">"Bruk forankring til lyd"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="6043070852100434218">"Som høyttalertelefon"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="6043070852100434218">"Som høyttaler"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="6618893632901282661">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5512957564380371067">"Husk innstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="6799012540303500020">"Maksimalt antall Bluetooth-lydenheter"</string>
@@ -986,7 +985,7 @@
     <string name="wifi_hotspot_title" msgid="2631956539767069385">"Vil du logge på for å koble til?"</string>
     <string name="wifi_hotspot_message" msgid="6762452611090766607">"<xliff:g id="APP_NAME">%1$s</xliff:g> krever at du logger på nettet før du kobler til nettverket."</string>
     <string name="wifi_hotspot_connect" msgid="409079339360849653">"KOBLE TIL"</string>
-    <string name="no_internet_access_text" msgid="7093326244145734504">"Dette nettverket har ikke Internett-tilgang. Vil du fortsette å være koblet til nettverket?"</string>
+    <string name="no_internet_access_text" msgid="7093326244145734504">"Dette nettverket har ikke internettilgang. Vil du fortsette å være koblet til nettverket?"</string>
     <string name="partial_connectivity_text" msgid="2142157808079235684">"Noen apper og tjenester fungerer muligens ikke på grunn av begrenset tilkobling. Bruke likevel?"</string>
     <string name="no_internet_access_remember" msgid="1368137189939004202">"Ikke spør igjen for dette nettverket"</string>
     <string name="lost_internet_access_title" msgid="1061916948695946130">"Wi‑Fi er ikke koblet til Internett"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Bare Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1335,10 +1337,10 @@
     <string name="status_msid_number" msgid="7808175928664357661">"MSID"</string>
     <string name="status_prl_version" msgid="5634561205739199042">"PRL-versjon"</string>
     <string name="meid_multi_sim" msgid="7449892644113569529">"MEID (SIM-kortspor %1$d)"</string>
-    <string name="scanning_status_text_wifi_on_ble_on" msgid="6370507836346838473">"Både Wi‑Fi- og Bluetooth-skanning er på"</string>
+    <string name="scanning_status_text_wifi_on_ble_on" msgid="6370507836346838473">"Både Wi‑Fi- og Bluetooth-søking er på"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="8205014713732412608">"Wi‑Fi-søking er på, Bluetooth-søking er av"</string>
     <string name="scanning_status_text_wifi_off_ble_on" msgid="7400522456303307057">"Bluetooth-søking er på, Wi-Fi-søking er av"</string>
-    <string name="scanning_status_text_wifi_off_ble_off" msgid="8575026386237481457">"Både Wi‑Fi- og Bluetooth-skanning er av"</string>
+    <string name="scanning_status_text_wifi_off_ble_off" msgid="8575026386237481457">"Både Wi‑Fi- og Bluetooth-søking er av"</string>
     <string name="status_meid_number" msgid="8756271256760479835">"MEID"</string>
     <string name="status_icc_id" msgid="9191847562997702709">"ICCID"</string>
     <string name="status_data_network_type" msgid="2344720457353394909">"Nettverkstype for mobildata"</string>
@@ -1653,8 +1655,8 @@
     <string name="location_no_recent_accesses" msgid="6289916310397279890">"Ingen apper har nylig brukt posisjon"</string>
     <string name="location_high_battery_use" msgid="7177199869979522663">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="5030448574501435888">"Lav batteribruk"</string>
-    <string name="location_scanning_screen_title" msgid="7663329319689413454">"Søking med Wi‑Fi og Bluetooth"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6750542206763112172">"Wi‑Fi-søking"</string>
+    <string name="location_scanning_screen_title" msgid="7663329319689413454">"Søking etter Wi‑Fi og Bluetooth"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6750542206763112172">"Wi‑Fi-skanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="4956048135941851712">"La apper og tjenester søke etter Wi-Fi-nettverk når som helst, selv når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"Bluetooth-søking"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"La apper og tjenester søke etter enheter i nærheten når som helst, selv når Bluetooth er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
@@ -1806,7 +1808,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="3528618179883855727">"Fjern tilgang"</string>
     <string name="controls_label" msgid="5609285071259457221">"Kontroller"</string>
-    <string name="force_stop" msgid="9213858124674772386">"Tving stopp"</string>
+    <string name="force_stop" msgid="9213858124674772386">"Tving avslutning"</string>
     <string name="total_size_label" msgid="3929917501176594692">"Totalt"</string>
     <string name="application_size_label" msgid="175357855490253032">"Appstørrelse"</string>
     <string name="external_code_size_label" msgid="3434421216268309411">"USB-lagring for app"</string>
@@ -2902,7 +2904,7 @@
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"Anropsloggen deles med denne brukeren."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"Vil du slå på telefonsamtaler og SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"Anrops- og tekstmeldingsloggen deles med denne brukeren."</string>
-    <string name="emergency_info_title" msgid="1522609271881425375">"Informasjon for nødstilfeller"</string>
+    <string name="emergency_info_title" msgid="1522609271881425375">"Nødinformasjon"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"Informasjon og kontakter for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"Tillat apper og innhold"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Apper med begrensninger"</string>
@@ -3731,7 +3733,7 @@
     <string name="usb_use_MIDI_desc" msgid="1770966187150010947">"Bruk denne enheten som MIDI"</string>
     <string name="usb_use" msgid="8940500223316278632">"Bruk USB for"</string>
     <string name="usb_default_label" msgid="7471316635263936101">"Standard USB-konfigurasjon"</string>
-    <string name="usb_default_info" msgid="953775292571786528">"Disse innstillingene gjelder når en annen enhet er koblet til og telefonen din er låst opp. Du bør bare koble til pålitelige enheter."</string>
+    <string name="usb_default_info" msgid="953775292571786528">"Disse innstillingene gjelder når en annen enhet er koblet til og telefonen din er låst opp. Du bør bare koble til godkjente enheter."</string>
     <string name="usb_pref" msgid="6194821550693495068">"USB"</string>
     <string name="usb_preference" msgid="7092987095048592826">"USB-innstillinger"</string>
     <string name="usb_control_title" msgid="2379698856760894768">"USB kontrolleres av"</string>
@@ -4272,10 +4274,12 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Den senker hastigheten til telefonen"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Tving fullstendige GNSS-målinger"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Feilsøk bytte av bruker"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Vis detaljert informasjon under bytte av bruker"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Tillat start av bakgrunnsaktivitet"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Tillater all start av bakgrunnsaktivitet"</string>
-    <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vis alltid kræsjdialogboksen"</string>
-    <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"Vis dialogboksen hver gang en app kræsjer"</string>
+    <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vis alltid krasjdialogboksen"</string>
+    <string name="show_first_crash_dialog_summary" msgid="8197987550025401754">"Vis dialogboksen hver gang en app krasjer"</string>
     <string name="angle_enabled_app" msgid="4359266182151708733">"Velg en ANGLE-aktivert app"</string>
     <string name="angle_enabled_app_not_set" msgid="7428910515748621910">"Du har ikke angitt noen ANGLE-aktivert app"</string>
     <string name="angle_enabled_app_set" msgid="7313088703610569320">"ANGLE-aktivert app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ne-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ne-nokeys/strings.xml
new file mode 100644
index 0000000..782928a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ne-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"अनुप्रयोगहरू प्रबन्ध गर्नुहोस्"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ne/arrays.xml b/tests/CarDeveloperOptions/res/values-ne/arrays.xml
new file mode 100644
index 0000000..aad8f88
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ne/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"अमेरिका"</item>
+    <item msgid="4791956477275129121">"युरोप"</item>
+    <item msgid="3812126832016254559">"अफ्रिका"</item>
+    <item msgid="2765816300353408280">"एसिया"</item>
+    <item msgid="6683489385344409742">"अस्ट्रेलिया"</item>
+    <item msgid="5194868215515664953">"प्रशान्त"</item>
+    <item msgid="7044520255415007865">"सबै"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"१५ सेकेन्ड"</item>
+    <item msgid="772029947136115322">"३० सेकेन्ड"</item>
+    <item msgid="8743663928349474087">"१ मिनेट"</item>
+    <item msgid="1506508631223164814">"२ मिनेट"</item>
+    <item msgid="8664703938127907662">"५ मिनेट"</item>
+    <item msgid="5827960506924849753">"१० मिनेट"</item>
+    <item msgid="6677424950124253938">"३० मिनेट"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"कहिल्यै पनि होइन"</item>
+    <item msgid="2517785806387977252">"१५ सेकेन्ड"</item>
+    <item msgid="6347954399441173672">"३० सेकेन्ड"</item>
+    <item msgid="4858305253279921789">"१ मिनेट"</item>
+    <item msgid="8109273437140044073">"२ मिनेट"</item>
+    <item msgid="2788593551142462622">"५ मिनेट"</item>
+    <item msgid="8012672183888404961">"१० मिनेट"</item>
+    <item msgid="8271452751594598661">"३० मिनेट"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"तुरुन्तै"</item>
+    <item msgid="2038544972632026612">"५ सेकेन्ड"</item>
+    <item msgid="5558060663472279597">"१५ सेकेन्ड"</item>
+    <item msgid="45341168505452037">"३० सेकेन्ड"</item>
+    <item msgid="227647485917789272">"१ मिनेट"</item>
+    <item msgid="3367011891231217504">"२ मिनेट"</item>
+    <item msgid="4376575879222393045">"५ मिनेट"</item>
+    <item msgid="811192536981678974">"१० मिनेट"</item>
+    <item msgid="7258394417241706272">"३० मिनेट"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"सानो"</item>
+    <item msgid="591935967183159581">"पूर्वनिर्धारित"</item>
+    <item msgid="1714184661981538355">"ठूलो"</item>
+    <item msgid="6195563047686707484">"सबैभन्दा ठूलो"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"स्क्यान गरिँदै..."</item>
+    <item msgid="5597394826455877834">"जडान हुँदै..."</item>
+    <item msgid="5848277343965362748">"प्रमाणित गर्दै..."</item>
+    <item msgid="3391238031431440676">"IP ठेगाना पत्ता लगाउँदै ..."</item>
+    <item msgid="5257597310494000224">"जडान गरियो"</item>
+    <item msgid="8472497592913050396">"निलम्बित"</item>
+    <item msgid="1228072488815999109">"जडान हटाइँदै ..."</item>
+    <item msgid="7253087004422991731">"जडान विच्छेद भयो"</item>
+    <item msgid="4169850917304751227">"असफल"</item>
+    <item msgid="6266658166690831131">"अवरूद्ध गरियो"</item>
+    <item msgid="4517230805854909775">"अस्थायी रूपमा कमजोर जडान बेवास्ता गर्दै"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"स्क्यान गर्दै ..."</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>सँग जडान हुँदै..."</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>का साथ प्रमाणीकरण गर्दै..."</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट IP ठेगाना प्राप्त गर्दै..."</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>सँग जडित"</item>
+    <item msgid="6600156231416890902">"निलम्बित"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट विच्छेदन गर्दै..."</item>
+    <item msgid="3980154971187953257">"जडान विच्छेद भयो"</item>
+    <item msgid="2847316776634969068">"असफल"</item>
+    <item msgid="4390990424746035383">"अवरूद्ध गरियो"</item>
+    <item msgid="3618248791367063949">"अस्थायी रूपमा कमजोर जडान हटाइँदै"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"थिच्ने बटन"</item>
+    <item msgid="7401896200768713930">"PIN जोडी उपकरणबाट"</item>
+    <item msgid="4526848028011846710">"यस उपकरणबाट PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"जडान गरियो"</item>
+    <item msgid="983792611851499732">"आमन्त्रित"</item>
+    <item msgid="5438273405428201793">"असफल"</item>
+    <item msgid="4646663015449312554">"उपलब्ध"</item>
+    <item msgid="3230556734162006146">"दायरा-बाहिर"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"२ मिनेट"</item>
+    <item msgid="2759776603549270587">"५ मिनेट"</item>
+    <item msgid="167772676068860015">"१ घन्टा"</item>
+    <item msgid="5985477119043628504">"कहिल्यै समय सकिँदैन"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"प्रणालीको पूर्वनिर्धारित सेटिङ प्रयोग गर्नुहोस्: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"२"</item>
+    <item msgid="6429260054182662738">"३"</item>
+    <item msgid="1644506614010085798">"४"</item>
+    <item msgid="3132506679404897150">"५"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"कमजोर"</item>
+    <item msgid="7882129634982603782">"कमजोर"</item>
+    <item msgid="6457357501905996224">"ठिकठाक"</item>
+    <item msgid="405271628162918841">"राम्रो"</item>
+    <item msgid="999948812884919584">"उत्कृष्ट"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"अन्तिम ३० दिन"</item>
+    <item msgid="3211287705232736964">"प्रयोग चक्र सेट..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"उपयोग समय"</item>
+    <item msgid="2784401352592276015">"पछिल्लो समय प्रयोग गरिएको"</item>
+    <item msgid="249854287216326349">"अनुप्रयोगको नाम"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"कुनै पनि होइन"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"कुनै पनि होइन"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"कुनै पनि होइन"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"स्थिर"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"कुनै पनि होइन"</item>
+    <item msgid="1464741437353223198">"म्यानुअल"</item>
+    <item msgid="5793600062487886090">"प्रोक्सी स्वतः समायोजन"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"कुनै पनि होइन"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP वा CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"अनिर्दिष्ट"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"कुनै पनि होइन"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"आन्तरिक उपकरण भण्डारण"</item>
+    <item msgid="3186681694079967527">"हटाउन मिल्ने SD कार्ड"</item>
+    <item msgid="6902033473986647035">"प्रणालीलाई निर्णय गर्न दिनुहोस्"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"स्थान"</item>
+    <item msgid="6842381562497597649">"व्यक्तिगत"</item>
+    <item msgid="3966700236695683444">"सन्देश पठाइदै"</item>
+    <item msgid="8563996233342430477">"मिडिया"</item>
+    <item msgid="5323851085993963783">"यन्त्र"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"भद्दा स्थान"</item>
+    <item msgid="1830619568689922920">"राम्रो स्थान"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"कम्पन हुने"</item>
+    <item msgid="8632513128515114092">"सम्पर्कहरू पढ्नुहोस्"</item>
+    <item msgid="3741042113569620272">"सम्पर्कहरू परिमार्जन गर्नुहोस्"</item>
+    <item msgid="4204420969709009931">"कल लग पढ्नुहोस्"</item>
+    <item msgid="2260380357119423209">"कल लग परिमार्जन गर्नुहोस्"</item>
+    <item msgid="6550710385014530934">"पात्रो पढ्नुहोस्"</item>
+    <item msgid="3575906174264853951">"पात्रो परिमार्जन गर्नुहोस्"</item>
+    <item msgid="4319843242568057174">"Wi-Fi स्क्यान"</item>
+    <item msgid="2981791890467303819">"सूचना"</item>
+    <item msgid="6617825156152476692">"सेल स्क्यान"</item>
+    <item msgid="8865260890611559753">"कल फोन"</item>
+    <item msgid="3254999273961542982">"SMS पढ्नुहोस्"</item>
+    <item msgid="7711446453028825171">"SMS लेख्नुहोस्"</item>
+    <item msgid="6123238544099198034">"SMS प्राप्त गर्नुहोस्"</item>
+    <item msgid="838342167431596036">"आपतकालीन SMS प्राप्त गर्नुहोस्"</item>
+    <item msgid="8554432731560956686">"MMS प्राप्त गर्नुहोस्"</item>
+    <item msgid="7464863464299515059">"WAP push प्राप्त गर्नुहोस्"</item>
+    <item msgid="310463075729606765">"SMS पठाउनुहोस्"</item>
+    <item msgid="7338021933527689514">"ICC SMS पढ्नुहोस्"</item>
+    <item msgid="6130369335466613036">"ICC SMS लेख्नुहोस्"</item>
+    <item msgid="6536865581421670942">"सेटिङहरू परिमार्जन गर्नुहोस्"</item>
+    <item msgid="4547203129183558973">"सबभन्दा माथि सार्नुहोस्"</item>
+    <item msgid="9080347512916542840">"सूचनाहरू पहुँच गर्नुहोस्"</item>
+    <item msgid="5332718516635907742">"क्यामेरा"</item>
+    <item msgid="6098422447246167852">"अडियो रेकर्ड गर्नुहोस्"</item>
+    <item msgid="9182794235292595296">"अडियो बजाउनुहोस्"</item>
+    <item msgid="8760743229597702019">"क्लिपबोर्ड पढ्नुहोस्"</item>
+    <item msgid="2266923698240538544">"क्लिपबोर्ड संशोधन गर्नुहोस्"</item>
+    <item msgid="1801619438618539275">"मिडिया बटनहरू"</item>
+    <item msgid="31588119965784465">"श्रब्य फोकस"</item>
+    <item msgid="7565226799008076833">"मास्टर ध्वनि मात्रा"</item>
+    <item msgid="5420704980305018295">"वाणी मात्रा"</item>
+    <item msgid="5797363115508970204">"घन्टी मात्रा"</item>
+    <item msgid="8233154098550715999">"मिडियाको आवाजको मात्रा"</item>
+    <item msgid="5196715605078153950">"अलार्मको आवाजको मात्रा"</item>
+    <item msgid="394030698764284577">"सूचना मात्रा"</item>
+    <item msgid="8952898972491680178">"ब्लुटुथ मात्रा"</item>
+    <item msgid="8506227454543690851">"जागा रहनुहोस्"</item>
+    <item msgid="1108160036049727420">"स्थानको निरीक्षण गर्नुहोस्"</item>
+    <item msgid="1496205959751719491">"उच्च शक्ति स्थान मनिटर"</item>
+    <item msgid="3776296279910987380">"तथ्याङ्क उपयोग प्राप्त गर्नुहोस्"</item>
+    <item msgid="8827100324471975602">"माइक्रोफोनको आवाज बन्द/खुला गर्नुहोस्"</item>
+    <item msgid="6880736730520126864">"टोस्ट देखाउनुहोस्"</item>
+    <item msgid="4933375960222609935">"परियोजना मिडिया"</item>
+    <item msgid="8357907018938895462">"VPN सक्रिय पार्नुहोस्"</item>
+    <item msgid="8143812849911310973">"वालपेपर लेख्नुहोस्"</item>
+    <item msgid="6266277260961066535">"संरचनालाई मद्दत गर्नुहोस्"</item>
+    <item msgid="7715498149883482300">"स्क्रिनसट मद्दत गर्नुहोस्"</item>
+    <item msgid="4046679376726313293">"फोनको अवस्था पढ्नुहोस्"</item>
+    <item msgid="6329507266039719587">"भ्वाइसमेल थप गर्नुहोस्"</item>
+    <item msgid="7692440726415391408">"SIP प्रयोग गर्नुहोस्"</item>
+    <item msgid="8572453398128326267">"बहिर्गमन कललाई प्रशोधन गर्नुहोस्"</item>
+    <item msgid="7775674394089376306">"फिंगरप्रिन्ट"</item>
+    <item msgid="3182815133441738779">"शारीरिक सेन्सरहरू"</item>
+    <item msgid="2793100005496829513">"मोबाइल प्रसारणहरू पढ्नुहोस्"</item>
+    <item msgid="2633626056029384366">"स्थान नक्कल गर्नुहोस्"</item>
+    <item msgid="8356842191824684631">"भण्डारण पढ्नुहोस्"</item>
+    <item msgid="5671906070163291500">"भण्डारण लेख्नुहोस्"</item>
+    <item msgid="2791955098549340418">"स्क्रिन सक्रिय गर्नुहोस्"</item>
+    <item msgid="5599435119609178367">"खाताहरू प्राप्त गर्नुहोस्"</item>
+    <item msgid="1165623660533024666">"पृष्ठभूमिमा सञ्चालन गर्नुहोस्"</item>
+    <item msgid="6423861043647911030">"पहुँचको मात्रा"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"छोटो"</item>
+    <item msgid="4816511817309094890">"सामान्य"</item>
+    <item msgid="8305084671259331134">"लामो"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"पूर्वनिर्धारित"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"सन्स-सेरिफ मोनोस्पेस"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"सेरिफ मोनोस्पेस"</item>
+    <item msgid="4448481989108928248">"आरामदायक"</item>
+    <item msgid="4627069151979553527">"जोडिएको लेखाइ"</item>
+    <item msgid="6896773537705206194">"लघु दीर्घाक्षर"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ज्यादै साना"</item>
+    <item msgid="5091603983404027034">"सानो"</item>
+    <item msgid="176844712416932112">"सामान्य"</item>
+    <item msgid="2784236342175159295">"ठूलो"</item>
+    <item msgid="218913203203160606">"ज्यादै ठूलो"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"पूर्वनिर्धारित"</item>
+    <item msgid="6488643537808152001">"कुनै पनि होइन"</item>
+    <item msgid="552332815156010137">"रूपरेखा"</item>
+    <item msgid="7187891159463789272">"छाँया राख्नुस्"</item>
+    <item msgid="8019330250538856521">"उठायो"</item>
+    <item msgid="8987385315647049787">"दबेको"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"२५%"</item>
+    <item msgid="4665048002584838262">"५०%"</item>
+    <item msgid="1874668269931014581">"७५%"</item>
+    <item msgid="6462911487571123954">"१००%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"एपका पूर्वनिर्धारित सेटिङहरू प्रयोग गर्नुहोस्"</item>
+    <item msgid="8611890312638868524">"कालोमा सेतो"</item>
+    <item msgid="5891360837786277638">"सेतोमा कालो"</item>
+    <item msgid="2798457065945456853">"कालोमा पहेँलो"</item>
+    <item msgid="5799049811524553967">"नीलोमा पहेँलो"</item>
+    <item msgid="3673930830658169860">"आफू अनुकूल"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN पूर्व साझेदारी कुञ्जीकासँग"</item>
+    <item msgid="6128519070545038358">"प्रमाणपत्रहरूसँग L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"IPSec VPN पूर्व साझेदारी कुञ्जी र Xauth प्राधिकरणसँग"</item>
+    <item msgid="3319427315593649917">"प्रमाणपत्रहरू र Xauth प्रमाणीकरणको साथ IPSec VPN"</item>
+    <item msgid="8258927774145391041">"प्रमाणपत्रहरू र हाईब्रिड प्रमाणीकरणसँग IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"कुनै पनि होइन"</item>
+    <item msgid="1157046369795346308">"म्यानुअल"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"जडान विच्छेद भयो"</item>
+    <item msgid="8754480102834556765">"सुरुवात भैरहेको छ..."</item>
+    <item msgid="3351334355574270250">"जडान हुँदै..."</item>
+    <item msgid="8303882153995748352">"जडान गरियो"</item>
+    <item msgid="9135049670787351881">"समय सकियो"</item>
+    <item msgid="2124868417182583926">"असफल"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"सोध्नुहोस्"</item>
+    <item msgid="7718817231348607934">"कहिल्यै पनि अनुमति नदिनुहोस्"</item>
+    <item msgid="8184570120217958741">"सधैँ अनुमति दिनुहोस्"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"लगातार"</item>
+    <item msgid="167418068739176448">"उच्च गतिविधि"</item>
+    <item msgid="4760813290195199773">"महत्वपूर्ण (अग्रभूमि)"</item>
+    <item msgid="2328684826817647595">"महत्वपूर्ण (पृष्ठभूमि)"</item>
+    <item msgid="7746406490652867365">"ब्याकअप"</item>
+    <item msgid="5597404364389196754">"भारी वजन"</item>
+    <item msgid="1290888779300174556">"सेवा (चालु)"</item>
+    <item msgid="7241098542073939046">"सेवा (पुनःसुरु हुँदै)"</item>
+    <item msgid="6610439017684111046">"प्रापक"</item>
+    <item msgid="7367606086319921117">"गृह"</item>
+    <item msgid="3344660712396741826">"पछिल्लो गतिविधि"</item>
+    <item msgid="5006559348883303865">"क्यास (गतिविधि)"</item>
+    <item msgid="8633480732468137525">"क्यास (गतिविधि ग्राहक)"</item>
+    <item msgid="6248998242443333892">"क्यास (खाली)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"टिल"</item>
+    <item msgid="3228505970082457852">"नीलो"</item>
+    <item msgid="6590260735734795647">"इन्डिगो"</item>
+    <item msgid="3521763377357218577">"बैजनी"</item>
+    <item msgid="5932337981182999919">"गुलाबी"</item>
+    <item msgid="5642914536624000094">"रातो"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"३० दिनभन्दा बढी पुरानो"</item>
+    <item msgid="8699273238891265610">"६० दिनभन्दा बढी पुरानो"</item>
+    <item msgid="8346279419423837266">"९० दिनभन्दा बढी पुरानो"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"स्वतः पत्ता लगाउनुहोस्"</item>
+    <item msgid="773943026484148895">"शुल्क लाग्ने वाइफाइका रूपमा लिनुहोस्"</item>
+    <item msgid="1008268820118852416">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"क्रमरहित MAC प्रयोग गर्नुहोस् (पूर्वनिर्धारित)"</item>
+    <item msgid="214234417308375326">"MAC यन्त्र प्रयोग गर्नुहोस्"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"होइन"</item>
+    <item msgid="1930581185557754880">"हो"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"अँध्यारो"</item>
+    <item msgid="5079453644557603349">"उज्यालो"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"निष्क्रिय गर्नुहोस्"</item>
+    <item msgid="4072198137051566919">"डिबग"</item>
+    <item msgid="2473005316958868509">"भर्बोज"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"घरमा मात्र"</item>
+    <item msgid="1161026694891024702">"स्वचालित"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA रुचाइयो"</item>
+    <item msgid="7581481130337402578">"GSM मात्र"</item>
+    <item msgid="8579197487913425819">"WCDMA मात्र"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA स्वतः"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo स्वतः"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo मात्र"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"विश्वव्यापी"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA मात्र"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"विश्वव्यापी"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ne/strings.xml b/tests/CarDeveloperOptions/res/values-ne/strings.xml
index 47603c3..e7fccc0 100644
--- a/tests/CarDeveloperOptions/res/values-ne/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ne/strings.xml
@@ -427,7 +427,7 @@
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"अनुहारसम्बन्धी डेटा हटाउनुहोस्"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"तपाईंको यन्त्र अनलक गर्न र अनुप्रयोगहरूमाथि पहुँच राख्न तपाईंको अनुहार प्रयोग गर्न सकिन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"अनुहारसम्बन्धी डेटा मेट्ने हो?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"फेस अनलक गर्ने सुविधामार्फत रेकर्ड गरिएको डेटा स्थायी रूपमा र सुरक्षित रूपमा मेटिने छ। हटाइसकेपछि, तपाईंलाई आफ्नो फोन अनलक गर्न, अनुप्रयोगहरूमा साइन इन गर्न र भुक्तानी पुष्टि गर्न आफ्नो PIN, ढाँचा वा पासवर्ड आवश्यक हुने छ।"</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"फेस अनलक गर्ने सुविधामार्फत रेकर्ड गरिएको डेटा स्थायी रूपमा र सुरक्षित रूपमा मेटिने छ। हटाइसकेपछि, आफ्नो फोन अनलक गर्न, अनुप्रयोगहरूमा साइन इन गर्न र भुक्तानी पुष्टि गर्न तपाईंसँग आफ्नो PIN, ढाँचा वा पासवर्ड हुनु पर्ने छ।"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"औंठाछाप"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"निम्नको लागि औठाछाप प्रयोग गर्नुहोस्"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"तपाईंको ट्याब्लेट हराएका वा चोरी भएका खण्डमा कसैले पनि त्यसको प्रयोग गर्न नसकोस् भन्नाका खातिर स्क्रिन लक प्रयोग गरी त्यसलाई सुरक्षित राख्नुहोस्। अनुहार प्रमाणीकरण गर्ने सुविधा सेट अप गर्न तपाईंलाई स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्, त्यसपछि एउटा PIN सेट गर्नुहोस् वा स्क्रिन लक गर्ने अर्को विकल्प छनौट गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"तपाईंको यन्त्र हराएका वा चोरी भएका खण्डमा कसैले पनि त्यसको प्रयोग गर्न नसकोस् भन्नाका खातिर स्क्रिन लक प्रयोग गरी त्यसलाई सुरक्षित राख्नुहोस्। अनुहार प्रमाणीकरण गर्ने सुविधा सेट अप गर्न तपाईंलाई स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्, त्यसपछि एउटा PIN सेट गर्नुहोस् वा स्क्रिन लक गर्ने अर्को विकल्प छनौट गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"तपाईंको फोन हराएका वा चोरी भएका खण्डमा कसैले पनि त्यसको प्रयोग गर्न नसकोस् भन्नाका खातिर स्क्रिन लक प्रयोग गरी त्यसलाई सुरक्षित राख्नुहोस्। अनुहार प्रमाणीकरण गर्ने सुविधा सेट अप गर्न तपाईंलाई स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्, त्यसपछि एउटा PIN सेट गर्नुहोस् वा स्क्रिन लक गर्ने अर्को विकल्प छनौट गर्नुहोस्।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN सेटअप गर्ने कार्य छाड्ने हो?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"पासवर्ड सेटअप गर्ने कार्य छाड्ने हो?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ढाँच सेटअप गर्ने कार्य छाड्ने हो?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"स्क्रिन लक सेटअप गर्नुहोस्"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"मोबाइल"</item>
+    <item msgid="6007360612667098926">"Wi-Fi मात्र"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1245,7 +1247,7 @@
     <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"डक भएको बेला"</string>
     <string name="screensaver_settings_summary_never" msgid="3995259444981620707">"कहिल्यै पनि होइन"</string>
     <string name="screensaver_settings_summary_off" msgid="6119947316484763131">"बन्द"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलार्इ सक्रिय गर्नुहोस्।"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलाई सक्रिय गर्नुहोस्।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="3763052013516826348">"सुरु हुने समय"</string>
     <string name="screensaver_settings_current" msgid="4017556173596361672">"हालको स्क्रिन सेभर"</string>
     <string name="screensaver_settings_dream_start" msgid="3772227299054662550">"अब सुरु गर्नुहोस्"</string>
@@ -1294,10 +1296,10 @@
     <string name="sim_change_data_ok" msgid="7491552537317573235">"<xliff:g id="CARRIER">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
     <string name="sim_preferred_title" msgid="3389680276182899407">"प्रमुख SIM कार्ड अपडेट गर्ने?"</string>
     <string name="sim_preferred_message" msgid="3751011329746359050">"तपाईंको यन्त्रमा <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM मात्र छ। तपाईं मोबाइल डेटा, कल र SMS सन्देशहरूका लागि यो SIM प्रयोग गर्न चाहनुहुन्छ?"</string>
-    <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"SIM PIN कोड गलत छ तपाईंले अाफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string>
+    <string name="wrong_pin_code_pukked" msgid="3214670264775760428">"SIM PIN कोड गलत छ तपाईंले आफ्नो उपकरण खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्दर्छ।"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="2934318793525717627">
       <item quantity="other"> गलत SIM PIN कोड, तपाईं सँग <xliff:g id="NUMBER_1">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
-      <item quantity="one">SIM PIN कोड गलत छ, तपाईंले अाफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
+      <item quantity="one">SIM PIN कोड गलत छ, तपाईंले आफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
     </plurals>
     <string name="pin_failed" msgid="4877356137480446727">"SIM PIN कार्य बिफल भयो!"</string>
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"प्रणाली  अद्यावधिकहरू"</string>
@@ -2728,7 +2730,7 @@
     <string name="data_usage_metered_wifi_disabled" msgid="5771083253782103415">"मिटर राखिएका सञ्जालहरू चयन गर्न, Wi-Fi खोल्नुहोस्।"</string>
     <string name="data_usage_metered_auto" msgid="7924116401382629319">"स्वचालित"</string>
     <string name="data_usage_metered_yes" msgid="7333744880035386073">"मिटर चल्ने बनाइएको छ"</string>
-    <string name="data_usage_metered_no" msgid="1961524615778610008">"मिटर गरिएको छैन"</string>
+    <string name="data_usage_metered_no" msgid="1961524615778610008">"शुल्क लाग्ने प्रावधान तय नगरिसकिएको"</string>
     <string name="data_usage_disclaimer" msgid="4683321532922590425">"वाहक डेटा लेखाकृत गर्ने तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
     <string name="cryptkeeper_emergency_call" msgid="4625420047524693116">"आपतकालीन कल"</string>
     <string name="cryptkeeper_return_to_call" msgid="4433942821196822815">"कलमा फर्किनुहोस्"</string>
@@ -3059,7 +3061,7 @@
     <string name="keywords_display_brightness_level" msgid="7649410848561920512">"मधुरो स्क्रिन, टचस्क्रिन, ब्याट्री, चहकिलो"</string>
     <string name="keywords_display_night_display" msgid="3647370193110044967">"मधुरो स्क्रिन, रात, टिन्ट, रात्रि ड्युटी, उज्यालोपन, स्क्रिनको रङ, रङ"</string>
     <string name="keywords_display_wallpaper" msgid="1202089324795933197">"पृष्ठभूमि, निजीकृत गर्नुहोस्, प्रदर्शन आफू अनुकूल गर्नुहोस्"</string>
-    <string name="keywords_display_font_size" msgid="1496431330244040196">"पाठ आकार"</string>
+    <string name="keywords_display_font_size" msgid="1496431330244040196">"पाठको आकार"</string>
     <string name="keywords_display_cast_screen" msgid="5744566533025100355">"परियोजना, कास्ट, स्क्रिनको प्रतिविम्ब बनाउने, स्क्रिन आदान प्रदान गर्ने, प्रतिविम्ब बनाउने, स्क्रिन आदान प्रदान, स्क्रिन कास्टिङ"</string>
     <string name="keywords_storage" msgid="7704519289838065803">"ठाउँ, डिस्क, हार्ड ड्राइभ, यन्त्र उपयोग"</string>
     <string name="keywords_battery" msgid="3860198379310375112">"शक्ति उपयोग, चार्ज"</string>
@@ -3602,7 +3604,7 @@
     <string name="notifications_silenced" msgid="538923056987616372">"मौन पारिएको छ"</string>
     <string name="notifications_redacted" msgid="308836040236690014">"लक स्क्रिनमा संवेदनशील सामग्री देखाउने होइन"</string>
     <string name="notifications_hidden" msgid="3665505522897010205">"लक स्क्रिनमा होइन"</string>
-    <string name="notifications_priority" msgid="8849045645983017929">"बाधा नपुर्याउनुहोस् लाई अोभरराइड गरियो"</string>
+    <string name="notifications_priority" msgid="8849045645983017929">"बाधा नपुर्याउनुहोस् लाई ओभरराइड गरियो"</string>
     <string name="notifications_summary_divider" msgid="3148951310482572028">" / "</string>
     <string name="notification_summary_level" msgid="309162160355022027">"स्तर %d"</string>
     <string name="notification_summary_channel" msgid="3372346622071114366">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3757,7 +3759,7 @@
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"स्क्रिनको एउटा छवि पहुँच गर्न सहायक अनुप्रयोगलाई अनुमति दिनुहोस्"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"स्क्रिन झिमझिम पार्नुहोस्"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"सहायक अनुप्रयोगले स्क्रिन वा स्क्रिनसटबाट पाठमाथि पहुँच राख्दा स्क्रिनका किनाराहरू झिमझिम पार्नुहोस्"</string>
-    <string name="assist_footer" msgid="7030121180457472165">"तपाईँले हेर्दै गर्नुभएको स्क्रिन जानकारीमा आधारित भएर सहायक अनुप्रयोगहरूले तपाईँलाई मद्दत गर्न सक्छन्।  केही अनुप्रयोगहरूले तपाईँलाई एकीकृत सहायता दिन दुवै लन्चर र आवाज इनपुट सेवाहरूलाई समर्थन गर्दछन्।"</string>
+    <string name="assist_footer" msgid="7030121180457472165">"सहायक अनुप्रयोगहरूले तपाईंले हेर्दै गर्नुभएको स्क्रिनबाट प्राप्त जानकारीमा आधारित भई तपाईंलाई मद्दत गर्न सक्छन्।केही अनुप्रयोगहरूले तपाईंलाई एकीकृत सहायता दिन दुवै लन्चर र आवाज संलग्न इनपुट सेवाहरूलाई समर्थन गर्दछन्।"</string>
     <string name="average_memory_use" msgid="5333366040118953945">"औसत मेमोरी प्रयोग"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"अधिकतम मेमोरी प्रयोग"</string>
     <string name="memory_usage" msgid="7963253555330830906">"मेमोरी प्रयोग"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"यो सुविधा प्रयोग गर्नुले फोनको कार्यक्षमता सुस्त पार्ने छ"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"पूर्ण GNSS मापनहरू बलपूर्वक लागू गर्नुहोस्"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"कुनै उपयोगिता अनुपात बिना नै सबै GNSS कन्स्टेलेसन तथा फ्रिक्वेन्सीहरूलाई ट्र्याक गर्नुहोस्"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"प्रयोगकर्ता बदल्ने कार्य डिबग गर्नुहोस्"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"प्रयोगकर्ता बदल्दा विस्तृत जानकारी देखाउनुहोस्"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"पृष्ठभूमिको क्रियाकलाप सुरु हुने अनुमति दिनुहोस्"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"पृष्ठभूमिका सबै क्रियाकलाप सुरु हुने अनुमति दिनुहोस्"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"सधैँ क्र्याससम्बन्धी संवाद देखाउनुस्"</string>
diff --git a/tests/CarDeveloperOptions/res/values-nl-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-nl-nokeys/strings.xml
new file mode 100644
index 0000000..12f0eda
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-nl-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Toepassingen beheren"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-nl/arrays.xml b/tests/CarDeveloperOptions/res/values-nl/arrays.xml
new file mode 100644
index 0000000..bb696eb
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-nl/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Azië"</item>
+    <item msgid="6683489385344409742">"Australië"</item>
+    <item msgid="5194868215515664953">"Stille Oceaan"</item>
+    <item msgid="7044520255415007865">"Alle"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 seconden"</item>
+    <item msgid="772029947136115322">"30 seconden"</item>
+    <item msgid="8743663928349474087">"1 minuut"</item>
+    <item msgid="1506508631223164814">"2 minuten"</item>
+    <item msgid="8664703938127907662">"5 minuten"</item>
+    <item msgid="5827960506924849753">"10 minuten"</item>
+    <item msgid="6677424950124253938">"30 minuten"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nooit"</item>
+    <item msgid="2517785806387977252">"15 seconden"</item>
+    <item msgid="6347954399441173672">"30 seconden"</item>
+    <item msgid="4858305253279921789">"1 minuut"</item>
+    <item msgid="8109273437140044073">"2 minuten"</item>
+    <item msgid="2788593551142462622">"5 minuten"</item>
+    <item msgid="8012672183888404961">"10 minuten"</item>
+    <item msgid="8271452751594598661">"30 minuten"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Onmiddellijk"</item>
+    <item msgid="2038544972632026612">"5 seconden"</item>
+    <item msgid="5558060663472279597">"15 seconden"</item>
+    <item msgid="45341168505452037">"30 seconden"</item>
+    <item msgid="227647485917789272">"1 minuut"</item>
+    <item msgid="3367011891231217504">"2 minuten"</item>
+    <item msgid="4376575879222393045">"5 minuten"</item>
+    <item msgid="811192536981678974">"10 minuten"</item>
+    <item msgid="7258394417241706272">"30 minuten"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Klein"</item>
+    <item msgid="591935967183159581">"Standaard"</item>
+    <item msgid="1714184661981538355">"Groot"</item>
+    <item msgid="6195563047686707484">"Grootst"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Scannen..."</item>
+    <item msgid="5597394826455877834">"Verbinding maken..."</item>
+    <item msgid="5848277343965362748">"Verifiëren…"</item>
+    <item msgid="3391238031431440676">"IP-adres ophalen…"</item>
+    <item msgid="5257597310494000224">"Verbonden"</item>
+    <item msgid="8472497592913050396">"Opgeschort"</item>
+    <item msgid="1228072488815999109">"Verbinding verbreken..."</item>
+    <item msgid="7253087004422991731">"Verbinding verbroken"</item>
+    <item msgid="4169850917304751227">"Mislukt"</item>
+    <item msgid="6266658166690831131">"Geblokkeerd"</item>
+    <item msgid="4517230805854909775">"Slechte verbinding tijdelijk vermijden"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Scannen…"</item>
+    <item msgid="8058143476674427024">"Verbinding maken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Verifiëren met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"IP-adres ophalen van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Verbonden met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Opgeschort"</item>
+    <item msgid="4133290864821295785">"Verbinding verbreken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Verbinding verbroken"</item>
+    <item msgid="2847316776634969068">"Mislukt"</item>
+    <item msgid="4390990424746035383">"Geblokkeerd"</item>
+    <item msgid="3618248791367063949">"Slechte verbinding tijdelijk vermijden"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Knop indrukken"</item>
+    <item msgid="7401896200768713930">"Pincode van peerapparaat"</item>
+    <item msgid="4526848028011846710">"Pin van dit apparaat"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Verbonden"</item>
+    <item msgid="983792611851499732">"Uitgenodigd"</item>
+    <item msgid="5438273405428201793">"Mislukt"</item>
+    <item msgid="4646663015449312554">"Beschikbaar"</item>
+    <item msgid="3230556734162006146">"Geen bereik"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuten"</item>
+    <item msgid="2759776603549270587">"5 minuten"</item>
+    <item msgid="167772676068860015">"1 uur"</item>
+    <item msgid="5985477119043628504">"Geen time-out"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Systeemstandaard gebruiken: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slecht"</item>
+    <item msgid="7882129634982603782">"Slecht"</item>
+    <item msgid="6457357501905996224">"Redelijk"</item>
+    <item msgid="405271628162918841">"Goed"</item>
+    <item msgid="999948812884919584">"Uitstekend"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Afgelopen 30 dagen"</item>
+    <item msgid="3211287705232736964">"Gebruikscyclus instellen…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Gebruikstijd"</item>
+    <item msgid="2784401352592276015">"Laatst gebruikt"</item>
+    <item msgid="249854287216326349">"App-naam"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Geen"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Geen"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"Sim"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Geen"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statisch"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Geen"</item>
+    <item msgid="1464741437353223198">"Handleiding"</item>
+    <item msgid="5793600062487886090">"Proxy auto-configuratie"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Geen"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP of CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Niet opgegeven"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Geen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interne apparaatopslag"</item>
+    <item msgid="3186681694079967527">"Verwisselbare SD-kaart"</item>
+    <item msgid="6902033473986647035">"Het systeem laten bepalen"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Locatie"</item>
+    <item msgid="6842381562497597649">"Persoonlijk"</item>
+    <item msgid="3966700236695683444">"Berichten"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Apparaat"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"geschatte locatie"</item>
+    <item msgid="1830619568689922920">"nauwkeurige locatie"</item>
+    <item msgid="3317274469481923141">"gps"</item>
+    <item msgid="8931785990160383356">"trillen"</item>
+    <item msgid="8632513128515114092">"contacten lezen"</item>
+    <item msgid="3741042113569620272">"contacten aanpassen"</item>
+    <item msgid="4204420969709009931">"gesprekslijst lezen"</item>
+    <item msgid="2260380357119423209">"gesprekslijst aanpassen"</item>
+    <item msgid="6550710385014530934">"agenda lezen"</item>
+    <item msgid="3575906174264853951">"agenda aanpassen"</item>
+    <item msgid="4319843242568057174">"wifi-scan"</item>
+    <item msgid="2981791890467303819">"melding"</item>
+    <item msgid="6617825156152476692">"mobiele scan"</item>
+    <item msgid="8865260890611559753">"nummer bellen"</item>
+    <item msgid="3254999273961542982">"sms lezen"</item>
+    <item msgid="7711446453028825171">"sms schrijven"</item>
+    <item msgid="6123238544099198034">"sms ontvangen"</item>
+    <item msgid="838342167431596036">"nood-sms ontvangen"</item>
+    <item msgid="8554432731560956686">"mms ontvangen"</item>
+    <item msgid="7464863464299515059">"WAP-push ontvangen"</item>
+    <item msgid="310463075729606765">"sms verzenden"</item>
+    <item msgid="7338021933527689514">"ICC sms lezen"</item>
+    <item msgid="6130369335466613036">"ICC sms schrijven"</item>
+    <item msgid="6536865581421670942">"instellingen aanpassen"</item>
+    <item msgid="4547203129183558973">"bovenop tekenen"</item>
+    <item msgid="9080347512916542840">"toegang tot meldingen"</item>
+    <item msgid="5332718516635907742">"camera"</item>
+    <item msgid="6098422447246167852">"audio opnemen"</item>
+    <item msgid="9182794235292595296">"audio afspelen"</item>
+    <item msgid="8760743229597702019">"klembord lezen"</item>
+    <item msgid="2266923698240538544">"klembord aanpassen"</item>
+    <item msgid="1801619438618539275">"mediaknoppen"</item>
+    <item msgid="31588119965784465">"audiofocus"</item>
+    <item msgid="7565226799008076833">"hoofdvolume"</item>
+    <item msgid="5420704980305018295">"stemvolume"</item>
+    <item msgid="5797363115508970204">"ringtonevolume"</item>
+    <item msgid="8233154098550715999">"mediavolume"</item>
+    <item msgid="5196715605078153950">"wekkervolume"</item>
+    <item msgid="394030698764284577">"meldingsvolume"</item>
+    <item msgid="8952898972491680178">"bluetooth-volume"</item>
+    <item msgid="8506227454543690851">"ingeschakeld houden"</item>
+    <item msgid="1108160036049727420">"monitorlocatie"</item>
+    <item msgid="1496205959751719491">"locatie met hoog energieverbruik controleren"</item>
+    <item msgid="3776296279910987380">"gebruiksstatistieken ophalen"</item>
+    <item msgid="8827100324471975602">"microfoon dempen/dempen opheffen"</item>
+    <item msgid="6880736730520126864">"toast weergeven"</item>
+    <item msgid="4933375960222609935">"media projecteren"</item>
+    <item msgid="8357907018938895462">"VPN activeren"</item>
+    <item msgid="8143812849911310973">"achtergrond schrijven"</item>
+    <item msgid="6266277260961066535">"structuur voor ondersteuning"</item>
+    <item msgid="7715498149883482300">"screenshot voor ondersteuning"</item>
+    <item msgid="4046679376726313293">"telefoonstatus lezen"</item>
+    <item msgid="6329507266039719587">"voicemail toevoegen"</item>
+    <item msgid="7692440726415391408">"SIP gebruiken"</item>
+    <item msgid="8572453398128326267">"uitgaand gesprek verwerken"</item>
+    <item msgid="7775674394089376306">"vingerafdruk"</item>
+    <item msgid="3182815133441738779">"lichaamssensoren"</item>
+    <item msgid="2793100005496829513">"cell broadcasts lezen"</item>
+    <item msgid="2633626056029384366">"neplocatie"</item>
+    <item msgid="8356842191824684631">"opslag lezen"</item>
+    <item msgid="5671906070163291500">"schrijven naar opslag"</item>
+    <item msgid="2791955098549340418">"scherm inschakelen"</item>
+    <item msgid="5599435119609178367">"accounts ophalen"</item>
+    <item msgid="1165623660533024666">"uitvoeren op de achtergrond"</item>
+    <item msgid="6423861043647911030">"toegankelijkheidsvolume"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Locatie"</item>
+    <item msgid="6656077694190491067">"Locatie"</item>
+    <item msgid="8790228218278477369">"Locatie"</item>
+    <item msgid="7836406246005211990">"Trillen"</item>
+    <item msgid="3951439024549922598">"Contacten lezen"</item>
+    <item msgid="8802152411647068">"Contacten aanpassen"</item>
+    <item msgid="229544934599698735">"Gesprekslijst lezen"</item>
+    <item msgid="7396102294405899613">"Gesprekslijst aanpassen"</item>
+    <item msgid="3597797992398484655">"Agenda lezen"</item>
+    <item msgid="2705975774250907343">"Agenda aanpassen"</item>
+    <item msgid="4668747371441932697">"Locatie"</item>
+    <item msgid="1487578921720243646">"Melding verzenden"</item>
+    <item msgid="4636080349724146638">"Locatie"</item>
+    <item msgid="673510900286463926">"Nummer bellen"</item>
+    <item msgid="542083422784609790">"Sms/mms lezen"</item>
+    <item msgid="1033780373029588436">"Sms/mms schrijven"</item>
+    <item msgid="5647111115517787488">"Sms/mms ontvangen"</item>
+    <item msgid="8591105601108455893">"Sms/mms ontvangen"</item>
+    <item msgid="7730995008517841903">"Sms/mms ontvangen"</item>
+    <item msgid="2613033109026626086">"Sms/mms ontvangen"</item>
+    <item msgid="3037159047591081136">"Sms/mms verzenden"</item>
+    <item msgid="4726682243833913568">"Sms/mms lezen"</item>
+    <item msgid="6555678522277865572">"Sms/mms schrijven"</item>
+    <item msgid="6981734935578130884">"Instellingen aanpassen"</item>
+    <item msgid="8705854389991425629">"Bovenop tekenen"</item>
+    <item msgid="5861356020344153651">"Toegang tot meldingen"</item>
+    <item msgid="78432174621628659">"Camera"</item>
+    <item msgid="3986116419882154794">"Audio opnemen"</item>
+    <item msgid="4516840825756409490">"Audio afspelen"</item>
+    <item msgid="6811712502798183957">"Klembord lezen"</item>
+    <item msgid="2780369012602289114">"Klembord aanpassen"</item>
+    <item msgid="2331359440170850868">"Mediaknoppen"</item>
+    <item msgid="6133599737122751231">"Audiofocus"</item>
+    <item msgid="6844485713404805301">"Hoofdvolume"</item>
+    <item msgid="1600379420669104929">"Stemvolume"</item>
+    <item msgid="6296768210470214866">"Ringtonevolume"</item>
+    <item msgid="510690696071629241">"Mediavolume"</item>
+    <item msgid="406861638631430109">"Wekkervolume"</item>
+    <item msgid="4715864795872233884">"Meldingsvolume"</item>
+    <item msgid="2311478519251301183">"Bluetooth-volume"</item>
+    <item msgid="5133991377896747027">"Ingeschakeld houden"</item>
+    <item msgid="2464189519136248621">"Locatie"</item>
+    <item msgid="2062677934050803037">"Locatie"</item>
+    <item msgid="1735171933192715957">"Gebruiksstatistieken ophalen"</item>
+    <item msgid="1014093788778383554">"Microfoon dempen/dempen opheffen"</item>
+    <item msgid="4199297950608622850">"Toast weergeven"</item>
+    <item msgid="2527962435313398821">"Media projecteren"</item>
+    <item msgid="5117506254221861929">"VPN activeren"</item>
+    <item msgid="8291198322681891160">"Achtergrond schrijven"</item>
+    <item msgid="7106921284621230961">"Structuur voor ondersteuning"</item>
+    <item msgid="4496533640894624799">"Screenshot voor ondersteuning"</item>
+    <item msgid="2598847264853993611">"Telefoonstatus lezen"</item>
+    <item msgid="9215610846802973353">"Voicemail toevoegen"</item>
+    <item msgid="9186411956086478261">"SIP gebruiken"</item>
+    <item msgid="6884763100104539558">"Uitgaand gesprek verwerken"</item>
+    <item msgid="125513972170580692">"Vingerafdruk"</item>
+    <item msgid="2556071024281275619">"Lichaamssensoren"</item>
+    <item msgid="617168514928339387">"Cell broadcasts lezen"</item>
+    <item msgid="7134693570516523585">"Neplocatie"</item>
+    <item msgid="7224489175375229399">"Opslag lezen"</item>
+    <item msgid="8472735063903258202">"Schrijven naar opslag"</item>
+    <item msgid="4069276819909595110">"Scherm inschakelen"</item>
+    <item msgid="1228338896751121025">"Accounts ophalen"</item>
+    <item msgid="3181581793459233672">"Uitvoeren op de achtergrond"</item>
+    <item msgid="2340936043025374076">"Toegankelijkheidsvolume"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kort"</item>
+    <item msgid="4816511817309094890">"Gemiddeld"</item>
+    <item msgid="8305084671259331134">"Lang"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Standaard"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif versmald"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursief"</item>
+    <item msgid="6896773537705206194">"Kleine kapitalen"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Zeer klein"</item>
+    <item msgid="5091603983404027034">"Klein"</item>
+    <item msgid="176844712416932112">"Normaal"</item>
+    <item msgid="2784236342175159295">"Groot"</item>
+    <item msgid="218913203203160606">"Zeer groot"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Standaard"</item>
+    <item msgid="6488643537808152001">"Geen"</item>
+    <item msgid="552332815156010137">"Contour"</item>
+    <item msgid="7187891159463789272">"Slagschaduw"</item>
+    <item msgid="8019330250538856521">"Verhoogd"</item>
+    <item msgid="8987385315647049787">"Verlaagd"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Standaard"</item>
+    <item msgid="8611890312638868524">"Wit op zwart"</item>
+    <item msgid="5891360837786277638">"Zwart op wit"</item>
+    <item msgid="2798457065945456853">"Geel op zwart"</item>
+    <item msgid="5799049811524553967">"Geel op blauw"</item>
+    <item msgid="3673930830658169860">"Aangepast"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP-VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec-VPN met van tevoren gedeelde sleutels"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec-VPN met certificaten"</item>
+    <item msgid="312397853907741968">"IPSec VPN-met van tevoren gedeelde sleutels en Xauth-authenticatie"</item>
+    <item msgid="3319427315593649917">"IPSec-VPN met certificaten en Xauth-authenticatie"</item>
+    <item msgid="8258927774145391041">"IPSec-VPN met certificaten en hybride authenticatie"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Geen"</item>
+    <item msgid="1157046369795346308">"Handleiding"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Verbinding verbroken"</item>
+    <item msgid="8754480102834556765">"Initialiseren..."</item>
+    <item msgid="3351334355574270250">"Verbinding maken..."</item>
+    <item msgid="8303882153995748352">"Verbonden"</item>
+    <item msgid="9135049670787351881">"Time-out"</item>
+    <item msgid="2124868417182583926">"Mislukt"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Vragen"</item>
+    <item msgid="7718817231348607934">"Nooit toestaan"</item>
+    <item msgid="8184570120217958741">"Altijd toestaan"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Permanent"</item>
+    <item msgid="167418068739176448">"Topactiviteit"</item>
+    <item msgid="4760813290195199773">"Belangrijk (voorgrond)"</item>
+    <item msgid="2328684826817647595">"Belangrijk (achtergrond)"</item>
+    <item msgid="7746406490652867365">"Back-up"</item>
+    <item msgid="5597404364389196754">"Zwaar gewicht"</item>
+    <item msgid="1290888779300174556">"Service (actief)"</item>
+    <item msgid="7241098542073939046">"Service (opnieuw starten)"</item>
+    <item msgid="6610439017684111046">"Ontvanger"</item>
+    <item msgid="7367606086319921117">"Thuis"</item>
+    <item msgid="3344660712396741826">"Laatste activiteit"</item>
+    <item msgid="5006559348883303865">"Gecacht (activiteit)"</item>
+    <item msgid="8633480732468137525">"Gecacht (activiteitsclient)"</item>
+    <item msgid="6248998242443333892">"Gecacht (leeg)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Blauwgroen"</item>
+    <item msgid="3228505970082457852">"Blauw"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Paars"</item>
+    <item msgid="5932337981182999919">"Roze"</item>
+    <item msgid="5642914536624000094">"Rood"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Meer dan 30 dagen oud"</item>
+    <item msgid="8699273238891265610">"Meer dan 60 dagen oud"</item>
+    <item msgid="8346279419423837266">"Meer dan 90 dagen oud"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Automatisch detecteren"</item>
+    <item msgid="773943026484148895">"Behandelen als wifi met datalimiet"</item>
+    <item msgid="1008268820118852416">"Behandelen als wifi zonder datalimiet"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Willekeurig MAC-adres gebruiken (standaard)"</item>
+    <item msgid="214234417308375326">"MAC-adres van apparaat gebruiken"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nee"</item>
+    <item msgid="1930581185557754880">"Ja"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Donker"</item>
+    <item msgid="5079453644557603349">"Licht"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Uit"</item>
+    <item msgid="4072198137051566919">"Fouten opsporen"</item>
+    <item msgid="2473005316958868509">"Uitgebreid"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Alleen thuis"</item>
+    <item msgid="1161026694891024702">"Automatisch"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Voorkeur voor GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Alleen GSM"</item>
+    <item msgid="8579197487913425819">"Alleen WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatisch"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatisch"</item>
+    <item msgid="4219607161971472471">"CDMA zonder EvDo"</item>
+    <item msgid="7278975240951052041">"Alleen EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Algemeen"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Alleen TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Algemeen"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-nl/strings.xml b/tests/CarDeveloperOptions/res/values-nl/strings.xml
index 4a23837..8d5a612 100644
--- a/tests/CarDeveloperOptions/res/values-nl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nl/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Bescherm je tablet met een schermvergrendelingsoptie zodat anderen je apparaat niet kunnen gebruiken als je het kwijtraakt of het wordt gestolen. Je hebt ook een schermvergrendelingsoptie nodig om gezichtsverificatie in te stellen. Tik op Annuleren en stel een pincode in of kies een andere schermvergrendelingsoptie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Bescherm je apparaat met een schermvergrendelingsoptie zodat anderen het niet kunnen gebruiken als je het kwijtraakt of het wordt gestolen. Je hebt ook een schermvergrendelingsoptie nodig om gezichtsverificatie in te stellen. Tik op Annuleren en stel een pincode in of kies een andere schermvergrendelingsoptie."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Bescherm je telefoon met een schermvergrendelingsoptie zodat anderen je apparaat niet kunnen gebruiken als je het kwijtraakt of het wordt gestolen. Je hebt ook een schermvergrendelingsoptie nodig om gezichtsverificatie in te stellen. Tik op Annuleren en stel een pincode in of kies een andere schermvergrendelingsoptie."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Instellen pincode overslaan?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Instell. wachtwoord overslaan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Instellen patroon overslaan?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Schermvergrendeling instellen"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wifi"</item>
+    <item msgid="4421333712484542489">"Mobiel"</item>
+    <item msgid="6007360612667098926">"Alleen wifi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2656,8 +2658,8 @@
     <string name="data_usage_menu_split_4g" msgid="2264683155484246409">"4G-gebruik apart weergeven"</string>
     <string name="data_usage_menu_show_wifi" msgid="8444311679299008486">"Wifi weergeven"</string>
     <string name="data_usage_menu_hide_wifi" msgid="1808008314306824090">"Wifi verbergen"</string>
-    <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"Ethernet-gebruik weergeven"</string>
-    <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"Ethernet-gebruik verbergen"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"Ethernetgebruik weergeven"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"Ethernetgebruik verbergen"</string>
     <string name="data_usage_menu_metered" msgid="3087525150259956831">"Netwerkbeperkingen"</string>
     <string name="data_usage_menu_auto_sync" msgid="3350154877737572146">"Gegevens automatisch synchroniseren"</string>
     <string name="data_usage_menu_sim_cards" msgid="8508154611676507088">"Simkaarten"</string>
@@ -2902,7 +2904,7 @@
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"De gespreksgeschiedenis wordt met deze gebruiker gedeeld."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"Telefoonoproepen en sms inschakelen?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"De gespreks- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
-    <string name="emergency_info_title" msgid="1522609271881425375">"Informatie bij nood"</string>
+    <string name="emergency_info_title" msgid="1522609271881425375">"Noodinformatie"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"Informatie en contacten voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"Apps en content toestaan"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Apps met beperkingen"</string>
@@ -3029,8 +3031,8 @@
     <string name="network_dashboard_summary_data_usage" msgid="4695629715072542102">"datagebruik"</string>
     <string name="network_dashboard_summary_hotspot" msgid="3928610802321995214">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="7795222675849060444">"Verbonden apparaten"</string>
-    <string name="connected_devices_dashboard_summary" msgid="1072664369515033179">"Bluetooth, rijmodus, NFC"</string>
-    <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, rijmodus"</string>
+    <string name="connected_devices_dashboard_summary" msgid="1072664369515033179">"Bluetooth, rijstand, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, rijstand"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="3524409078596318803">"Bluetooth, NFC"</string>
     <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="7881286613528299400">"Bluetooth"</string>
     <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps en meldingen"</string>
@@ -3929,12 +3931,12 @@
     <string name="cellular_data_usage" msgid="1236562234207782386">"Gebruik van mobiele data"</string>
     <string name="app_cellular_data_usage" msgid="8499761516172121957">"Datagebruik van app"</string>
     <string name="wifi_data_usage" msgid="275569900562265895">"Wifi-datagebruik"</string>
-    <string name="ethernet_data_usage" msgid="747614925362556718">"Ethernet-datagebruik"</string>
+    <string name="ethernet_data_usage" msgid="747614925362556718">"Ethernetdatagebruik"</string>
     <string name="wifi" msgid="1586738489862966138">"Wifi"</string>
     <string name="ethernet" msgid="2365753635113154667">"Ethernet"</string>
     <string name="cell_data_template" msgid="5473177306229738078">"<xliff:g id="AMOUNT">^1</xliff:g> mobiele data"</string>
     <string name="wifi_data_template" msgid="3146090439147042068">"<xliff:g id="AMOUNT">^1</xliff:g> wifi-data"</string>
-    <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> Ethernet-data"</string>
+    <string name="ethernet_data_template" msgid="6414118030827090119">"<xliff:g id="AMOUNT">^1</xliff:g> ethernetdata"</string>
     <string name="billing_cycle" msgid="5740717948341713190">"Datawaarschuwing en -limiet"</string>
     <string name="app_usage_cycle" msgid="213483325132959663">"Gebruikscyclus app-data"</string>
     <string name="cell_data_warning" msgid="8902740337286652689">"<xliff:g id="ID_1">^1</xliff:g> datawaarschuwing"</string>
@@ -4124,7 +4126,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Pak je telefoon op om de tijd, meldingen en andere informatie te bekijken."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Pak je tablet op om de tijd, meldingen en andere informatie te bekijken."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Pak je apparaat op om de tijd, meldingen en andere informatie te bekijken."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Tik om telefoon te controleren"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Tikken om telefoon te checken"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Tik om tablet te controleren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Tik om apparaat te controleren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Tik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"De functie vertraagt deze telefoon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Volledige GNSS-metingen afdwingen"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Alle GNSS-constellaties en -frequenties bijhouden zonder duty cycling"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Fouten bij schakelen tussen gebruikers oplossen"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Gedetailleerde informatie weergeven tijdens schakelen tussen gebruikers"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Starts van activiteit op de achtergrond toestaan"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Hiermee worden alle starts van activiteit op de achtergrond toegestaan"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Altijd een crashvenster weergeven"</string>
@@ -4469,7 +4473,7 @@
     <string name="contextual_card_removed_message" msgid="4047307820743366876">"Suggestie verwijderd"</string>
     <string name="contextual_card_undo_dismissal_text" msgid="5009245286931852012">"Ongedaan maken"</string>
     <string name="low_storage_summary" msgid="4562224870189133400">"Opslag is bijna vol. <xliff:g id="PERCENTAGE">%1$s</xliff:g> gebruikt - <xliff:g id="FREE_SPACE">%2$s</xliff:g> vrij"</string>
-    <string name="contextual_card_feedback_send" msgid="8698649023854350623">"Feedback verzenden"</string>
+    <string name="contextual_card_feedback_send" msgid="8698649023854350623">"Feedback sturen"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3987973028353264878">"Wil je ons feedback geven over deze suggestie?"</string>
     <string name="copyable_slice_toast" msgid="1357518174923789947">"<xliff:g id="COPY_CONTENT">%1$s</xliff:g> gekopieerd naar klembord."</string>
     <string name="search_bar_account_avatar_content_description" msgid="947628881535053409"></string>
diff --git a/tests/CarDeveloperOptions/res/values-or-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-or-nokeys/strings.xml
new file mode 100644
index 0000000..c35363f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-or-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ଆପ୍ଲିକେଶନ୍‌ଗୁଡ଼ିକର ପରିଚାଳନା କରନ୍ତୁ"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-or/arrays.xml b/tests/CarDeveloperOptions/res/values-or/arrays.xml
new file mode 100644
index 0000000..518431f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-or/arrays.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"ଆମେରିକା"</item>
+    <item msgid="4791956477275129121">"ୟୁରୋପ"</item>
+    <item msgid="3812126832016254559">"ଆଫ୍ରିକା"</item>
+    <item msgid="2765816300353408280">"ଏସିଆ"</item>
+    <item msgid="6683489385344409742">"ଅଷ୍ଟ୍ରେଲିଆ"</item>
+    <item msgid="5194868215515664953">"ପେସିଫିକ୍‌"</item>
+    <item msgid="7044520255415007865">"ସମସ୍ତ"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for screen_timeout_entries:5 (5827960506924849753) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ତୁରନ୍ତ"</item>
+    <item msgid="2038544972632026612">"5 ସେକେଣ୍ଡ"</item>
+    <item msgid="5558060663472279597">"15 ସେକେଣ୍ଡ"</item>
+    <item msgid="45341168505452037">"30 ସେକେଣ୍ଡ"</item>
+    <item msgid="227647485917789272">"1 ମିନିଟ୍"</item>
+    <item msgid="3367011891231217504">"2 ମିନିଟ୍"</item>
+    <item msgid="4376575879222393045">"5 ମିନିଟ୍"</item>
+    <item msgid="811192536981678974">"10 ମିନିଟ୍"</item>
+    <item msgid="7258394417241706272">"30 ମିନିଟ୍"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"ସଂଯୋଗ ହୋଇଛି"</item>
+    <item msgid="983792611851499732">"ଆମନ୍ତ୍ରିତ"</item>
+    <item msgid="5438273405428201793">"ଅସଫଳ"</item>
+    <item msgid="4646663015449312554">"ଉପଲବ୍ଧ"</item>
+    <item msgid="3230556734162006146">"ପରିସୀମା ବାହାରେ"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ସିଷ୍ଟମ୍ ଡିଫଲ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"୧"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"ଗତ 30 ଦିନ"</item>
+    <item msgid="3211287705232736964">"ବ୍ୟବହାରର ଚକ୍ର ସେଟ୍‌ କରନ୍ତୁ…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ବ୍ୟବହାର ସମୟ"</item>
+    <item msgid="2784401352592276015">"ଶେଷ ଥର ବ୍ୟବହୃତ"</item>
+    <item msgid="249854287216326349">"ଆପ୍‌ର ନାମ"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"କିଛି ନୁହେଁ"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"କିଛି ନୁହେଁ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"କିଛି ନୁହେଁ"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"କିଛି ନୁହେଁ"</item>
+    <item msgid="1464741437353223198">"ମାନୁଆଲ୍‌"</item>
+    <item msgid="5793600062487886090">"ପ୍ରକ୍ସୀ ଅଟୋ-କନ୍‌ପିଗରେସନ୍"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"କିଛି ନୁହେଁ"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP କିମ୍ବା CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+    <!-- no translation found for bearer_entries:0 (5231094118929435723) -->
+    <!-- no translation found for bearer_entries:9 (7246853278334311652) -->
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"କିଛି ନୁହେଁ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ଇଣ୍ଟର୍ନଲ୍‍ ଡିଭାଇସ୍‌ ଷ୍ଟୋରେଜ୍‌"</item>
+    <item msgid="3186681694079967527">"ଅପସାରଣୀୟ SD କାର୍ଡ"</item>
+    <item msgid="6902033473986647035">"ସିଷ୍ଟମକୁ ନିଷ୍ପତ୍ତି ନେବାକୁ ଦିଅନ୍ତୁ"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ଅବସ୍ଥାନ"</item>
+    <item msgid="6842381562497597649">"ବ୍ୟକ୍ତିଗତ"</item>
+    <item msgid="3966700236695683444">"ମେସେଜିଙ୍ଗ"</item>
+    <item msgid="8563996233342430477">"ମିଡିଆ"</item>
+    <item msgid="5323851085993963783">"ଡିଭାଇସ୍"</item>
+  </string-array>
+    <!-- no translation found for app_ops_summaries:46 (4933375960222609935) -->
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+    <!-- no translation found for app_ops_labels:48 (8291198322681891160) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"କମ୍"</item>
+    <item msgid="4816511817309094890">"ମଧ୍ୟମ"</item>
+    <item msgid="8305084671259331134">"ଲମ୍ଵା"</item>
+  </string-array>
+    <!-- no translation found for captioning_typeface_selector_titles:4 (1487203730637617924) -->
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"ପୂର୍ବରୁ ସେୟାର୍‌ ହୋଇଥିବା କୀଗୁଡ଼ିକ ସହ L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"ସର୍ଟିଫିକେଟ୍‌ ସହ L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"ସେୟାର୍‌ କରାଯାଇଥିବା କୀ’ଗୁଡ଼ିକ ସହିତ IPSec VPN ଏବଂ Xauth ସତ୍ୟାପନ"</item>
+    <item msgid="3319427315593649917">"ସର୍ଟିଫିକେଟ୍‌ ଏବଂ Xauth ପ୍ରାମାଣିକୀକରଣ ସହ IPSec VPN"</item>
+    <item msgid="8258927774145391041">"ସର୍ଟିଫିକେଟ୍‌ ଓ ହାଇବ୍ରିଡ୍‌ ସତ୍ୟାପନ ସହ IPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_proxy_settings:0 (2958623927055120839) -->
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ପଚାରନ୍ତୁ"</item>
+    <item msgid="7718817231348607934">"ଆଦୌ ଅନୁମତି ଦିଅନାହିଁ"</item>
+    <item msgid="8184570120217958741">"ସର୍ବଦା ଅନୁମତି ଦିଅନ୍ତୁ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ନିରନ୍ତର"</item>
+    <item msgid="167418068739176448">"ଶ୍ରେଷ୍ଠ ଗତିବିଧି"</item>
+    <item msgid="4760813290195199773">"ଜରୁରୀ (ଫୋର୍‌ଗ୍ରାଉଣ୍ଡ)"</item>
+    <item msgid="2328684826817647595">"ଗୁରୁତ୍ଵପୁର୍ଣ୍ଣ (ପୃଷ୍ଠପଟ)"</item>
+    <item msgid="7746406490652867365">"ବ୍ୟାକଅପ୍‌"</item>
+    <item msgid="5597404364389196754">"ଭାରୀ"</item>
+    <item msgid="1290888779300174556">"ସେବା (ଚାଲୁଛି)"</item>
+    <item msgid="7241098542073939046">"ସେବା (ରିଷ୍ଟାର୍ଟ ହେଉଛି)"</item>
+    <item msgid="6610439017684111046">"ପ୍ରାପକ"</item>
+    <item msgid="7367606086319921117">"ହୋମ୍‌"</item>
+    <item msgid="3344660712396741826">"ଶେଷ ଗତିବିଧି"</item>
+    <item msgid="5006559348883303865">"କ୍ୟାଶ୍ ହୋଇଥିବା (କାର୍ଯ୍ୟକଳାପ)"</item>
+    <item msgid="8633480732468137525">"କ୍ୟାଶ୍ ହୋଇଥିବା (କାର୍ଯ୍ୟକଳାପ କ୍ଲାଏଣ୍ଟ)"</item>
+    <item msgid="6248998242443333892">"କ୍ୟାଶ୍ ହୋଇଥିବା (ଖାଲି)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"ଟିଲ୍"</item>
+    <item msgid="3228505970082457852">"ନୀଳ"</item>
+    <item msgid="6590260735734795647">"ଇଣ୍ଡିଗୋ"</item>
+    <item msgid="3521763377357218577">"ବାଇଗଣୀ"</item>
+    <item msgid="5932337981182999919">"ଗୋଲାପୀ"</item>
+    <item msgid="5642914536624000094">"ନାଲି"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 ଦିନରୁ ଅଧିକ ପୁରୁଣା"</item>
+    <item msgid="8699273238891265610">"60 ଦିନରୁ ଅଧିକ ପୁରୁଣା"</item>
+    <item msgid="8346279419423837266">"90 ଦିନରୁ ବି ଅଧିକ ପୁରୁଣା"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"୧"</item>
+    <item msgid="3118234477029486741">"୦"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ସ୍ଵଚାଳିତ ଭାବେ ଚିହ୍ନଟ କରନ୍ତୁ"</item>
+    <item msgid="773943026484148895">"ମିଟର୍ ହୋଇଥିବା ରୂପେ ବିବେଚନା କରନ୍ତୁ"</item>
+    <item msgid="1008268820118852416">"ମିଟର୍ ହୋଇନଥିବା ରୂପେ ବିବେଚନା କରନ୍ତୁ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ରେଣ୍ଡମାଇଜ୍ ହୋଇଥିବା MAC ବ୍ୟବହାର କରନ୍ତୁ (ଡିଫଲ୍ଟ)"</item>
+    <item msgid="214234417308375326">"ଡିଭାଇସ୍‍ MAC ବ୍ୟବହାର କରନ୍ତୁ"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ନାଁ"</item>
+    <item msgid="1930581185557754880">"ହଁ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ଗାଢ଼"</item>
+    <item msgid="5079453644557603349">"ଫିକା"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ଅଫ୍"</item>
+    <item msgid="4072198137051566919">"ଡିବଗ୍ କରନ୍ତୁ"</item>
+    <item msgid="2473005316958868509">"ଶବ୍ଦବହୁଳ"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"କେବଳ ହୋମ୍ ନେଟ୍‌ୱର୍କ"</item>
+    <item msgid="1161026694891024702">"ସ୍ଵତଃଚାଳିତ"</item>
+  </string-array>
+    <!-- no translation found for preferred_network_mode_choices:11 (5713723042183940349) -->
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ଗ୍ଲୋବାଲ୍"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-or/strings.xml b/tests/CarDeveloperOptions/res/values-or/strings.xml
index bc44cca..08c5173 100644
--- a/tests/CarDeveloperOptions/res/values-or/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-or/strings.xml
@@ -223,7 +223,7 @@
     <string name="radio_info_current_network_label" msgid="5785805819312999094">"ବର୍ତ୍ତମାନର ନେଟ୍‌ୱର୍କ:"</string>
     <string name="radio_info_ppp_received_label" msgid="5217391494757374330">"ପାଇଥିବା ଡାଟା:"</string>
     <string name="radio_info_gsm_service_label" msgid="7488842563230281026">"ଭଏସ୍‌ ସେବା:"</string>
-    <string name="radio_info_signal_strength_label" msgid="7773514616083573394">"ସିଗ୍‌ନାଲ୍‌ ଶକ୍ତି:"</string>
+    <string name="radio_info_signal_strength_label" msgid="7773514616083573394">"ସିଗ୍‌ନାଲ୍‌ ଦକ୍ଷତା:"</string>
     <string name="radio_info_call_status_label" msgid="8241020608714164780">"ଭଏସ୍‌ କଲ୍‌ ସ୍ଥିତି:"</string>
     <string name="radio_info_ppp_sent_label" msgid="8397460098110761906">"ପଠାଯାଇଥିବା ଡାଟା:"</string>
     <string name="radio_info_message_waiting_label" msgid="2660886722520568584">"ବାର୍ତ୍ତା ଅପକ୍ଷାରତ:"</string>
@@ -480,8 +480,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଟାବ୍‌ଲେଟ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ, ଯାହା ଫଳରେ ଏହା ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ, କେହି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ମଧ୍ୟ୍ୟ ମୁହଁ ପ୍ରମାଣିକିକରଣ ସେଟ୍ ଅପ୍ କରିବାକୁ ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ଆବଶ୍ୟକ କରନ୍ତି। ବାତିଲ୍ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ, ତାପରେ ଏକ PIN ସେଟ୍ କରନ୍ତୁ କିମ୍ବା ଅନ୍ୟ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ବାଛନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ, ଯାହା ଫଳରେ ଏହା ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ, କେହି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ମଧ୍ୟ୍ୟ ମୁହଁ ପ୍ରମାଣିକିକରଣ ସେଟ୍ ଅପ୍ କରିବାକୁ ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ଆବଶ୍ୟକ କରନ୍ତି। ବାତିଲ୍ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ, ତାପରେ ଏକ PIN ସେଟ୍ କରନ୍ତୁ କିମ୍ବା ଅନ୍ୟ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ବାଛନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଫୋନ୍‌କୁ ସୁରକ୍ଷିତ ରଖନ୍ତୁ, ଯାହା ଫଳରେ ଏହା ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ, କେହି ଏହାକୁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ମଧ୍ୟ୍ୟ ମୁହଁ ପ୍ରମାଣିକିକରଣ ସେଟ୍ ଅପ୍ କରିବାକୁ ଏକ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ଆବଶ୍ୟକ କରନ୍ତି। ବାତିଲ୍ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ, ତାପରେ ଏକ PIN ସେଟ୍ କରନ୍ତୁ କିମ୍ବା ଅନ୍ୟ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବିକଳ୍ପ ବାଛନ୍ତୁ।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ପାସ୍‌ୱାର୍ଡ ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ପାଟର୍ନ ସେଟ୍ ଅପ୍‌କୁ ବାଦ୍ ଦେବେ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
@@ -872,7 +871,7 @@
     <string name="wifi_switch_away_when_unvalidated" msgid="2418577764071293971">"ଯଦି ୱାଇ-ଫାଇ ଇଣ୍ଟରନେଟ୍‌ ଆକସେସ୍‌ ହରାଏ ମୋବାଇଲ୍‌ ଡାଟାକୁ ବଦଳାନ୍ତୁ।"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="5067241930716252665">"ସ୍ୱଚାଳିତ ଭାବେ ମୋବାଇଲ୍‌ ଡାଟାକୁ ଯାଆନ୍ତୁ"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="2721467405851519769">"Wi‑Fiର ଇଣ୍ଟରନେଟ ଆକ୍ସେସ ନଥିବାବେଳେ ମୋବାଇଲ ଡାଟା ବ୍ୟବହାର କରନ୍ତୁ। ଡାଟା ବ୍ୟବହାର ଦେୟ ଲାଗୁ ହୋଇପାରେ।"</string>
-    <string name="wifi_add_network" msgid="4094957940791876640">"ନେଟ୍‌ୱାର୍କ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="wifi_add_network" msgid="4094957940791876640">"ନେଟ୍‌ୱାର୍କ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2678534679408777268">"ୱାଇ-ଫାଇ ପସନ୍ଦ"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="5714892572614655675">"ୱାଇ-ଫାଇ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍‌ ହୋଇଯାଉ"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="286904094152909651">"ସ୍ୱଚାଳିତ ଭାବେ ୱାଇ-ଫାଇ ପୁଣି ଅନ୍‌ ହେବନାହିଁ"</string>
@@ -900,11 +899,11 @@
     <string name="wifi_advanced_toggle_description_expanded" msgid="1506697245302596510">"ଡ୍ରପ୍‌ ଡାଉନ୍‌ ତାଲିକା ବିକଶିତ ବିକଳ୍ପଗୁଡିକ। ହ୍ରାସ କରିବାକୁ ଦୁଇଥର-ଟାପ୍‌ କରନ୍ତୁ।"</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="3014965593695454879">"ଡ୍ରପ୍‌ ଡାଉନ୍‌ ତାଲିକା ବିକଶିତ ବିକଳ୍ପଗୁଡିକ। ବଢାଇବାକୁ ଦୁଇଥର-ଟାପ୍‌ କରନ୍ତୁ।"</string>
     <string name="wifi_ssid" msgid="6746270925975522641">"ନେଟ୍‌ୱାର୍କର ନାମ"</string>
-    <string name="wifi_ssid_hint" msgid="5010024648106585165">"SSID ପ୍ରବେଶ କରନ୍ତୁ"</string>
+    <string name="wifi_ssid_hint" msgid="5010024648106585165">"SSID ଲେଖନ୍ତୁ"</string>
     <string name="wifi_security" msgid="9136702039496152831">"ସୁରକ୍ଷା"</string>
     <string name="wifi_hidden_network" msgid="6647772204699776833">"ଲୁଚିଥିବା ନେଟ୍‌ୱର୍କ"</string>
     <string name="wifi_hidden_network_warning" msgid="8182333050353796473">"ଯଦି ଆପଣଙ୍କ ରାଉଟର୍ ଗୋଟିଏ ନେଟ୍‌ୱର୍କ IDକୁ ପ୍ରସାରଣ ନକରେ କିନ୍ତୁ ଭବିଷ୍ୟତରେ ଆପଣ ତାହା ସହିତ କନେକ୍ଟ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣ ନେଟ୍‌ୱର୍କକୁ ଲୁକ୍କାୟିତ ଭାବେ ସେଟ୍ କରିପାରିବେ। \n\n ଏହା ଗୋଟିଏ ସୁରକ୍ଷା ପ୍ରଶ୍ନବାଚୀ ସୃଷ୍ଟି କରିପାରେ, କାରଣ ଆପଣଙ୍କ ଫୋନ୍ ନେଟ୍‌ୱର୍କ ପ୍ରାପ୍ତ କରିବା ପାଇଁ ନିୟମିତ ଭାବେ ନିଜର ସିଗନାଲ୍‌କୁ ପ୍ରସାରିତ କରିବ। \n\nଲୁକ୍କାୟିତ ଭାବେ ନେଟୱର୍କକୁ ସେଟ୍ କରିବା ଦ୍ଵାରା ରାଉଟର୍‌ର ସେଟିଙ୍ଗ ବଦଳିବ ନାହିଁ।"</string>
-    <string name="wifi_signal" msgid="696548364467704808">"ସିଗ୍ନାଲ୍‌ର ଶକ୍ତି"</string>
+    <string name="wifi_signal" msgid="696548364467704808">"ସିଗନାଲର ଦକ୍ଷତା"</string>
     <string name="wifi_status" msgid="3439931558930689940">"ସ୍ଥିତି"</string>
     <string name="tx_wifi_speed" msgid="2571810085003261073">"ଟ୍ରାନ୍ସମିଟ୍ ଲିଙ୍କ୍ ବେଗ"</string>
     <string name="rx_wifi_speed" msgid="7392873246110937187">"ଲିଙ୍କ୍ ସ୍ପିଡ୍ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
@@ -970,7 +969,7 @@
     <string name="wifi_multiple_cert_added" msgid="7986200585749147204">"(ଅନେକ ପ୍ରମାଣପତ୍ର ଯୋଡ଼ାଗଲା)"</string>
     <string name="wifi_use_system_certs" msgid="4794489370929885022">"ସିଷ୍ଟମ୍‌ ସର୍ଟିଫିକେଟ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="4044301449482425250">"ପ୍ରଦାନ କରନ୍ତୁ ନାହିଁ"</string>
-    <string name="wifi_do_not_validate_eap_server" msgid="1892537559682474878">"ମଞ୍ଜୁର କରନ୍ତୁ ନାହିଁ"</string>
+    <string name="wifi_do_not_validate_eap_server" msgid="1892537559682474878">"ବୈଧ କରନ୍ତୁ ନାହିଁ"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="3895397996759837323">"କୌଣସି ସର୍ଟିଫିକେଟ୍‌ ଦର୍ଶାଯାଇନାହିଁ। ଆପଣଙ୍କ ସଂଯୋଗ ଗୋପନ ରହିବ ନାହିଁ।"</string>
     <string name="wifi_ssid_too_long" msgid="34911971389775920">"ନେଟୱାର୍କ ନାମ ବହୁତ ଲମ୍ଵା ଅଟେ।"</string>
     <string name="wifi_no_domain_warning" msgid="735859919311067606">"ନିଶ୍ଚିତ ଭାବେ ଏକ ଡୋମେନ୍‌ ଦେବାକୁ ପଡ଼ିବ।"</string>
@@ -1091,8 +1090,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ମୋବାଇଲ୍‌"</item>
+    <item msgid="6007360612667098926">"କେବଳ ୱାଇ-ଫାଇ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1346,7 +1348,7 @@
     <string name="status_data_state" msgid="4538705798873861963">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱାର୍କ ସ୍ଥିତି"</string>
     <string name="status_esim_id" msgid="9201767073386770286">"EID"</string>
     <string name="status_service_state" msgid="4406215321296496234">"ସେବାର ସ୍ଥିତି"</string>
-    <string name="status_signal_strength" msgid="4302597886933728789">"ସିଗ୍‌ନାଲ୍‌ ଶକ୍ତି"</string>
+    <string name="status_signal_strength" msgid="4302597886933728789">"ସିଗ୍‌ନାଲ୍‌ ଦକ୍ଷତା"</string>
     <string name="status_roaming" msgid="5191044997355099561">"ରୋମିଙ୍ଗ"</string>
     <string name="status_operator" msgid="6017986100643755390">"ନେଟ୍‌ୱର୍କ"</string>
     <string name="status_wifi_mac_address" msgid="3868452167971295995">"ୱାଇ-ଫାଇ MAC ଠିକଣା"</string>
@@ -2232,7 +2234,7 @@
     <string name="background_activity_warning_dialog_title" msgid="2170790412855899678">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ସୀମିତ କରିବେ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8242749826732375096">"ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍‌ର ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପକୁ ସୀମିତ କରିବେ, ଏହା ଠିକ୍‍ ଭାବରେ କାମ କରିନପାରେ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4234598000779459640">"ବ୍ୟାଟେରୀକୁ ଅପ୍ଟିମାଇଜ୍ କରିବା ପାଇଁ ଯେହେତୁ ଏହି ଆପ୍‍କୁ ସେଟ୍ କରାଯାଇନାହିଁ, ତେଣୁ ଆପଣ ଏହାକୁ ସୀମାବଦ୍ଧ କରିପାରିବେ ନାହିଁ। \n\nଆପ୍‍କୁ ସୀମାବଦ୍ଧ କରିବା ପାଇଁ ପ୍ରଥମେ ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେସନ୍‍କୁ ଚାଲୁ କରନ୍ତୁ।"</string>
-    <string name="device_screen_usage" msgid="4470485475363132750">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରୀନ୍‌ର ବ୍ୟବହାର"</string>
+    <string name="device_screen_usage" msgid="4470485475363132750">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରିନ୍‌ର ବ୍ୟବହାର"</string>
     <string name="power_usage_list_summary" msgid="4314438658308211057">"ପୂରା ଚାର୍ଜ ହେବା ପରଠାରୁ ଖର୍ଚ୍ଚ ହୋ‍ଇଥିବା ବ୍ୟାଟେରୀ"</string>
     <string name="screen_usage_summary" msgid="263396144684078341">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରୀନ୍‌ ଅନ୍‌ ହୋଇଥିବାର ସମୟ"</string>
     <string name="device_usage_list_summary" msgid="8299017481332816368">"ଫୁଲ୍‌ ଚାର୍ଜ ପରଠାରୁ ଡିଭାଇସ୍‌ର ବ୍ୟବହାର"</string>
@@ -2259,7 +2261,7 @@
     <string name="details_subtitle" msgid="7279638828004951382">"ବିବରଣୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="controls_subtitle" msgid="6920199888882834620">"ପାୱାର୍‌ ବ୍ୟବହାର ଆଡ୍‌ଜଷ୍ଟ କରନ୍ତୁ"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"ଅନ୍ତର୍ଭୁକ୍ତ ଥିବା ପ୍ୟାକେଜ୍‌‌ଗୁଡିକ"</string>
-    <string name="battery_tip_summary_title" msgid="2750922152518825526">"ଆପ୍‌ ଠିକ୍‌ ଭାବେ ଚାଲୁଛି"</string>
+    <string name="battery_tip_summary_title" msgid="2750922152518825526">"ଆପ୍ସ ଠିକ୍‌ ଭାବେ ଚାଲୁଛି"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"ଫୋନର ସାଧାରଣ ବ୍ୟାକଗ୍ରାଉଣ୍ଡ୍ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ରହିଛି"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"ଟାବଲେଟ୍‍ର ବିଶେଷ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ରହିଛି"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"ଡିଭାଇସ୍‍ର ବିଶେଷ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ରହିଛି"</string>
@@ -2395,7 +2397,7 @@
     <string name="battery_desc_standby" product="default" msgid="8889482616564520287">"ନିଷ୍କ୍ରିୟ ଫୋନରେ ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_desc_radio" msgid="5119078473833865414">"ସେଲ୍‌ ରେଡିଓ ଦ୍ୱାରା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_sugg_radio" msgid="3616364509738133415">"ସେଲ୍‌ କଭରେଜ୍‌ ନଥିବା ଅଞ୍ଚଳରେ ପାୱାର୍‌ ବଞ୍ଚାଇବାକୁ ବିମାନ ମୋଡ୍‌କୁ ଯାଆନ୍ତୁ"</string>
-    <string name="battery_desc_flashlight" msgid="4574819522143720917">"ଫ୍ଲାଶଲାଇଟ୍‌ ଦ୍ୱାରା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
+    <string name="battery_desc_flashlight" msgid="4574819522143720917">"ଫ୍ଲାସଲାଇଟ୍ ଦ୍ୱାରା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_desc_camera" msgid="517966830222999462">"କ୍ୟାମେରା ଦ୍ୱାରା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_desc_display" msgid="6701005808894183097">"ଡିସ୍‌ପ୍ଲେ ଓ ବ୍ୟାକ୍‌ଲାଇଟ୍‌ ଦ୍ୱାରା ବ୍ୟବହୃତ ବ୍ୟାଟେରୀ"</string>
     <string name="battery_sugg_display" msgid="6366790848514389990">"ସ୍କ୍ରୀନ୍‌ ଉଜ୍ଜ୍ୱଳତା ଏବଂ/କିମ୍ବା ସ୍କ୍ରୀନ୍‌ ସମୟ ସମାପ୍ତି କମ କରନ୍ତୁ"</string>
@@ -2525,7 +2527,7 @@
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"ବିଶ୍ୱସନୀୟ CA ସର୍ଟିଫିକେଟ୍‌ ଦେଖାନ୍ତୁ"</string>
     <string name="user_credentials" msgid="8365731467650306757">"ୟୁଜର୍ କ୍ରେଡେନସିଆଲ୍"</string>
     <string name="user_credentials_summary" msgid="7350223899317423252">"ସେଭ୍‌ ହୋଇଥିବା ତଥ୍ୟ ଦେଖନ୍ତୁ ଓ ବଦଳାନ୍ତୁ"</string>
-    <string name="advanced_security_title" msgid="286883005673855845">"ବିକଶିତ"</string>
+    <string name="advanced_security_title" msgid="286883005673855845">"ଉନ୍ନତ"</string>
     <string name="credential_storage_type" msgid="2585337320206095255">"ଷ୍ଟୋରେଜ୍‌ ପ୍ରକାର"</string>
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"ହାର୍ଡୱେର୍‌-ସମର୍ଥିତ"</string>
     <string name="credential_storage_type_software" msgid="1335905150062717150">"ସଫ୍ଟୱେୟାର କେବଳ"</string>
@@ -2536,7 +2538,7 @@
     <string name="credentials_erased" msgid="7287088033523869085">"ତଥ୍ୟ ଷ୍ଟୋରେଜ୍‌କୁ ଲିଭାଇଦିଆଗଲା।"</string>
     <string name="credentials_not_erased" msgid="9137227570738627637">"କ୍ରେଡେନଶିଆଲ୍‌ ଷ୍ଟୋରେଜ୍‌ ଲିଭାଯାଇ ପାରିବ ନାହିଁ।"</string>
     <string name="usage_access_title" msgid="7981321142726540574">"ବ୍ୟବହାର ଆକ୍ସେସ୍ ସହ ଆପ୍‌ଗୁଡ଼ିକ"</string>
-    <string name="emergency_tone_title" msgid="130211364025984428">"ଆପାତକାଳୀନ ଡାଏଲିଙ୍ଗ ସିଗ୍ନାଲ୍"</string>
+    <string name="emergency_tone_title" msgid="130211364025984428">"ଜରୁରୀକାଳୀନ ଡାଏଲିଂ ସିଗନାଲ୍"</string>
     <string name="emergency_tone_summary" msgid="8035940153401622240">"ଏକ ଜରୁରୀକାଳୀନ କଲ୍ କରୁଥିବାବେଳେ ଗତିବିଧି ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="privacy_settings_title" msgid="3573891462732375772">"ବ୍ୟାକଅପ୍‌"</string>
     <string name="backup_summary_state_on" msgid="1725597360282574647">"ଅନ୍ ଅଛି"</string>
@@ -2602,7 +2604,7 @@
     <string name="sync_enabled" msgid="535172627223336983">"ସିଙ୍କ ଅନ୍‌ ଅଛି"</string>
     <string name="sync_disabled" msgid="713721807204805062">"ସିଙ୍କ ଅଫ୍‌ ଅଛି"</string>
     <string name="sync_error" msgid="988155155932442765">"ସିଙ୍କ୍‌ରେ ତ୍ରୁଟି"</string>
-    <string name="last_synced" msgid="4511434057768999129">"<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> ରେ ଶେଷଥର ସିଙ୍କ ହୋଇଥିଲା"</string>
+    <string name="last_synced" msgid="4511434057768999129">"<xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> ରେ ଗତଥର ସିଙ୍କ ହୋଇଥିଲା"</string>
     <string name="sync_in_progress" msgid="1311828882739675714">"ଏବେ ସିଙ୍କ କରୁଛି…"</string>
     <string name="settings_backup" msgid="3261579634252074247">"ବ୍ୟାକ୍‌ଅପ୍‌ ସେଟିଙ୍ଗ୍‌"</string>
     <string name="settings_backup_summary" msgid="2563360505501354777">"ମୋ ସେଟିଙ୍ଗଗୁଡ଼ିକର ବ୍ୟାକ୍‌ଅପ୍‌ ନିଅ"</string>
@@ -3092,7 +3094,7 @@
     <string name="keywords_assist_gesture_launch" msgid="2711433664837843513">"ଇଙ୍ଗିତ"</string>
     <string name="keywords_face_unlock" msgid="651615819291927262">"ମୁହଁ, ଅନଲକ୍, ପ୍ରମାଣୀକରଣ, ସାଇନ୍ ଇନ୍"</string>
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei, meid, min, prl ଭର୍ସନ୍‌, imei sv"</string>
-    <string name="keywords_sim_status" msgid="3852088576719874387">"ନେଟ୍‌ୱର୍କ, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ସ୍ଥିତି, ସେବା ସ୍ଥିତି, ସିଗ୍‌ନାଲ୍‌ ଶକ୍ତି, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ପ୍ରକାର, iccid"</string>
+    <string name="keywords_sim_status" msgid="3852088576719874387">"ନେଟ୍‌ୱାର୍କ, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱାର୍କ ସ୍ଥିତି, ସେବା ସ୍ଥିତି, ସିଗ୍‌ନାଲ୍‌ ଦକ୍ଷତା, ମୋବାଇଲ୍‌ ନେଟ୍‌ୱାର୍କ ପ୍ରକାର,ରୋମିଂ, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"କ୍ରମିକ ସଂଖ୍ୟା, ହାର୍ଡୱେର୍‌ ଭର୍ସନ୍‌"</string>
     <string name="keywords_android_version" msgid="4842749998088987740">"Android ସୁରକ୍ଷା ପ୍ୟାଚ୍‌ ସ୍ତର, ବେସ୍‌ବ୍ୟାଣ୍ଡ ଭର୍ସନ୍‌, କର୍ନେଲ୍‌ ଭର୍ସନ୍‌"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"ଥିମ୍‍, ଫିକା, ଗାଢ଼, ମୋଡ୍"</string>
@@ -3380,7 +3382,7 @@
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"ଛବି-ଭିତରେ-ଛବିକୁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ସପୋର୍ଟ କରୁନାହିଁ"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"ପିପ୍‌ ପିକଚର୍‌ ଇନ୍‌"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"ଛବି-ରେ-ଛବି"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"ଛବି-ଭିତରେ-ଛବିର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"ପିକଚର୍-ଇନ୍-ପିକଚରର ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"ଏପ ଖୋଲା ଥିବାବେଳେ କିମ୍ୱା ଏହାକୁ ଆପଣ ଛାଡ଼ିବା ପରେ (ଉଦାହରଣସ୍ୱରୂପ, ଏକ ଭିଡିଓ ଦେଖିବା ଜାରି ରଖିବାକୁ) ଏକ ଛବି-ଭିତରେ-ଛବି ୱିଣ୍ଡୋ ତିଆରି କରିବା ପାଇଁ ଏହି ଏପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଏହି ୱିଣ୍ଡୋ, ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଏପଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେବ।"</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍ସେସ୍"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -3752,7 +3754,7 @@
     <string name="background_check_title" msgid="4136736684290307970">"ସମ୍ପୂର୍ଣ୍ଣ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଆକସେସ୍‌"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"ସ୍କ୍ରୀନ୍‌ରୁ ଟେକ୍ସଟ୍‌ ବ୍ୟବହାର କର"</string>
     <string name="assist_access_context_summary" msgid="5867997494395842785">"ସ୍କ୍ରୀନ୍‌ କଣ୍ଟେଣ୍ଟଗୁଡ଼ିକୁ ଟେକ୍ସଟ୍‌ ଭଳି ଆକ୍ସେସ୍‌ କରିବା ପାଇଁ ସହାୟକ ଆପ୍‌କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"ସ୍କ୍ରୀନଶଟ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"ସ୍କ୍ରୀନସଟ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"ସହାୟକ ଆପ୍‌କୁ ସ୍କ୍ରୀନ୍‌ର ଏକ ଇମେଜ୍‌ ଆକସେସ୍ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"ଫ୍ଲାଶ୍‌ ସ୍କ୍ରୀନ୍‌"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"ସ୍କ୍ରୀନ୍‌ କିମ୍ୱା ସ୍କ୍ରୀନଶଟ୍‌ରୁ ଯେତେବେଳେ ସହାୟକ ଆପ୍‌ ଟେକ୍ସଟ୍‌ ଆକ୍ସେସ୍‌ କରେ, ସ୍କ୍ରୀନ୍‌ର ଧାର ଫ୍ଲାଶ୍ ହେଉ"</string>
@@ -3775,7 +3777,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ଟି ଆପ୍‌ ବିଗତ <xliff:g id="DURATION_1">%2$s</xliff:g> ରେ ମେମୋରୀ ବ୍ୟବହାର କଲା</item>
       <item quantity="one">1 ଆପ୍‌ ବିଗତ <xliff:g id="DURATION_0">%2$s</xliff:g> ରେ ମେମୋରୀ ବ୍ୟବହାର କଲା</item>
     </plurals>
-    <string name="running_frequency" msgid="7545170806968474449">"ବାରମ୍ଵାରତା"</string>
+    <string name="running_frequency" msgid="7545170806968474449">"ଫ୍ରିକ୍ୱେନ୍ସୀ"</string>
     <string name="memory_maximum_usage" msgid="4734981118293469479">"ସର୍ବାଧିକ ବ୍ୟବହାର"</string>
     <string name="no_data_usage" msgid="903383745620135746">"କୌଣସି ଡାଟା ବ୍ୟବହୃତ ହୋଇନାହିଁ"</string>
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g> ପାଇଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"ର ଆକ୍ସେସ୍ ଅନୁମତି ଦେବେ?"</string>
@@ -3791,15 +3793,15 @@
     <string name="app_list_preference_none" msgid="7100409177446935028">"କିଛି ନୁହେଁ"</string>
     <string name="work_profile_usage_access_warning" msgid="403208064382097510">"ଏହି ଆପ୍‌ ପାଇଁ ବ୍ୟବହାର ଆକ୍ସେସ୍ ବନ୍ଦ‌ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କ କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲରେ ଥିବା ଡାଟା ବ୍ୟବହାର ଉପରେ ନଜର ରଖିବାରୁ ଆପଣଙ୍କ ଆଡମିନ୍‌‌କୁ ରୋକେନାହିଁ"</string>
     <string name="accessibility_lock_screen_progress" msgid="8242917828598820049">"<xliff:g id="COUNT_1">%2$d</xliff:g> ର <xliff:g id="COUNT_0">%1$d</xliff:g> ଅକ୍ଷର ବ୍ୟବହୃତ ହୋଇଛି"</string>
-    <string name="draw_overlay" msgid="2878665072530660668">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଅ"</string>
+    <string name="draw_overlay" msgid="2878665072530660668">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାନ୍ତୁ"</string>
     <string name="system_alert_window_settings" msgid="3024330223417646567">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଅ"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"ଆପ୍‌"</string>
-    <string name="system_alert_window_access_title" msgid="5187343732185369675">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଅ"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ପ୍ରଦର୍ଶନ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="allow_overlay_description" msgid="6669524816705082807">"ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଏହି ଆପ୍‌କୁ ରହିବାକୁ ଦିଅନ୍ତୁ। ସେହି ଆପ୍‌ଗୁଡ଼ିକର ବ୍ୟବହାରରେ ଏହା ବାଧା ସୃଷ୍ଟି କରିପାରେ କିମ୍ୱା ସେଗୂଡ଼ିକର କାମ କରିବା ଶୈଳୀକୁ ବଦଳାଇଦେଇପାରେ।"</string>
+    <string name="system_alert_window_access_title" msgid="5187343732185369675">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାନ୍ତୁ"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="allow_overlay_description" msgid="6669524816705082807">"ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଏହି ଆପ୍‌କୁ ଡିସପ୍ଲେ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଆପଣଙ୍କର ଏହି ଆପ୍‌ଗୁଡ଼ିକର ବ୍ୟବହାରରେ ଏହା ବାଧା ସୃଷ୍ଟି କରିପାରେ କିମ୍ୱା ସେଗୁଡ଼ିକର କାମ କରିବା ବା ଦେଖାଯିବା ଶୈଳୀକୁ ବଦଳାଇଦେଇପାରେ।"</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr ଭର୍ଚୁଆଲ୍‌ ରିଅଲିଟୀ ଲିସ୍‌ନର୍‌ ଷ୍ଟେରିଓ ସାହାଯ୍ୟକାରୀ ସେବା"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକରେ ସିଷ୍ଟମ୍‌ ଆଲର୍ଟ ଡାୟଲଗ୍‌ ଡିସ୍‌ପ୍ଲେ"</string>
-    <string name="overlay_settings" msgid="3325154759946433666">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେଉ"</string>
+    <string name="overlay_settings" msgid="3325154759946433666">"ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାନ୍ତୁ"</string>
     <string name="system_alert_window_summary" msgid="7703582115861844158">"<xliff:g id="COUNT_1">%2$d</xliff:g> ଟି ଆପ୍‌ରୁ <xliff:g id="COUNT_0">%1$d</xliff:g> ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକରେ ଡିସପ୍ଲେ କରିବାକୁ ଅନୁମୋଦିତ"</string>
     <string name="filter_overlay_apps" msgid="6336897660213304743">"ଅନୁମତି ସହ ଆପ୍‌ଗୁଡ଼ିକ"</string>
     <string name="app_permission_summary_allowed" msgid="6458476982015518778">"ଅନୁମତିପ୍ରାପ୍ତ"</string>
@@ -3810,8 +3812,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> ର <xliff:g id="COUNT_0">%1$d</xliff:g> ଆପ୍‌, ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇପାରିବେ"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"ଆର୍ଥିକ ଆପ୍ସ Smsର ଆକ୍ସେସ୍"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"ଅନ୍ୟ ଏପଗୁଡ଼ିକୁ ଇନଷ୍ଟଲ କରିପାରେ"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ରୂପାନ୍ତର କରିପାରିବ"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ରୂପାନ୍ତର କରିପାରିବ"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"ସିଷ୍ଟମ୍‌ ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରିପାରିବ"</string>
     <string name="write_system_settings" msgid="20450765210832463">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାନ୍ତୁ"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"ସିଷ୍ଟମ୍‌ ସେଟିଙ୍ଗ ବଦଳାଇବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"ଏହି ଅନୁମତି ଦ୍ୱାରା ଗୋଟିଏ ଏପ, ସିଷ୍ଟମ ସେଟିଙ୍ଗରେ ସଂଶୋଧନ କରିଥାଏ।"</string>
@@ -4259,7 +4261,7 @@
     <string name="storage_manager_indicator" msgid="4255140732848476875">"ଷ୍ଟୋରେଜ ମ୍ୟାନେଜର: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="6404056007102580777">"ଅଫ୍"</string>
     <string name="storage_manager_indicator_on" msgid="5295306384982062320">"ଅନ୍"</string>
-    <string name="install_type_instant" msgid="6248487669862821874">"ତତ୍‌କ୍ଷଣାତ୍ ଆପ୍‌"</string>
+    <string name="install_type_instant" msgid="6248487669862821874">"ଇନଷ୍ଟାଣ୍ଟ୍ ଆପ୍"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="7867793739491286374">"ଷ୍ଟୋରେଜ୍‌ ମ୍ୟାନେଜର୍‌କୁ ବନ୍ଦ କରିବେ?"</string>
     <string name="storage_movies_tv" msgid="7282484273991655296">"ମୁଭି ଓ ଟିଭି ଆପ୍‌"</string>
     <string name="carrier_provisioning" msgid="3309125279191534469">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ବାହକ ପ୍ରାବଧାନ ସୂଚନା"</string>
@@ -4271,6 +4273,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ଏହା ଏହି ଫୋନ୍‍କୁ ଧୀର କରିଦେବ"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"ପୂର୍ଣ୍ଣ GNSS ପରିମାପ ବାଧ୍ୟ କରନ୍ତୁ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ଉପଯୋଗିତା ଅନୁପାତ ନଥିବା ସମସ୍ତ GNSS ଉପଗ୍ରହ ସମଷ୍ଟି ଓ ଫ୍ରିକ୍ୱେନ୍ସୀକୁ ଟ୍ରାକ୍‌ କରନ୍ତୁ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ଉପଯୋଗକର୍ତ୍ତା ସ୍ୱିଚ୍ ଡିବଗ୍ କରନ୍ତୁ"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ଉପଯୋଗକର୍ତ୍ତା ସ୍ୱିଚ୍ କରିବା ସମୟରେ ବିସ୍ତୃତ ସୂଚନା ଦେଖାନ୍ତୁ"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"ପୃଷ୍ଠଭୂମି କାର୍ଯ୍ୟକଳାପ ଆରମ୍ଭ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"ସମସ୍ତ ପୃଷ୍ଠଭୂମି କାର୍ଯ୍ୟକଳାପ ଆରମ୍ଭ ହେବାକୁ ଅନୁମତି ଦେ‍ଇଥାଏ"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"କ୍ରାଶ୍ ହୋଇଥିବା ଡାୟଲଗ୍‌କୁ ସର୍ବଦା ଦେଖାନ୍ତୁ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pa-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-pa-nokeys/strings.xml
new file mode 100644
index 0000000..c7cacf3
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pa-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ਐਪਲੀਕੇਸ਼ਨਾਂ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pa/arrays.xml b/tests/CarDeveloperOptions/res/values-pa/arrays.xml
new file mode 100644
index 0000000..4dba94f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pa/arrays.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"ਅਮਰੀਕਾ"</item>
+    <item msgid="4791956477275129121">"ਯੁਰੋਪ"</item>
+    <item msgid="3812126832016254559">"ਅਫਰੀਕਾ"</item>
+    <item msgid="2765816300353408280">"ਏਸ਼ੀਆ"</item>
+    <item msgid="6683489385344409742">"ਆਸਟਰੇਲੀਆ"</item>
+    <item msgid="5194868215515664953">"ਪ੍ਰਸ਼ਾਂਤ"</item>
+    <item msgid="7044520255415007865">"ਸਭ"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ਤੁਰੰਤ"</item>
+    <item msgid="2038544972632026612">"5 ਸਕਿੰਟ"</item>
+    <item msgid="5558060663472279597">"15 ਸਕਿੰਟ"</item>
+    <item msgid="45341168505452037">"30 ਸਕਿੰਟ"</item>
+    <item msgid="227647485917789272">"1 ਮਿੰਟ"</item>
+    <item msgid="3367011891231217504">"2 ਮਿੰਟ"</item>
+    <item msgid="4376575879222393045">"5 ਮਿੰਟ"</item>
+    <item msgid="811192536981678974">"10 ਮਿੰਟ"</item>
+    <item msgid="7258394417241706272">"30 ਮਿੰਟ"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"ਕਨੈਕਟ ਹੈ"</item>
+    <item msgid="983792611851499732">"ਸੱਦੇ ਗਏ"</item>
+    <item msgid="5438273405428201793">"ਅਸਫਲ"</item>
+    <item msgid="4646663015449312554">"ਉਪਲਬਧ"</item>
+    <item msgid="3230556734162006146">"ਰੇਂਜ-ਤੋਂ-ਬਾਹਰ"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਮੁੱਲ ਵਰਤੋ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"ਪਿਛਲੇ 30 ਦਿਨ"</item>
+    <item msgid="3211287705232736964">"ਵਰਤੋਂ ਸਾਈਕਲ ਸੈੱਟ ਕਰੋ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"ਵਰਤੋਂ ਸਮਾਂ"</item>
+    <item msgid="2784401352592276015">"ਆਖਰੀ ਵਾਰ ਵਰਤਿਆ"</item>
+    <item msgid="249854287216326349">"ਐਪ ਦਾ ਨਾਮ"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="1464741437353223198">"ਮੈਨੁਅਲ"</item>
+    <item msgid="5793600062487886090">"ਪ੍ਰੌਕਸੀ ਆਟੋ-ਕੌਂਫਿਗਰ"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ਜਾਂ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ਅਨਿਸ਼ਚਿਤ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ਅੰਦਰੂਨੀ ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</item>
+    <item msgid="3186681694079967527">"ਹਟਾਉਣਯੋਗ SD ਕਾਰਡ"</item>
+    <item msgid="6902033473986647035">"ਸਿਸਟਮ ਨੂੰ ਨਿਰਧਾਰਿਤ ਕਰਨ ਦਿਓ"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ਟਿਕਾਣਾ"</item>
+    <item msgid="6842381562497597649">"ਨਿੱਜੀ"</item>
+    <item msgid="3966700236695683444">"ਮੈਸੇਂਜ਼ਿੰਗ"</item>
+    <item msgid="8563996233342430477">"ਮੀਡੀਆ"</item>
+    <item msgid="5323851085993963783">"ਡੀਵਾਈਸ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ਕੋਰਸ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</item>
+    <item msgid="1830619568689922920">"ਸਹੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"ਥਰਥਰਾਹਟ ਕਰੋ"</item>
+    <item msgid="8632513128515114092">"ਸੰਪਰਕ ਪੜ੍ਹੋ"</item>
+    <item msgid="3741042113569620272">"ਸੰਪਰਕ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</item>
+    <item msgid="4204420969709009931">"ਕਾਲ ਲੌਗ ਪੜ੍ਹੋ"</item>
+    <item msgid="2260380357119423209">"ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</item>
+    <item msgid="6550710385014530934">"ਕੈਲੰਡਰ ਪੜ੍ਹੋ"</item>
+    <item msgid="3575906174264853951">"ਕੈਲੰਡਰ ਸੰਸ਼ੋਧਿਤ ਕਰੋੇ"</item>
+    <item msgid="4319843242568057174">"ਵਾਈ-ਫਾਈ ਸਕੈਨ"</item>
+    <item msgid="2981791890467303819">"ਸੂਚਨਾ"</item>
+    <item msgid="6617825156152476692">"ਸੈਲ ਸਕੈਨ"</item>
+    <item msgid="8865260890611559753">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+    <item msgid="3254999273961542982">"SMS ਪੜ੍ਹੋ"</item>
+    <item msgid="7711446453028825171">"SMS ਲਿਖੋ"</item>
+    <item msgid="6123238544099198034">"SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="838342167431596036">"ਸੰਕਟਕਾਲੀਨ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="8554432731560956686">"MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="7464863464299515059">"WAP ਪੁਸ਼ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="310463075729606765">"SMS ਭੇਜੋ"</item>
+    <item msgid="7338021933527689514">"ICC SMS ਪੜ੍ਹੋ"</item>
+    <item msgid="6130369335466613036">"ICC SMS ਲਿਖੋ"</item>
+    <item msgid="6536865581421670942">"ਸੈਟਿੰਗਾਂ ਬਦਲੋ"</item>
+    <item msgid="4547203129183558973">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
+    <item msgid="9080347512916542840">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
+    <item msgid="5332718516635907742">"ਕੈਮਰਾ"</item>
+    <item msgid="6098422447246167852">" ਆਡੀਓ  ਰਿਕਾਰਡ ਕਰੋ"</item>
+    <item msgid="9182794235292595296">" ਆਡੀਓ  ਪਲੇ ਕਰੋ"</item>
+    <item msgid="8760743229597702019">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
+    <item msgid="2266923698240538544">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
+    <item msgid="1801619438618539275">"ਮੀਡੀਆ ਬਟਨ"</item>
+    <item msgid="31588119965784465">" ਆਡੀਓ  ਫੋਕਸ"</item>
+    <item msgid="7565226799008076833">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
+    <item msgid="5420704980305018295">"ਅਵਾਜ਼ ਵੋਲਯੂਮ"</item>
+    <item msgid="5797363115508970204">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="8233154098550715999">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="5196715605078153950">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="394030698764284577">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
+    <item msgid="8952898972491680178">"bluetooth ਵੌਲਿਊਮ"</item>
+    <item msgid="8506227454543690851">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
+    <item msgid="1108160036049727420">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਨਿਰੀਖਣ ਕਰੋ"</item>
+    <item msgid="1496205959751719491">"ਉੱਚ ਪਾਵਰ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਨਿਰੀਖਣ ਕਰੋ"</item>
+    <item msgid="3776296279910987380">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="8827100324471975602">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
+    <item msgid="6880736730520126864">"ਟੋਸਟ  ਦਿਖਾਓ"</item>
+    <item msgid="4933375960222609935">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
+    <item msgid="8357907018938895462">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
+    <item msgid="8143812849911310973">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
+    <item msgid="6266277260961066535">"ਸਹਾਇਕ ਬਣਤਰ"</item>
+    <item msgid="7715498149883482300">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
+    <item msgid="4046679376726313293">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+    <item msgid="6329507266039719587">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
+    <item msgid="7692440726415391408">"SIP ਵਰਤੋ"</item>
+    <item msgid="8572453398128326267">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
+    <item msgid="7775674394089376306">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</item>
+    <item msgid="3182815133441738779">"ਸਰੀਰ ਸੰਵੇਦਕ"</item>
+    <item msgid="2793100005496829513">"ਸੈਲ ਪ੍ਰਸਾਰਨਾਂ ਨੂੰ ਪੜ੍ਹੋ"</item>
+    <item msgid="2633626056029384366">"ਬਣਾਉਟੀ ਟਿਕਾਣਾ"</item>
+    <item msgid="8356842191824684631">"ਸਟੋਰੇਜ ਪੜ੍ਹੋ"</item>
+    <item msgid="5671906070163291500">"ਸਟੋਰੇਜ ਲਿਖੋ"</item>
+    <item msgid="2791955098549340418">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
+    <item msgid="5599435119609178367">"ਖਾਤੇ ਲਓ"</item>
+    <item msgid="1165623660533024666">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
+    <item msgid="6423861043647911030">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"ਘੱਟ"</item>
+    <item msgid="4816511817309094890">"ਔਸਤ"</item>
+    <item msgid="8305084671259331134">"ਜ਼ਿਆਦਾ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif ਕੰਡੈਂਸਡ"</item>
+    <item msgid="6529379119163117545">"Sans-serif ਮੋਨੋਸਪੇਸ"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"ਅਨਿਯਮਤ"</item>
+    <item msgid="4627069151979553527">"ਪ੍ਰਵਾਹੀ ਲਿਖਤ"</item>
+    <item msgid="6896773537705206194">"ਛੋਟੇ ਕੈਪੀਟਲਸ"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"ਪ੍ਰੀ-ਸ਼ੇਅਰ ਕੀਤੀਆਂ ਕੁੰਜੀਆਂ ਨਾਲ L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"ਸਰਟੀਫਿਕੇਟਾਂ ਨਾਲ L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"ਪ੍ਰੀ-ਸ਼ੇਅਰਡ ਕੁੰਜੀਆਂ ਅਤੇ Xauth ਪ੍ਰਮਾਣੀਕਰਨ ਨਾਲ IPSec VPN"</item>
+    <item msgid="3319427315593649917">"ਸਰਟੀਫਿਕੇਟਾਂ ਨਾਲ IPSec VPN ਅਤੇ Xauth ਪ੍ਰਮਾਣੀਕਰਨ"</item>
+    <item msgid="8258927774145391041">"ਸਰਟੀਫਿਕੇਟਾਂ ਅਤੇ ਹਾਈਬ੍ਰਿਡ ਪ੍ਰਮਾਣੀਕਰਨ ਨਾਲ IPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_proxy_settings:0 (2958623927055120839) -->
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ਪੁੱਛੋ"</item>
+    <item msgid="7718817231348607934">"ਕਦੇ ਵੀ ਆਗਿਆ ਨਾ ਦਿਓ"</item>
+    <item msgid="8184570120217958741">"ਹਮੇਸ਼ਾਂ ਆਗਿਆ ਦਿਓ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ਸਥਿਰ"</item>
+    <item msgid="167418068739176448">"ਟੌਪ ਗਤੀਵਿਧੀ"</item>
+    <item msgid="4760813290195199773">"ਮਹੱਤਵਪੂਰਣ (ਫੋਰਗ੍ਰਾਉਂਡ)"</item>
+    <item msgid="2328684826817647595">"ਮਹੱਤਵਪੂਰਣ (ਪਿਛੋਕੜ)"</item>
+    <item msgid="7746406490652867365">"ਬੈਕਅੱਪ"</item>
+    <item msgid="5597404364389196754">"ਹੈਵੀ ਵੇਟ"</item>
+    <item msgid="1290888779300174556">"ਸੇਵਾ (ਚੱਲ ਰਹੀ ਹੈ)"</item>
+    <item msgid="7241098542073939046">"ਸੇਵਾ (ਰੀਸਟਾਰਟ ਕਰ ਰਿਹਾ ਹੈ)"</item>
+    <item msgid="6610439017684111046">"ਰਿਸੀਵਰ"</item>
+    <item msgid="7367606086319921117">"ਹੋਮ"</item>
+    <item msgid="3344660712396741826">"ਪਿਛਲੀ ਗਤੀਵਿਧੀ"</item>
+    <item msgid="5006559348883303865">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ)"</item>
+    <item msgid="8633480732468137525">"ਕੈਸ਼ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਇੰਟ)"</item>
+    <item msgid="6248998242443333892">"ਕੈਚ ਕੀਤੀ (ਖਾਲੀ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"ਨੀਲਾ"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"ਜਾਮਨੀ"</item>
+    <item msgid="5932337981182999919">"ਗੁਲਾਬੀ"</item>
+    <item msgid="5642914536624000094">"ਲਾਲ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
+    <item msgid="8699273238891265610">"60 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
+    <item msgid="8346279419423837266">"90 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪਤਾ ਲਗਾਓ"</item>
+    <item msgid="773943026484148895">"ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
+    <item msgid="1008268820118852416">"ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ਬੇਤਰਤੀਬ MAC (ਪੂਰਵ-ਨਿਰਧਾਰਤ) ਵਰਤੋ"</item>
+    <item msgid="214234417308375326">"ਡੀਵਾਈਸ MAC ਵਰਤੋ"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ਨਹੀਂ"</item>
+    <item msgid="1930581185557754880">"ਹਾਂ"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ਗੂੜ੍ਹਾ"</item>
+    <item msgid="5079453644557603349">"ਬਲਬ"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ਬੰਦ"</item>
+    <item msgid="4072198137051566919">"ਡੀਬੱਗ"</item>
+    <item msgid="2473005316958868509">"ਵਰਬੋਸ"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ਸਿਰਫ਼ ਹੋਮ"</item>
+    <item msgid="1161026694891024702">"ਸਵੈਚਲਿਤ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA ਤਰਜੀਹੀ"</item>
+    <item msgid="7581481130337402578">"ਸਿਰਫ਼ GSM"</item>
+    <item msgid="8579197487913425819">"ਸਿਰਫ਼ WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ਸਵੈਚਲਿਤ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ਸਵੈਚਲਿਤ"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"ਸਿਰਫ਼ EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ਗਲੋਬਲ"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"ਸਿਰਫ਼ TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ਗਲੋਬਲ"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pa/strings.xml b/tests/CarDeveloperOptions/res/values-pa/strings.xml
index a5916c5..2dde26c 100644
--- a/tests/CarDeveloperOptions/res/values-pa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pa/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਆਪਣੀ ਟੈਬਲੈੱਟ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ ਤਾਂ ਜੋ ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਾ ਸਕੇ। ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਪਿੰਨ ਸੈਟ ਕਰੋ ਜਾਂ ਕੋਈ ਹੋਰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਚੁਣੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ ਤਾਂ ਜੋ ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਾ ਸਕੇ। ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਪਿੰਨ ਸੈਟ ਕਰੋ ਜਾਂ ਕੋਈ ਹੋਰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਚੁਣੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖੋ ਤਾਂ ਜੋ ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਾ ਸਕੇ। ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਪਿੰਨ ਸੈਟ ਕਰੋ ਜਾਂ ਕੋਈ ਹੋਰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਚੁਣੋ।"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ਕੀ ਪਿੰਨ ਸੈੱਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ਕੀ ਪਾਸਵਰਡ ਸੈੱਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ਕੀ ਪੈਟਰਨ ਸੈੱਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟਅੱਪ ਕਰੋ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"ਵਾਈ-ਫਾਈ"</item>
+    <item msgid="4421333712484542489">"ਮੋਬਾਈਲ"</item>
+    <item msgid="6007360612667098926">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2612,7 +2614,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਲਈ ਟੈਪ ਕਰੋ<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"ਕੈਲੰਡਰ"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"ਸੰਪਰਕ"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ਸਿੰਕ ਤੇ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ!"</font>" \nਤੁਸੀਂ ਜਿੱਥੇ ਵੀ ਹੋਵੋ, ਉੱਥੋਂ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ, ਮੁਲਾਕਾਤਾਂ ਆਦਿ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਲਈ ਡਾਟਾ ਸਿੰਕ ਕਰਨ ਲਈ ਇੱਕ Google ਪਹੁੰਚ।"</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"ਐਪ ਸਿੰਕ ਸੈਟਿੰਗਾਂ"</string>
@@ -3754,7 +3756,7 @@
     <string name="assist_access_context_title" msgid="2274614501747710439">"ਸਕ੍ਰੀਨ ਤੋਂ ਲਿਖਤ ਵਰਤੋ"</string>
     <string name="assist_access_context_summary" msgid="5867997494395842785">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਲਿਖਤ ਵਜੋਂ ਸਕ੍ਰੀਨ ਸਮੱਗਰੀ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਵਰਤੋ"</string>
-    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਸਕ੍ਰੀਨ ਦੇ ਇੱਕ ਚਿੱਤਰ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਸਕ੍ਰੀਨ ਦੇ ਚਿੱਤਰ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦਿਓ"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"ਸਕ੍ਰੀਨ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"ਸਹਾਇਕ ਐਪ ਵੱਲੋਂ ਸਕ੍ਰੀਨ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਤੋਂ ਲਿਖਤ \'ਤੇ ਪਹੁੰਚ ਕਰਨ \'ਤੇ ਸਕ੍ਰੀਨ ਦੇ ਕਿਨਾਰਿਆਂ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
     <string name="assist_footer" msgid="7030121180457472165">"ਸਹਾਇਕ ਐਪਾਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਕ੍ਰੀਨ ਤੋਂ ਪ੍ਰਾਪਤ ਜਾਣਕਾਰੀ ਦੇ ਆਧਾਰ \'ਤੇ ਤੁਹਾਡੀ ਮਦਦ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਕੁਝ ਐਪਾਂ ਤੁਹਾਨੂੰ ਏਕੀਕ੍ਰਿਤ ਸਹਾਇਤਾ ਦੇਣ ਲਈ ਲਾਂਚਰ ਅਤੇ ਅਵਾਜ਼ੀ ਇਨਪੁੱਟ ਸੇਵਾਵਾਂ ਦੋਵਾਂ ਦਾ ਸਮਰਥਨ ਕਰਦੀਆਂ ਹਨ।"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ਇਸ ਨਾਲ ਇਸ ਫ਼ੋਨ ਦੀ ਗਤੀ ਧੀਮੀ ਹੋਵੇਗੀ"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"GNSS ਮਾਪ ਨੂੰ ਜ਼ਬਰਦਰਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ਡਿਊਟੀ ਸਾਈਕਲਿੰਗ ਤੋਂ ਬਿਨਾਂ ਸਾਰੇ GNSS ਉਪਗ੍ਰਹਿ ਗਰੁੱਪਾਂ ਅਤੇ ਵਾਰਵਾਰਤਾਵਾਂ ਨੂੰ ਟਰੈਕ ਕਰੋ"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"ਵਰਤੋਂਕਾਰ ਬਦਲਣ ਨੂੰ ਡੀਬੱਗ ਕਰੋ"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"ਵਰਤੋਂਕਾਰ ਬਦਲਣ ਵੇਲੇ ਵੇਰਵੇ ਸਹਿਤ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਦਿਓ"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"ਸਾਰੀਆਂ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀਆਂ ਸ਼ੁਰੂ ਕਰਨ ਦਿਓ"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ਹਮੇਸ਼ਾਂ ਕ੍ਰੈਸ਼ ਵਿੰਡੋ ਦਿਖਾਓ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pl-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-pl-nokeys/strings.xml
new file mode 100644
index 0000000..e613817
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pl-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Zarządzaj aplikacjami"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pl/arrays.xml b/tests/CarDeveloperOptions/res/values-pl/arrays.xml
new file mode 100644
index 0000000..1e1dc78
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pl/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Ameryka"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afryka"</item>
+    <item msgid="2765816300353408280">"Azja"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacyfik"</item>
+    <item msgid="7044520255415007865">"Wszystkie"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekund"</item>
+    <item msgid="772029947136115322">"30 sekund"</item>
+    <item msgid="8743663928349474087">"1 minuta"</item>
+    <item msgid="1506508631223164814">"2 minuty"</item>
+    <item msgid="8664703938127907662">"5 min"</item>
+    <item msgid="5827960506924849753">"10 min."</item>
+    <item msgid="6677424950124253938">"30 min"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nigdy"</item>
+    <item msgid="2517785806387977252">"15 s"</item>
+    <item msgid="6347954399441173672">"30 sekund"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minuty"</item>
+    <item msgid="2788593551142462622">"5 min"</item>
+    <item msgid="8012672183888404961">"10 min"</item>
+    <item msgid="8271452751594598661">"30 min."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Natychmiast"</item>
+    <item msgid="2038544972632026612">"5 sek."</item>
+    <item msgid="5558060663472279597">"15 sek."</item>
+    <item msgid="45341168505452037">"30 sekund"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minuty"</item>
+    <item msgid="4376575879222393045">"5 min"</item>
+    <item msgid="811192536981678974">"10 min"</item>
+    <item msgid="7258394417241706272">"30 min"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Mały"</item>
+    <item msgid="591935967183159581">"Wartość domyślna"</item>
+    <item msgid="1714184661981538355">"Duży"</item>
+    <item msgid="6195563047686707484">"Największy"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Trwa skanowanie..."</item>
+    <item msgid="5597394826455877834">"Łączenie…"</item>
+    <item msgid="5848277343965362748">"Uwierzytelnianie…"</item>
+    <item msgid="3391238031431440676">"Uzyskuję adres IP..."</item>
+    <item msgid="5257597310494000224">"Połączono"</item>
+    <item msgid="8472497592913050396">"Zawieszony"</item>
+    <item msgid="1228072488815999109">"Rozłączanie..."</item>
+    <item msgid="7253087004422991731">"Rozłączona"</item>
+    <item msgid="4169850917304751227">"Niepowodzenie"</item>
+    <item msgid="6266658166690831131">"Zablokowane"</item>
+    <item msgid="4517230805854909775">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skanowanie…"</item>
+    <item msgid="8058143476674427024">"Trwa łączenie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Uwierzytelnianie w sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Uzyskiwanie adresu IP z sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Połączono z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Zawieszony"</item>
+    <item msgid="4133290864821295785">"Trwa rozłączanie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Rozłączona"</item>
+    <item msgid="2847316776634969068">"Niepowodzenie"</item>
+    <item msgid="4390990424746035383">"Zablokowane"</item>
+    <item msgid="3618248791367063949">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Naciśnij przycisk"</item>
+    <item msgid="7401896200768713930">"Kod PIN z drugiego urządzenia"</item>
+    <item msgid="4526848028011846710">"Kod PIN z tego urządzenia"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Połączono"</item>
+    <item msgid="983792611851499732">"Zaproszono"</item>
+    <item msgid="5438273405428201793">"Niepowodzenie"</item>
+    <item msgid="4646663015449312554">"Dostępna"</item>
+    <item msgid="3230556734162006146">"Poza zasięgiem"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuty"</item>
+    <item msgid="2759776603549270587">"5 minut"</item>
+    <item msgid="167772676068860015">"1 godzina"</item>
+    <item msgid="5985477119043628504">"Brak limitu czasu"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Użyj ustawienia domyślnego systemu: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Słaba"</item>
+    <item msgid="7882129634982603782">"Słaba"</item>
+    <item msgid="6457357501905996224">"Dostateczna"</item>
+    <item msgid="405271628162918841">"Dobra"</item>
+    <item msgid="999948812884919584">"Doskonała"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Ostatnie 30 dni"</item>
+    <item msgid="3211287705232736964">"Ustaw cykl danych..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Czas użycia"</item>
+    <item msgid="2784401352592276015">"Ostatnie użycie"</item>
+    <item msgid="249854287216326349">"Nazwa aplikacji"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Brak"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Brak"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Brak"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statyczny"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Brak"</item>
+    <item msgid="1464741437353223198">"Instrukcja"</item>
+    <item msgid="5793600062487886090">"Autokonfiguracja proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Brak"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP lub CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nie określono"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Brak"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Wewnętrzna pamięć urządzenia"</item>
+    <item msgid="3186681694079967527">"Wymienna karta SD"</item>
+    <item msgid="6902033473986647035">"Zastosuj ustawienie systemowe"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokalizacja"</item>
+    <item msgid="6842381562497597649">"Osobiste"</item>
+    <item msgid="3966700236695683444">"Wiadomości"</item>
+    <item msgid="8563996233342430477">"Multimedia"</item>
+    <item msgid="5323851085993963783">"Urządzenie"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"przybliżona lokalizacja"</item>
+    <item msgid="1830619568689922920">"dokładna lokalizacja"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"wibracje"</item>
+    <item msgid="8632513128515114092">"odczytywanie kontaktów"</item>
+    <item msgid="3741042113569620272">"modyfikowanie kontaktów"</item>
+    <item msgid="4204420969709009931">"odczytywanie rejestru połączeń"</item>
+    <item msgid="2260380357119423209">"modyfikowanie rejestru połączeń"</item>
+    <item msgid="6550710385014530934">"odczytywanie kalendarza"</item>
+    <item msgid="3575906174264853951">"modyfikowanie kalendarza"</item>
+    <item msgid="4319843242568057174">"skanowanie wi-fi"</item>
+    <item msgid="2981791890467303819">"powiadomienie"</item>
+    <item msgid="6617825156152476692">"skanowanie bts"</item>
+    <item msgid="8865260890611559753">"połączenia telefoniczne"</item>
+    <item msgid="3254999273961542982">"odczytywanie SMS-ów"</item>
+    <item msgid="7711446453028825171">"zapisywanie SMS-ów"</item>
+    <item msgid="6123238544099198034">"odbieranie SMS-ów"</item>
+    <item msgid="838342167431596036">"odbieranie SMS-ów alarmowych"</item>
+    <item msgid="8554432731560956686">"odbieranie MMS-ów"</item>
+    <item msgid="7464863464299515059">"odbieranie wiadomości WAP push"</item>
+    <item msgid="310463075729606765">"wysyłanie SMS-ów"</item>
+    <item msgid="7338021933527689514">"odczytywanie SMS-ów ICC"</item>
+    <item msgid="6130369335466613036">"zapisywanie SMS-ów ICC"</item>
+    <item msgid="6536865581421670942">"modyfikowanie ustawień"</item>
+    <item msgid="4547203129183558973">"rysuj na górze"</item>
+    <item msgid="9080347512916542840">"dostęp do powiadomień"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"nagraj dźwięk"</item>
+    <item msgid="9182794235292595296">"odtwórz dźwięk"</item>
+    <item msgid="8760743229597702019">"czytaj schowek"</item>
+    <item msgid="2266923698240538544">"modyfikuj schowek"</item>
+    <item msgid="1801619438618539275">"przyciski multimediów"</item>
+    <item msgid="31588119965784465">"aktywność audio"</item>
+    <item msgid="7565226799008076833">"głośność główna"</item>
+    <item msgid="5420704980305018295">"głośność mowy"</item>
+    <item msgid="5797363115508970204">"głośność dzwonka"</item>
+    <item msgid="8233154098550715999">"głośność multimediów"</item>
+    <item msgid="5196715605078153950">"głośność alarmu"</item>
+    <item msgid="394030698764284577">"głośność powiadomień"</item>
+    <item msgid="8952898972491680178">"głośność Bluetooth"</item>
+    <item msgid="8506227454543690851">"utrzymanie aktywności"</item>
+    <item msgid="1108160036049727420">"monitorowanie lokalizacji"</item>
+    <item msgid="1496205959751719491">"monitor wysoki zasilanie lokalizacja"</item>
+    <item msgid="3776296279910987380">"pobierz statystyki użycia"</item>
+    <item msgid="8827100324471975602">"wycisz mikrofon/wyłącz wyciszenie"</item>
+    <item msgid="6880736730520126864">"wyświetlanie powiadomienia"</item>
+    <item msgid="4933375960222609935">"wyświetl multimedia"</item>
+    <item msgid="8357907018938895462">"aktywacja połączenia VPN"</item>
+    <item msgid="8143812849911310973">"zapis tapety"</item>
+    <item msgid="6266277260961066535">"wsparcie struktury"</item>
+    <item msgid="7715498149883482300">"wsparcie robienia zrzutów ekranu"</item>
+    <item msgid="4046679376726313293">"czytanie stanu telefonu"</item>
+    <item msgid="6329507266039719587">"dodawanie poczty głosowej"</item>
+    <item msgid="7692440726415391408">"zastosowanie SIP"</item>
+    <item msgid="8572453398128326267">"przetwarzanie połączeń wychodzących"</item>
+    <item msgid="7775674394089376306">"odcisk palca"</item>
+    <item msgid="3182815133441738779">"czujniki na ciele"</item>
+    <item msgid="2793100005496829513">"odczyt komunikatów z sieci komórkowej"</item>
+    <item msgid="2633626056029384366">"pozorowanie lokalizacji"</item>
+    <item msgid="8356842191824684631">"odczyt pamięci"</item>
+    <item msgid="5671906070163291500">"zapis w pamięci"</item>
+    <item msgid="2791955098549340418">"włączanie ekranu"</item>
+    <item msgid="5599435119609178367">"pobieranie listy kont"</item>
+    <item msgid="1165623660533024666">"uruchamianie w tle"</item>
+    <item msgid="6423861043647911030">"głośność przy ułatwieniach dostępu"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Lokalizacja"</item>
+    <item msgid="6656077694190491067">"Lokalizacja"</item>
+    <item msgid="8790228218278477369">"Lokalizacja"</item>
+    <item msgid="7836406246005211990">"Wibracje"</item>
+    <item msgid="3951439024549922598">"Odczytywanie kontaktów"</item>
+    <item msgid="8802152411647068">"Modyfikowanie kontaktów"</item>
+    <item msgid="229544934599698735">"Odczytywanie rejestru połączeń"</item>
+    <item msgid="7396102294405899613">"Modyfikowanie rejestru połączeń"</item>
+    <item msgid="3597797992398484655">"Odczytywanie kalendarza"</item>
+    <item msgid="2705975774250907343">"Modyfikowanie kalendarza"</item>
+    <item msgid="4668747371441932697">"Lokalizacja"</item>
+    <item msgid="1487578921720243646">"Publikowanie powiadomień"</item>
+    <item msgid="4636080349724146638">"Lokalizacja"</item>
+    <item msgid="673510900286463926">"Połączenia telefoniczne"</item>
+    <item msgid="542083422784609790">"Czytanie SMS-ów/MMS-ów"</item>
+    <item msgid="1033780373029588436">"Pisanie SMS-ów/MMS-ów"</item>
+    <item msgid="5647111115517787488">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="8591105601108455893">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="7730995008517841903">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="2613033109026626086">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="3037159047591081136">"Wysyłanie SMS-ów/MMS-ów"</item>
+    <item msgid="4726682243833913568">"Czytanie SMS-ów/MMS-ów"</item>
+    <item msgid="6555678522277865572">"Pisanie SMS-ów/MMS-ów"</item>
+    <item msgid="6981734935578130884">"Modyfikowanie ustawień"</item>
+    <item msgid="8705854389991425629">"Rysuj na górze"</item>
+    <item msgid="5861356020344153651">"Dostęp do powiadomień"</item>
+    <item msgid="78432174621628659">"Aparat"</item>
+    <item msgid="3986116419882154794">"Nagraj dźwięk"</item>
+    <item msgid="4516840825756409490">"Odtwórz dźwięk"</item>
+    <item msgid="6811712502798183957">"Czytaj schowek"</item>
+    <item msgid="2780369012602289114">"Modyfikuj schowek"</item>
+    <item msgid="2331359440170850868">"Przyciski multimediów"</item>
+    <item msgid="6133599737122751231">"Aktywność audio"</item>
+    <item msgid="6844485713404805301">"Głośność główna"</item>
+    <item msgid="1600379420669104929">"Głośność mowy"</item>
+    <item msgid="6296768210470214866">"Głośność dzwonka"</item>
+    <item msgid="510690696071629241">"Głośność multimediów"</item>
+    <item msgid="406861638631430109">"Głośność alarmu"</item>
+    <item msgid="4715864795872233884">"Głośność powiadomień"</item>
+    <item msgid="2311478519251301183">"Głośność Bluetooth"</item>
+    <item msgid="5133991377896747027">"Utrzymanie aktywności"</item>
+    <item msgid="2464189519136248621">"Lokalizacja"</item>
+    <item msgid="2062677934050803037">"Lokalizacja"</item>
+    <item msgid="1735171933192715957">"Pobierz statystyki użycia"</item>
+    <item msgid="1014093788778383554">"Wycisz mikrofon/wyłącz wyciszenie"</item>
+    <item msgid="4199297950608622850">"Wyświetlanie komunikatu"</item>
+    <item msgid="2527962435313398821">"Wyświetlanie multimediów"</item>
+    <item msgid="5117506254221861929">"Aktywacja połączenia VPN"</item>
+    <item msgid="8291198322681891160">"Zapis tapety"</item>
+    <item msgid="7106921284621230961">"Wsparcie struktury"</item>
+    <item msgid="4496533640894624799">"Wsparcie robienia zrzutów ekranu"</item>
+    <item msgid="2598847264853993611">"Czytanie stanu telefonu"</item>
+    <item msgid="9215610846802973353">"Dodawanie poczty głosowej"</item>
+    <item msgid="9186411956086478261">"Zastosowanie SIP"</item>
+    <item msgid="6884763100104539558">"Przetwarzanie połączeń wychodzących"</item>
+    <item msgid="125513972170580692">"Odcisk palca"</item>
+    <item msgid="2556071024281275619">"Czujniki na ciele"</item>
+    <item msgid="617168514928339387">"Odczyt komunikatów z sieci komórkowej"</item>
+    <item msgid="7134693570516523585">"Pozorowanie lokalizacji"</item>
+    <item msgid="7224489175375229399">"Odczyt pamięci"</item>
+    <item msgid="8472735063903258202">"Zapis w pamięci"</item>
+    <item msgid="4069276819909595110">"Włączanie ekranu"</item>
+    <item msgid="1228338896751121025">"Pobieranie listy kont"</item>
+    <item msgid="3181581793459233672">"Działanie w tle"</item>
+    <item msgid="2340936043025374076">"Głośność przy ułatwieniach dostępu"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Krótki"</item>
+    <item msgid="4816511817309094890">"Średnia"</item>
+    <item msgid="8305084671259331134">"Długi"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Wartość domyślna"</item>
+    <item msgid="4147246073737933622">"Bezszeryfowa"</item>
+    <item msgid="3117680749167407907">"Bezszeryfowa wąska"</item>
+    <item msgid="6529379119163117545">"Bezszeryfowa o stałej szerokości"</item>
+    <item msgid="1487203730637617924">"Szeryfowa"</item>
+    <item msgid="4937790671987480464">"Szeryfowy o stałej szerokości"</item>
+    <item msgid="4448481989108928248">"Zwykły"</item>
+    <item msgid="4627069151979553527">"Kursywa"</item>
+    <item msgid="6896773537705206194">"Kapitaliki"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Bardzo mały"</item>
+    <item msgid="5091603983404027034">"Mały"</item>
+    <item msgid="176844712416932112">"Normalny"</item>
+    <item msgid="2784236342175159295">"Duży"</item>
+    <item msgid="218913203203160606">"Bardzo duży"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Wartość domyślna"</item>
+    <item msgid="6488643537808152001">"Brak"</item>
+    <item msgid="552332815156010137">"Obrys"</item>
+    <item msgid="7187891159463789272">"Z cieniem"</item>
+    <item msgid="8019330250538856521">"Uniesione"</item>
+    <item msgid="8987385315647049787">"Obniżone"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Ustawienia domyślne aplikacji"</item>
+    <item msgid="8611890312638868524">"Biały na czarnym"</item>
+    <item msgid="5891360837786277638">"Czarny na białym"</item>
+    <item msgid="2798457065945456853">"Żółty na czarnym"</item>
+    <item msgid="5799049811524553967">"Żółty na niebieskim"</item>
+    <item msgid="3673930830658169860">"Niestandardowe"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"Sieć VPN wykorzystująca protokół PPTP"</item>
+    <item msgid="1349760781118368659">"Sieć VPN wykorzystująca protokół L2TP/IPSec z kluczami wspólnymi"</item>
+    <item msgid="6128519070545038358">"Sieć VPN wykorzystująca protokół L2TP/IPSec z certyfikatami"</item>
+    <item msgid="312397853907741968">"Sieć VPN wykorzystująca protokół IPSec z kluczami wspólnymi i uwierzytelnianiem Xauth"</item>
+    <item msgid="3319427315593649917">"Sieć VPN wykorzystująca protokół IPSec z certyfikatami i uwierzytelnianiem Xauth"</item>
+    <item msgid="8258927774145391041">"Sieć VPN wykorzystująca protokół IPSec z certyfikatami i uwierzytelnianiem hybrydowym"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Brak"</item>
+    <item msgid="1157046369795346308">"Instrukcja"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Rozłączona"</item>
+    <item msgid="8754480102834556765">"Inicjowanie…"</item>
+    <item msgid="3351334355574270250">"Łączenie…"</item>
+    <item msgid="8303882153995748352">"Połączono"</item>
+    <item msgid="9135049670787351881">"Wygaszanie"</item>
+    <item msgid="2124868417182583926">"Niepowodzenie"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Zapytaj"</item>
+    <item msgid="7718817231348607934">"Nigdy nie zezwalaj"</item>
+    <item msgid="8184570120217958741">"Zawsze zezwalaj"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Niezmienny"</item>
+    <item msgid="167418068739176448">"Najczęstsza aktywność"</item>
+    <item msgid="4760813290195199773">"Ważny (pierwszy plan)"</item>
+    <item msgid="2328684826817647595">"Ważny (w tle)"</item>
+    <item msgid="7746406490652867365">"Kopia zapasowa"</item>
+    <item msgid="5597404364389196754">"Duże obciążenie"</item>
+    <item msgid="1290888779300174556">"Usługa (uruchomiona)"</item>
+    <item msgid="7241098542073939046">"Usługa (ponowne uruchamianie)"</item>
+    <item msgid="6610439017684111046">"Odbiornik"</item>
+    <item msgid="7367606086319921117">"Ekran główny"</item>
+    <item msgid="3344660712396741826">"Ostatnia aktywność"</item>
+    <item msgid="5006559348883303865">"Pamięć podręczna (aktywność)"</item>
+    <item msgid="8633480732468137525">"Pamięć podręczna (klient aktywności)"</item>
+    <item msgid="6248998242443333892">"Pamięć podręczna (pusta)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Morski"</item>
+    <item msgid="3228505970082457852">"Niebieski"</item>
+    <item msgid="6590260735734795647">"Indygo"</item>
+    <item msgid="3521763377357218577">"Fioletowy"</item>
+    <item msgid="5932337981182999919">"Różowy"</item>
+    <item msgid="5642914536624000094">"Czerwony"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Starsze niż 30 dni"</item>
+    <item msgid="8699273238891265610">"Starsze niż 60 dni"</item>
+    <item msgid="8346279419423837266">"Starsze niż 90 dni"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Wykryj automatycznie"</item>
+    <item msgid="773943026484148895">"Traktuj jako sieć z pomiarem użycia danych"</item>
+    <item msgid="1008268820118852416">"Traktuj jako sieć bez pomiaru użycia danych"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Używaj randomizowanego adresu MAC (domyślnie)"</item>
+    <item msgid="214234417308375326">"Użyj adresu MAC urządzenia"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nie"</item>
+    <item msgid="1930581185557754880">"Tak"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Ciemny"</item>
+    <item msgid="5079453644557603349">"Jasny"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Wył."</item>
+    <item msgid="4072198137051566919">"Debuguj"</item>
+    <item msgid="2473005316958868509">"Szczegółowe"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Tylko domowe"</item>
+    <item msgid="1161026694891024702">"Automatycznie"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Preferowany GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Tylko GSM"</item>
+    <item msgid="8579197487913425819">"Tylko WCDMA"</item>
+    <item msgid="8465243227505412498">"Automatyczny GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automatyczny CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA bez EvDo"</item>
+    <item msgid="7278975240951052041">"Tylko EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalna"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Tylko TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalna"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pl/strings.xml b/tests/CarDeveloperOptions/res/values-pl/strings.xml
index 40df7f2..947a908 100644
--- a/tests/CarDeveloperOptions/res/values-pl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pl/strings.xml
@@ -396,7 +396,7 @@
     <string name="security_passwords_title" msgid="6853942836045862315">"Prywatność"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"Wyłączone przez administratora"</string>
     <string name="security_status_title" msgid="1261960357751754428">"Stan zabezpieczeń"</string>
-    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blokada ekranu, rozpoznanie twarzy"</string>
+    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"Blokada ekranu, rozpoznawanie twarzy"</string>
     <string name="security_dashboard_summary" msgid="4048877125766167227">"Blokada ekranu, odcisk palca"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"Blokada ekranu"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"Dodano twarz"</string>
@@ -456,7 +456,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="756928427429893070">"Pomiń"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="4125977169169671144">"Dalej"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="763018850721691594">"Pominąć odcisk palca?"</string>
-    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"Zapisanie odcisku palca zajmuje tylko chwilę. Zawsze możesz go dodać później w ustawieniach."</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="8849928362049018680">"Zapisanie odcisku palca zajmuje tylko chwilę. Zawsze możesz go dodać później w ustawieniach."</string>
     <string name="lock_screen_intro_skip_title" msgid="5307431665496346914">"Pominąć blokadę ekranu?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7553945981266845264">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można zablokować tego tabletu, gdy zostanie zgubiony, skradziony lub zresetowany."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1378243257238015603">"Zabezpieczenia urządzenia nie zostaną włączone. Nie będzie można zablokować tego urządzenia, gdy zostanie zgubione, skradzione lub zresetowane."</string>
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Zabezpiecz tablet blokadą ekranu, aby nikt nie mógł go używać w przypadku jego zgubienia lub kradzieży. Musisz również ustawić blokadę ekranu, by skonfigurować uwierzytelnianie twarzą. Kliknij Anuluj, a następnie ustaw kod PIN lub inny rodzaj blokady ekranu."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Zabezpiecz urządzenie blokadą ekranu, aby nikt nie mógł go używać w przypadku jego zgubienia lub kradzieży. Musisz również ustawić blokadę ekranu, by skonfigurować uwierzytelnianie twarzą. Kliknij Anuluj, a następnie ustaw kod PIN lub inny rodzaj blokady ekranu."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Zabezpiecz telefon blokadą ekranu, aby nikt nie mógł go używać w przypadku jego zgubienia lub kradzieży. Musisz również ustawić blokadę ekranu, by skonfigurować uwierzytelnianie twarzą. Kliknij Anuluj, a następnie ustaw kod PIN lub inny rodzaj blokady ekranu."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Pominąć konfigurację kodu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Pominąć konfigurację hasła?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Pominąć konfigurację wzoru?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Skonfiguruj blokadę ekranu"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Komórkowe"</item>
+    <item msgid="6007360612667098926">"Tylko Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2069,14 +2071,14 @@
     <string name="usage_time_label" msgid="5615725415876461039">"Czas użycia"</string>
     <string name="accessibility_settings" msgid="9140621093888234485">"Ułatwienia dostępu"</string>
     <string name="accessibility_settings_title" msgid="1687226556576913576">"Ustawienia ułatwień dostępu"</string>
-    <string name="accessibility_settings_summary" msgid="5742379519336396561">"Czytniki, wyświetlacz, sterowanie interakcjami"</string>
+    <string name="accessibility_settings_summary" msgid="5742379519336396561">"Czytniki, wyświetlacz, zarządzanie interakcjami"</string>
     <string name="vision_settings_title" msgid="7315352351051423944">"Dla niedowidzących"</string>
     <string name="vision_settings_description" msgid="3476589459009287332">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
     <string name="vision_settings_suggestion_title" msgid="7268661419110951128">"Zmień rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="6300714148519645544">"Czytniki ekranu"</string>
     <string name="audio_and_captions_category_title" msgid="6140472938769619212">"Dźwięk i tekst na ekranie"</string>
     <string name="display_category_title" msgid="545168481672250195">"Wyświetlacz"</string>
-    <string name="interaction_control_category_title" msgid="8775039211811947683">"Sterowanie interakcjami"</string>
+    <string name="interaction_control_category_title" msgid="8775039211811947683">"Zarządzanie interakcjami"</string>
     <string name="user_installed_services_category_title" msgid="4288689493753221319">"Pobrane usługi"</string>
     <string name="experimental_category_title" msgid="3797000069740110717">"Eksperymentalne"</string>
     <string name="feature_flags_dashboard_title" msgid="3153034144122754381">"Flagi funkcji"</string>
@@ -3178,7 +3180,7 @@
     <string name="keywords_android_version" msgid="4842749998088987740">"stan aktualizacji zabezpieczeń Androida, wersja pasma podstawowego, wersja jądra"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"motyw, jasny, ciemny, tryb"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"aplikacja finansowa, SMS, uprawnienia"</string>
-    <string name="keywords_systemui_theme" msgid="9150908170417305866">"ciemny motyw"</string>
+    <string name="keywords_systemui_theme" msgid="9150908170417305866">"tryb ciemny"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"błąd"</string>
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Ekran dostosowany do otoczenia, ekran blokady"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"powiadomienia na ekranie blokady, powiadomienia"</string>
@@ -3375,7 +3377,7 @@
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"Inne dźwięki i wibracje"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"Powiadomienia"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Ostatnio wysłane"</string>
-    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Zobacz wszystkie z ostatnich siedmiu dni"</string>
+    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Zobacz wszystkie z ostatnich 7 dni"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"Zaawansowane"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Powiadomienia związane z pracą"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Automatyczne nadawanie priorytetów powiadomieniom"</string>
@@ -4059,11 +4061,11 @@
     <string name="cell_data_template" msgid="5473177306229738078">"<xliff:g id="AMOUNT">^1</xliff:g> danych mobilnych"</string>
     <string name="wifi_data_template" msgid="3146090439147042068">"Dane Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="6414118030827090119">"Dane ethernet: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
-    <string name="billing_cycle" msgid="5740717948341713190">"Dane i limit"</string>
+    <string name="billing_cycle" msgid="5740717948341713190">"Ostrzeżenie dotyczące danych i limit"</string>
     <string name="app_usage_cycle" msgid="213483325132959663">"Cykl użycia danych w aplikacjach"</string>
-    <string name="cell_data_warning" msgid="8902740337286652689">"Próg ostrzegawczy: <xliff:g id="ID_1">^1</xliff:g>"</string>
+    <string name="cell_data_warning" msgid="8902740337286652689">"Ostrzeżenie dotyczące danych: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="3175933829235314233">"Limit danych: <xliff:g id="ID_1">^1</xliff:g>"</string>
-    <string name="cell_data_warning_and_limit" msgid="3846150001253927594">"Próg ostrzegawczy: <xliff:g id="ID_1">^1</xliff:g> / limit danych: <xliff:g id="ID_2">^2</xliff:g>"</string>
+    <string name="cell_data_warning_and_limit" msgid="3846150001253927594">"Ostrzeżenie dotyczące danych: <xliff:g id="ID_1">^1</xliff:g> / limit danych: <xliff:g id="ID_2">^2</xliff:g>"</string>
     <string name="billing_cycle_fragment_summary" msgid="4926047002107855543">"<xliff:g id="ID_1">%1$s</xliff:g>. każdego miesiąca"</string>
     <string name="network_restrictions" msgid="196294262243618198">"Ograniczenia sieci"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="1664494781594839837">
@@ -4074,8 +4076,8 @@
     </plurals>
     <string name="operator_warning" msgid="4676042739221117031">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie"</string>
     <string name="data_used_template" msgid="761605393453849477">"Wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="8115980184415563941">"Ustaw próg ostrzegawczy"</string>
-    <string name="data_warning" msgid="2699207195535036240">"Próg ostrzegawczy"</string>
+    <string name="set_data_warning" msgid="8115980184415563941">"Ustaw ostrzeżenie dotyczące danych"</string>
+    <string name="data_warning" msgid="2699207195535036240">"Ostrzeżenie dotyczące danych"</string>
     <string name="data_warning_footnote" msgid="965724845580257305">"Ostrzeżenie dotyczące użycia danych i limit danych są oparte na pomiarach wykonywanych przez Twoje urządzenie. Dane operatora mogą być inne."</string>
     <string name="set_data_limit" msgid="5043770023229990674">"Ustaw limit transmisji danych"</string>
     <string name="data_limit" msgid="5793521160051596228">"Limit danych"</string>
@@ -4202,7 +4204,7 @@
     <string name="dark_ui_mode" msgid="703844190192599217">"Motyw"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Wybierz motyw"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"To ustawienie dotyczy również aplikacji"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Obsługiwane aplikacje również zostaną przełączone na ciemny motyw"</string>
+    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Obsługiwane aplikacje również zostaną przełączone na tryb ciemny"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Kafelki szybkich ustawień dla programisty"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Śledzenie Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Wyłącz czujniki"</string>
@@ -4239,9 +4241,9 @@
     <string name="deletion_helper_manual_title" msgid="1011785013431162078">"Instrukcja"</string>
     <string name="deletion_helper_preference_title" msgid="797270307034242206">"Zwolnij miejsce teraz"</string>
     <string name="gesture_preference_title" msgid="583646591518373785">"Gesty"</string>
-    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Sterowanie telefonem za pomocą krótkich gestów"</string>
-    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Sterowanie tabletem za pomocą krótkich gestów"</string>
-    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Sterowanie urządzeniem za pomocą krótkich gestów"</string>
+    <string name="gesture_preference_summary" product="default" msgid="2990736567599191163">"Sterowanie telefonem za pomocą gestów"</string>
+    <string name="gesture_preference_summary" product="tablet" msgid="8303793594714075580">"Sterowanie tabletem za pomocą gestów"</string>
+    <string name="gesture_preference_summary" product="device" msgid="7792199669106960922">"Sterowanie urządzeniem za pomocą gestów"</string>
     <string name="double_tap_power_for_camera_title" msgid="5480829329052517484">"Uruchamianie aparatu"</string>
     <string name="double_tap_power_for_camera_summary" msgid="6591026425496323965">"Aby szybko uruchomić aparat, naciśnij dwukrotnie przycisk zasilania. Możesz to zrobić na dowolnym ekranie."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="509078029429865036">"Szybkie uruchamianie aparatu"</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Spowoduje spowolnienie telefonu"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Wymuś pełną procedurę pomiarów GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Śledź wszystkie konstelacje GNSS i częstotliwości bez uwzględniania współczynnika impulsu"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Debugowanie podczas przełączania użytkownika"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Pokaż szczegółowe informacje podczas przełączania użytkownika"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Zezwól na uruchomienie aktywności w tle"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Zezwól na uruchamianie wszystkich aktywności w tle"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Zawsze pokazuj okno dialogowe z raportem o błędzie"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pt-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-pt-nokeys/strings.xml
new file mode 100644
index 0000000..4f43dde
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pt-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gerenciar apps"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pt-rPT-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-pt-rPT-nokeys/strings.xml
new file mode 100644
index 0000000..17ace1f
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gerir aplicações"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml b/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml
new file mode 100644
index 0000000..28db34e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"América"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"África"</item>
+    <item msgid="2765816300353408280">"Ásia"</item>
+    <item msgid="6683489385344409742">"Austrália"</item>
+    <item msgid="5194868215515664953">"Pacífico"</item>
+    <item msgid="7044520255415007865">"Todas"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundos"</item>
+    <item msgid="772029947136115322">"30 segundos"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minutos"</item>
+    <item msgid="8664703938127907662">"5 minutos"</item>
+    <item msgid="5827960506924849753">"10 minutos"</item>
+    <item msgid="6677424950124253938">"30 minutos"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"De imediato"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Pequeno"</item>
+    <item msgid="591935967183159581">"Predefinição"</item>
+    <item msgid="1714184661981538355">"Grande"</item>
+    <item msgid="6195563047686707484">"O maior"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"A procurar..."</item>
+    <item msgid="5597394826455877834">"A ligar..."</item>
+    <item msgid="5848277343965362748">"A autenticar..."</item>
+    <item msgid="3391238031431440676">"A obter endereço IP..."</item>
+    <item msgid="5257597310494000224">"Ligada."</item>
+    <item msgid="8472497592913050396">"Suspenso"</item>
+    <item msgid="1228072488815999109">"A desligar..."</item>
+    <item msgid="7253087004422991731">"Desligado"</item>
+    <item msgid="4169850917304751227">"Sem sucesso"</item>
+    <item msgid="6266658166690831131">"Bloqueado"</item>
+    <item msgid="4517230805854909775">"A evitar temporariamente uma ligação fraca"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"A procurar..."</item>
+    <item msgid="8058143476674427024">"A ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"A autenticar com <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"A obter endereço IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Ligado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspenso"</item>
+    <item msgid="4133290864821295785">"A desligar de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Desligado"</item>
+    <item msgid="2847316776634969068">"Sem sucesso"</item>
+    <item msgid="4390990424746035383">"Bloqueado"</item>
+    <item msgid="3618248791367063949">"A evitar temporariamente uma ligação fraca"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Premir botão"</item>
+    <item msgid="7401896200768713930">"PIN do aparelho do elemento"</item>
+    <item msgid="4526848028011846710">"PIN deste aparelho"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Ligada."</item>
+    <item msgid="983792611851499732">"Convidado"</item>
+    <item msgid="5438273405428201793">"Sem sucesso"</item>
+    <item msgid="4646663015449312554">"Disponível"</item>
+    <item msgid="3230556734162006146">"Fora do intervalo"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutos"</item>
+    <item msgid="2759776603549270587">"5 minutos"</item>
+    <item msgid="167772676068860015">"1 hora"</item>
+    <item msgid="5985477119043628504">"Nunca exceder tempo limite"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utilizar a predefinição do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Fraca"</item>
+    <item msgid="7882129634982603782">"Fraca"</item>
+    <item msgid="6457357501905996224">"Suficiente"</item>
+    <item msgid="405271628162918841">"Boa"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Últimos 30 dias"</item>
+    <item msgid="3211287705232736964">"Def. ciclo utilização..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Tempo de utilização"</item>
+    <item msgid="2784401352592276015">"Última utilização"</item>
+    <item msgid="249854287216326349">"Nome da aplicação"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Nenhum"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nenhum"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Nenhum"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Nenhum"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Config. autom. do proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Nenhum"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ou CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Não especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nenhum"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Armazenamento de dispositivo interno"</item>
+    <item msgid="3186681694079967527">"Cartão SD amovível"</item>
+    <item msgid="6902033473986647035">"Permitir que seja o sistema a decidir"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Localização"</item>
+    <item msgid="6842381562497597649">"Pessoal"</item>
+    <item msgid="3966700236695683444">"Mensagens"</item>
+    <item msgid="8563996233342430477">"Multimédia"</item>
+    <item msgid="5323851085993963783">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"localização aproximada"</item>
+    <item msgid="1830619568689922920">"localização exata"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrar"</item>
+    <item msgid="8632513128515114092">"ler contactos"</item>
+    <item msgid="3741042113569620272">"modificar os contactos"</item>
+    <item msgid="4204420969709009931">"ler o registo de chamadas"</item>
+    <item msgid="2260380357119423209">"modificar o registo de chamadas"</item>
+    <item msgid="6550710385014530934">"ler calendário"</item>
+    <item msgid="3575906174264853951">"modificar o calendário"</item>
+    <item msgid="4319843242568057174">"procura de Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notificação"</item>
+    <item msgid="6617825156152476692">"procura celular"</item>
+    <item msgid="8865260890611559753">"ligar para telefone"</item>
+    <item msgid="3254999273961542982">"ler SMS"</item>
+    <item msgid="7711446453028825171">"escrever SMS"</item>
+    <item msgid="6123238544099198034">"receber SMS"</item>
+    <item msgid="838342167431596036">"receber SMS de emergência"</item>
+    <item msgid="8554432731560956686">"receber MMS"</item>
+    <item msgid="7464863464299515059">"receber push WAP"</item>
+    <item msgid="310463075729606765">"enviar SMS"</item>
+    <item msgid="7338021933527689514">"ler SMS ICC"</item>
+    <item msgid="6130369335466613036">"escrever SMS ICC"</item>
+    <item msgid="6536865581421670942">"modificar as definições"</item>
+    <item msgid="4547203129183558973">"desenhe na parte superior"</item>
+    <item msgid="9080347512916542840">"aceder às notificações"</item>
+    <item msgid="5332718516635907742">"câmara"</item>
+    <item msgid="6098422447246167852">"gravar áudio"</item>
+    <item msgid="9182794235292595296">"reproduzir áudio"</item>
+    <item msgid="8760743229597702019">"ler área de transferência"</item>
+    <item msgid="2266923698240538544">"modificar área de transferência"</item>
+    <item msgid="1801619438618539275">"botões multimédia"</item>
+    <item msgid="31588119965784465">"orientação do áudio"</item>
+    <item msgid="7565226799008076833">"volume principal"</item>
+    <item msgid="5420704980305018295">"volume de voz"</item>
+    <item msgid="5797363115508970204">"volume do toque"</item>
+    <item msgid="8233154098550715999">"volume de multimédia"</item>
+    <item msgid="5196715605078153950">"volume de alarme"</item>
+    <item msgid="394030698764284577">"volume de notificação"</item>
+    <item msgid="8952898972491680178">"volume de Bluetooth"</item>
+    <item msgid="8506227454543690851">"Manter ativo"</item>
+    <item msgid="1108160036049727420">"monitorizar localização"</item>
+    <item msgid="1496205959751719491">"monitorizar localização de potência elevada"</item>
+    <item msgid="3776296279910987380">"obter estatísticas de utilização"</item>
+    <item msgid="8827100324471975602">"desativar/reativar o som do microfone"</item>
+    <item msgid="6880736730520126864">"mostrar alerta"</item>
+    <item msgid="4933375960222609935">"projetar multimédia"</item>
+    <item msgid="8357907018938895462">"ativar VPN"</item>
+    <item msgid="8143812849911310973">"gravar imagem de fundo"</item>
+    <item msgid="6266277260961066535">"assistir estrutura"</item>
+    <item msgid="7715498149883482300">"assistir captura de ecrã"</item>
+    <item msgid="4046679376726313293">"ler estado do telemóvel"</item>
+    <item msgid="6329507266039719587">"adicionar correio de voz"</item>
+    <item msgid="7692440726415391408">"utilizar SIP"</item>
+    <item msgid="8572453398128326267">"processar chamada efetuada"</item>
+    <item msgid="7775674394089376306">"impressão digital"</item>
+    <item msgid="3182815133441738779">"sensores de corpo"</item>
+    <item msgid="2793100005496829513">"ler difusões celulares"</item>
+    <item msgid="2633626056029384366">"localização de teste"</item>
+    <item msgid="8356842191824684631">"ler armazenamento"</item>
+    <item msgid="5671906070163291500">"gravar no armazenamento"</item>
+    <item msgid="2791955098549340418">"ativar ecrã"</item>
+    <item msgid="5599435119609178367">"obter contas"</item>
+    <item msgid="1165623660533024666">"executar em segundo plano"</item>
+    <item msgid="6423861043647911030">"volume da acessibilidade"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Localização"</item>
+    <item msgid="6656077694190491067">"Localização"</item>
+    <item msgid="8790228218278477369">"Localização"</item>
+    <item msgid="7836406246005211990">"Vibrar"</item>
+    <item msgid="3951439024549922598">"Ler contactos"</item>
+    <item msgid="8802152411647068">"Modificar os contactos"</item>
+    <item msgid="229544934599698735">"Ler registo de chamadas"</item>
+    <item msgid="7396102294405899613">"Modificar o registo de chamadas"</item>
+    <item msgid="3597797992398484655">"Ler calendário"</item>
+    <item msgid="2705975774250907343">"Modificar o calendário"</item>
+    <item msgid="4668747371441932697">"Localização"</item>
+    <item msgid="1487578921720243646">"Publicar notificação"</item>
+    <item msgid="4636080349724146638">"Localização"</item>
+    <item msgid="673510900286463926">"Ligar para telefone"</item>
+    <item msgid="542083422784609790">"Ler SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Escrever SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Receber SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Receber SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Receber SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Receber SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Enviar SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Ler SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Escrever SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Modificar as definições"</item>
+    <item msgid="8705854389991425629">"Desenhe na parte superior"</item>
+    <item msgid="5861356020344153651">"Aceder às notificações"</item>
+    <item msgid="78432174621628659">"Câmara"</item>
+    <item msgid="3986116419882154794">"Gravar áudio"</item>
+    <item msgid="4516840825756409490">"Reproduzir áudio"</item>
+    <item msgid="6811712502798183957">"Ler área de transferência"</item>
+    <item msgid="2780369012602289114">"Modificar área de transferência"</item>
+    <item msgid="2331359440170850868">"Botões multimédia"</item>
+    <item msgid="6133599737122751231">"Orientação do áudio"</item>
+    <item msgid="6844485713404805301">"Volume principal"</item>
+    <item msgid="1600379420669104929">"Volume da voz"</item>
+    <item msgid="6296768210470214866">"Volume do toque"</item>
+    <item msgid="510690696071629241">"Volume de multimédia"</item>
+    <item msgid="406861638631430109">"Volume do alarme"</item>
+    <item msgid="4715864795872233884">"Volume de notificações"</item>
+    <item msgid="2311478519251301183">"Volume de Bluetooth"</item>
+    <item msgid="5133991377896747027">"Manter desperto"</item>
+    <item msgid="2464189519136248621">"Localização"</item>
+    <item msgid="2062677934050803037">"Localização"</item>
+    <item msgid="1735171933192715957">"Obter estatísticas de utilização"</item>
+    <item msgid="1014093788778383554">"Desativar/reativar o som do microfone"</item>
+    <item msgid="4199297950608622850">"Mostrar alerta"</item>
+    <item msgid="2527962435313398821">"Projetar multimédia"</item>
+    <item msgid="5117506254221861929">"Ativar VPN"</item>
+    <item msgid="8291198322681891160">"Gravar imagem de fundo"</item>
+    <item msgid="7106921284621230961">"Assistir estrutura"</item>
+    <item msgid="4496533640894624799">"Assistir captura de ecrã"</item>
+    <item msgid="2598847264853993611">"Ler estado do telemóvel"</item>
+    <item msgid="9215610846802973353">"Adicionar correio de voz"</item>
+    <item msgid="9186411956086478261">"Utilizar SIP"</item>
+    <item msgid="6884763100104539558">"Processar chamada efetuada"</item>
+    <item msgid="125513972170580692">"Impressão digital"</item>
+    <item msgid="2556071024281275619">"Sensores de corpo"</item>
+    <item msgid="617168514928339387">"Ler difusões celulares"</item>
+    <item msgid="7134693570516523585">"Localização de teste"</item>
+    <item msgid="7224489175375229399">"Ler armazenamento"</item>
+    <item msgid="8472735063903258202">"Gravar no armazenamento"</item>
+    <item msgid="4069276819909595110">"Ativar ecrã"</item>
+    <item msgid="1228338896751121025">"Obter contas"</item>
+    <item msgid="3181581793459233672">"Executar em segundo plano"</item>
+    <item msgid="2340936043025374076">"Volume da acessibilidade"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Curto"</item>
+    <item msgid="4816511817309094890">"Média"</item>
+    <item msgid="8305084671259331134">"Longa"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predefinição"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensado"</item>
+    <item msgid="6529379119163117545">"Monoespaço Sans-serif"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Monoespaço Serif"</item>
+    <item msgid="4448481989108928248">"Ocasionais"</item>
+    <item msgid="4627069151979553527">"Cursivo"</item>
+    <item msgid="6896773537705206194">"Maiúsculas pequenas"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muito pequeno"</item>
+    <item msgid="5091603983404027034">"Pequeno"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muito grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predefinição"</item>
+    <item msgid="6488643537808152001">"Nenhum"</item>
+    <item msgid="552332815156010137">"Contorno"</item>
+    <item msgid="7187891159463789272">"Diminuir Sombra"</item>
+    <item msgid="8019330250538856521">"Em relevo"</item>
+    <item msgid="8987385315647049787">"Reduzido"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Utilizar predefinições da aplicação"</item>
+    <item msgid="8611890312638868524">"Branco em preto"</item>
+    <item msgid="5891360837786277638">"Preto em branco"</item>
+    <item msgid="2798457065945456853">"Amarelo em preto"</item>
+    <item msgid="5799049811524553967">"Amarelo em azul"</item>
+    <item msgid="3673930830658169860">"Personalizado"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"VPN L2TP/IPSec com chaves pré-partilhadas"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec com certificados"</item>
+    <item msgid="312397853907741968">"VPN IPSec com chaves pré-partilhadas e autenticação Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec com certificados e autenticação Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec com certificados e autenticação híbrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nenhum"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Desligado"</item>
+    <item msgid="8754480102834556765">"A inicializar..."</item>
+    <item msgid="3351334355574270250">"A ligar..."</item>
+    <item msgid="8303882153995748352">"Ligada."</item>
+    <item msgid="9135049670787351881">"Tempo limite"</item>
+    <item msgid="2124868417182583926">"Sem sucesso"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Perguntar"</item>
+    <item msgid="7718817231348607934">"Nunca permitir"</item>
+    <item msgid="8184570120217958741">"Permitir sempre"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistente"</item>
+    <item msgid="167418068739176448">"Principal atividade"</item>
+    <item msgid="4760813290195199773">"Importante (primeiro plano)"</item>
+    <item msgid="2328684826817647595">"Importante (segundo plano)"</item>
+    <item msgid="7746406490652867365">"Cópia de segurança"</item>
+    <item msgid="5597404364389196754">"Processos complexos"</item>
+    <item msgid="1290888779300174556">"Serviço (em execução)"</item>
+    <item msgid="7241098542073939046">"Serviço (a reiniciar)"</item>
+    <item msgid="6610439017684111046">"Recetor"</item>
+    <item msgid="7367606086319921117">"Início"</item>
+    <item msgid="3344660712396741826">"Última atividade"</item>
+    <item msgid="5006559348883303865">"Em cache (atividade)"</item>
+    <item msgid="8633480732468137525">"Em cache (cliente de atividade)"</item>
+    <item msgid="6248998242443333892">"Em cache (vazio)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Azul esverdeado"</item>
+    <item msgid="3228505970082457852">"Azul"</item>
+    <item msgid="6590260735734795647">"Índigo"</item>
+    <item msgid="3521763377357218577">"Roxo"</item>
+    <item msgid="5932337981182999919">"Cor-de-rosa"</item>
+    <item msgid="5642914536624000094">"Vermelho"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Mais de 30 dias"</item>
+    <item msgid="8699273238891265610">"Mais de 60 dias"</item>
+    <item msgid="8346279419423837266">"Mais de 90 dias"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detetar automaticamente"</item>
+    <item msgid="773943026484148895">"Tratar como acesso limitado"</item>
+    <item msgid="1008268820118852416">"Tratar como acesso ilimitado"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Utilizar MAC aleatório (predefinição)"</item>
+    <item msgid="214234417308375326">"Utilizar MAC do dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Não"</item>
+    <item msgid="1930581185557754880">"Sim"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Escuro"</item>
+    <item msgid="5079453644557603349">"Claro"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desativada"</item>
+    <item msgid="4072198137051566919">"Depuração"</item>
+    <item msgid="2473005316958868509">"Verboso"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Apenas redes domésticas"</item>
+    <item msgid="1161026694891024702">"Automático"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferido"</item>
+    <item msgid="7581481130337402578">"Apenas GSM"</item>
+    <item msgid="8579197487913425819">"Apenas WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automático"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automático"</item>
+    <item msgid="4219607161971472471">"CDMA sem EvDo"</item>
+    <item msgid="7278975240951052041">"Apenas EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Apenas TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
index 3e93560..bab92d6 100644
--- a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Proteja o seu tablet com uma opção de bloqueio de ecrã para que ninguém o consiga utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a autenticação facial. Toque em Cancelar e defina um PIN ou escolha outra opção de bloqueio de ecrã."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Proteja o seu dispositivo com uma opção de bloqueio de ecrã para que ninguém o consiga utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a autenticação facial. Toque em Cancelar e defina um PIN ou escolha outra opção de bloqueio de ecrã."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Proteja o seu telemóvel com uma opção de bloqueio de ecrã para que ninguém o consiga utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a autenticação facial. Toque em Cancelar e defina um PIN ou escolha outra opção de bloqueio de ecrã."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ignorar a configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ignorar conf. palavra-passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ignorar configur. do padrão?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar o bloqueio de ecrã"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Rede móvel"</item>
+    <item msgid="6007360612667098926">"Apenas Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1655,9 +1657,9 @@
     <string name="location_low_battery_use" msgid="5030448574501435888">"Utilização de bateria baixa"</string>
     <string name="location_scanning_screen_title" msgid="7663329319689413454">"Procura de Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6750542206763112172">"Procura de Wi‑Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="4956048135941851712">"Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="4956048135941851712">"Permitir que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"Procurar por Bluetooth"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"Permitir que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"Serviços de localização para o trabalho"</string>
     <string name="location_network_based" msgid="1535812159327454835">"Wi-Fi e localização de rede de telemóvel"</string>
     <string name="location_neighborhood_level" msgid="8459352741296587916">"Permitir que app usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
@@ -1760,7 +1762,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="4935583222709647096">"Ver padrão de desbloqueio"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Tornar o padrão do perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Bloquear com botão lig./desl."</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Bloquear com botão ligar/desligar"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Exceto quando mantido bloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Mudar padrão de desbloqueio"</string>
@@ -1785,7 +1787,7 @@
     <string name="install_applications" msgid="7745902974984889179">"Fontes desconhecidas"</string>
     <string name="install_applications_title" msgid="8164828577588659496">"Permit. todas as fontes app"</string>
     <string name="recent_app_category_title" msgid="7688788038277126727">"Aplicações abertas recentemente"</string>
-    <string name="see_all_apps_title" msgid="6435061912110347474">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicações"</string>
+    <string name="see_all_apps_title" msgid="6435061912110347474">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
     <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"O seu tablet e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no tablet ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="install_all_warning" product="default" msgid="7445839116997296358">"O seu telemóvel e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no telemóvel ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"O dispositivo e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no dispositivo ou perdas de dados que possam resultar da utilização do mesmo."</string>
@@ -1837,7 +1839,7 @@
     <string name="default_emergency_app" msgid="286530070173495823">"Aplicação de emergência"</string>
     <string name="reset_app_preferences" msgid="1426500030595212077">"Repor preferências de aplicações"</string>
     <string name="reset_app_preferences_title" msgid="792909865493673598">"Repor preferências de aplicações?"</string>
-    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Procede à reposição de todas as preferências de:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n" "<li>"Todas as restrições de permissão"</li>\n\n" Não irá perder quaisquer dados das aplicações."</string>
+    <string name="reset_app_preferences_desc" msgid="7935273005301096031">"Procede à reposição de todas as preferências de:\n\n "<li>"Apps desativadas"</li>\n" "<li>"Notificações de apps desativadas"</li>\n" "<li>"Apps predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para apps"</li>\n" "<li>"Todas as restrições de permissão"</li>\n\n" Não irá perder quaisquer dados das apps."</string>
     <string name="reset_app_preferences_button" msgid="2041894727477934656">"Repor aplicações"</string>
     <string name="manage_space_text" msgid="6166469422303124302">"Gerir espaço"</string>
     <string name="filter" msgid="2426943916212457962">"Filtrar"</string>
@@ -2016,7 +2018,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="148763210673670769">"Definições do teclado no ecrã"</string>
     <string name="builtin_keyboard_settings_title" msgid="3683883402326039724">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="6498739864479285932">"Definições do teclado físico"</string>
-    <string name="gadget_picker_title" msgid="9146981887780645322">"Escolher miniaplicação"</string>
+    <string name="gadget_picker_title" msgid="9146981887780645322">"Escolher gadget"</string>
     <string name="widget_picker_title" msgid="5424689728810684439">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="8168110035319637326">"Criar widget e permitir o acesso?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="2782554863244412872">"Depois de criar o widget, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> pode aceder a todos os dados apresentados."</string>
@@ -2521,7 +2523,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="3426661965567059596">"Instalar certificados a partir do armazenamento"</string>
     <string name="credentials_install_summary" product="default" msgid="4943897416156671633">"Instalar certificados a partir do cartão SD"</string>
     <string name="credentials_reset" msgid="355080737664731678">"Limpar credenciais"</string>
-    <string name="credentials_reset_summary" msgid="7622528359699428555">"Remover todos os certificados"</string>
+    <string name="credentials_reset_summary" msgid="7622528359699428555">"Permite remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="6989242522455395200">"Credenciais fidedignas"</string>
     <string name="trusted_credentials_summary" msgid="7411781319056251582">"Mostrar certificados da AC fidedignos"</string>
     <string name="user_credentials" msgid="8365731467650306757">"Credenciais de utilizador"</string>
@@ -2875,7 +2877,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5993561303748749097">"Os perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="3505139157217459864">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> deste dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="3820813814848394568">"Definições do ecrã de bloqueio"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="5211604808199585774">"Adicionar utilizadores do ecrã de bloqueio"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="5211604808199585774">"Adicionar utilizadores a partir do ecrã de bloqueio"</string>
     <string name="user_new_user_name" msgid="3880395219777884838">"Novo utilizador"</string>
     <string name="user_new_profile_name" msgid="3074939718101489937">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="6739480453680217543">"Eliminar-se a si próprio?"</string>
@@ -2919,7 +2921,7 @@
     <string name="nfc_payment_pay_with" msgid="8412558374792061266">"Num terminal Tocar e pagar, pagar com:"</string>
     <string name="nfc_how_it_works_title" msgid="6531433737926327904">"Pagar num terminal"</string>
     <string name="nfc_how_it_works_content" msgid="9174575836302449343">"Configure uma aplicação de pagamento. Em seguida, basta aproximar a parte de trás do telemóvel a um terminal com o símbolo de pagamento sem contacto."</string>
-    <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"Compreendi"</string>
+    <string name="nfc_how_it_works_got_it" msgid="2432535672153247411">"OK"</string>
     <string name="nfc_more_title" msgid="2825856411836382264">"Mais..."</string>
     <string name="nfc_payment_set_default_label" msgid="3997927342761454042">"Definir como preferência?"</string>
     <string name="nfc_payment_set_default" msgid="1186837502664412132">"Pretende utilizar sempre <xliff:g id="APP">%1$s</xliff:g> com a funcionalidade Tocar e pagar?"</string>
@@ -3261,7 +3263,7 @@
     <string name="zen_sound_three_allowed" msgid="8374564453060696012">"Desativado, mas permitir <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> e <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g>."</string>
     <string name="zen_custom_settings_dialog_title" msgid="908049494676219236">"Definições personalizadas"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="2247761749333893513">"Rever horário"</string>
-    <string name="zen_custom_settings_dialog_ok" msgid="3572754922025853427">"Compreendi"</string>
+    <string name="zen_custom_settings_dialog_ok" msgid="3572754922025853427">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"Notificações"</string>
     <string name="zen_custom_settings_duration_header" msgid="1806465684026300942">"Duração"</string>
     <string name="zen_msg_event_reminder_title" msgid="8685224436389816905">"Mensagens, eventos e lembretes"</string>
@@ -4045,7 +4047,7 @@
     <string name="display_cutout_emulation_keywords" msgid="6795671536772871439">"ecrã com recorte, entalhe"</string>
     <string name="overlay_option_device_default" msgid="165508753381657697">"Predefinição do dispositivo"</string>
     <string name="overlay_toast_failed_to_apply" msgid="5692251825129250040">"Falha ao aplicar a sobreposição."</string>
-    <string name="special_access" msgid="1453926335914696206">"Acesso especial a app"</string>
+    <string name="special_access" msgid="1453926335914696206">"Acesso especial a aplicações"</string>
     <plurals name="special_access_summary" formatted="false" msgid="5182092345063909346">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem utilizar dados sem restrições</item>
       <item quantity="one">1 aplicação pode utilizar dados sem restrições</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Vai tornar este telemóvel mais lento."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forçar medições de GNSS completas"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Monitorizar todas as constelações e frequências de GNSS sem ciclos"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Depurar mudança de utilizador"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Mostrar informações detalhadas durante a mudança de utilizador"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permitir inícios da atividade em segundo plano"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permite os inícios de toda a atividade em segundo plano."</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Mostrar sempre a caixa de diálogo de falhas"</string>
diff --git a/tests/CarDeveloperOptions/res/values-pt/arrays.xml b/tests/CarDeveloperOptions/res/values-pt/arrays.xml
new file mode 100644
index 0000000..2a5f2f6
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-pt/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"América"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"África"</item>
+    <item msgid="2765816300353408280">"Ásia"</item>
+    <item msgid="6683489385344409742">"Austrália"</item>
+    <item msgid="5194868215515664953">"Pacífico"</item>
+    <item msgid="7044520255415007865">"Todas as opções"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundos"</item>
+    <item msgid="772029947136115322">"30 segundos"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minutos"</item>
+    <item msgid="8664703938127907662">"5 minutos"</item>
+    <item msgid="5827960506924849753">"10 minutos"</item>
+    <item msgid="6677424950124253938">"30 minutos"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nunca"</item>
+    <item msgid="2517785806387977252">"15 segundos"</item>
+    <item msgid="6347954399441173672">"30 segundos"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minutos"</item>
+    <item msgid="2788593551142462622">"5 minutos"</item>
+    <item msgid="8012672183888404961">"10 minutos"</item>
+    <item msgid="8271452751594598661">"30 minutos"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Imediatamente"</item>
+    <item msgid="2038544972632026612">"5 segundos"</item>
+    <item msgid="5558060663472279597">"15 segundos"</item>
+    <item msgid="45341168505452037">"30 segundos"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minutos"</item>
+    <item msgid="4376575879222393045">"5 minutos"</item>
+    <item msgid="811192536981678974">"10 minutos"</item>
+    <item msgid="7258394417241706272">"30 minutos"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Pequena"</item>
+    <item msgid="591935967183159581">"Padrão"</item>
+    <item msgid="1714184661981538355">"Grande"</item>
+    <item msgid="6195563047686707484">"Maior"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Procurando…"</item>
+    <item msgid="5597394826455877834">"Conectando..."</item>
+    <item msgid="5848277343965362748">"Autenticando..."</item>
+    <item msgid="3391238031431440676">"Obtendo endereço IP…"</item>
+    <item msgid="5257597310494000224">"Conectada"</item>
+    <item msgid="8472497592913050396">"Suspenso"</item>
+    <item msgid="1228072488815999109">"Desconectando…"</item>
+    <item msgid="7253087004422991731">"Desconectado"</item>
+    <item msgid="4169850917304751227">"Falha"</item>
+    <item msgid="6266658166690831131">"Bloqueadas"</item>
+    <item msgid="4517230805854909775">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Procurando..."</item>
+    <item msgid="8058143476674427024">"Conectando-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Autenticando com <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Obtendo endereço IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspenso"</item>
+    <item msgid="4133290864821295785">"Desconectando da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Desconectado"</item>
+    <item msgid="2847316776634969068">"Falha"</item>
+    <item msgid="4390990424746035383">"Bloqueadas"</item>
+    <item msgid="3618248791367063949">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Pressione o botão"</item>
+    <item msgid="7401896200768713930">"PIN do dispositivo pareado"</item>
+    <item msgid="4526848028011846710">"PIN deste disposit."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Conectada"</item>
+    <item msgid="983792611851499732">"Convidado"</item>
+    <item msgid="5438273405428201793">"Falha"</item>
+    <item msgid="4646663015449312554">"Disponível"</item>
+    <item msgid="3230556734162006146">"Fora de alcance"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minutos"</item>
+    <item msgid="2759776603549270587">"5 minutos"</item>
+    <item msgid="167772676068860015">"1 hora"</item>
+    <item msgid="5985477119043628504">"Nunca definir tempo limite"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Usar padrão do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Fraca"</item>
+    <item msgid="7882129634982603782">"Fraca"</item>
+    <item msgid="6457357501905996224">"Regular"</item>
+    <item msgid="405271628162918841">"Boa"</item>
+    <item msgid="999948812884919584">"Excelente"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Últimos 30 dias"</item>
+    <item msgid="3211287705232736964">"Definir ciclo de uso..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Tempo de uso"</item>
+    <item msgid="2784401352592276015">"Última utilização"</item>
+    <item msgid="249854287216326349">"Nome do app"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Nenhum"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Nenhum"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Nenhum"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Estático"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Nenhum"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Autoconfiguração do proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Nenhum"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ou CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Não especificado"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Nenhum"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Armazenamento do dispositivo interno"</item>
+    <item msgid="3186681694079967527">"Cartão SD removível"</item>
+    <item msgid="6902033473986647035">"Deixar o sistema decidir"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Localização"</item>
+    <item msgid="6842381562497597649">"Pessoais"</item>
+    <item msgid="3966700236695683444">"Mensagens"</item>
+    <item msgid="8563996233342430477">"Mídia"</item>
+    <item msgid="5323851085993963783">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"localização aproximada"</item>
+    <item msgid="1830619568689922920">"localização precisa"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibração"</item>
+    <item msgid="8632513128515114092">"ler contatos"</item>
+    <item msgid="3741042113569620272">"modificar contatos"</item>
+    <item msgid="4204420969709009931">"ler registro de chamadas"</item>
+    <item msgid="2260380357119423209">"modificar registro de chamadas"</item>
+    <item msgid="6550710385014530934">"ler agenda"</item>
+    <item msgid="3575906174264853951">"modificar agenda"</item>
+    <item msgid="4319843242568057174">"busca por Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notificação"</item>
+    <item msgid="6617825156152476692">"verificação de celular"</item>
+    <item msgid="8865260890611559753">"chamar telefone"</item>
+    <item msgid="3254999273961542982">"ler SMS"</item>
+    <item msgid="7711446453028825171">"gravar SMS"</item>
+    <item msgid="6123238544099198034">"receber SMS"</item>
+    <item msgid="838342167431596036">"receber SMS de emergência"</item>
+    <item msgid="8554432731560956686">"receber MMS"</item>
+    <item msgid="7464863464299515059">"receber WAP push"</item>
+    <item msgid="310463075729606765">"enviar SMS"</item>
+    <item msgid="7338021933527689514">"ler SMS ICC"</item>
+    <item msgid="6130369335466613036">"gravar SMS ICC"</item>
+    <item msgid="6536865581421670942">"modificar configurações"</item>
+    <item msgid="4547203129183558973">"sobrepor"</item>
+    <item msgid="9080347512916542840">"acessar notificações"</item>
+    <item msgid="5332718516635907742">"câmera"</item>
+    <item msgid="6098422447246167852">"gravar áudio"</item>
+    <item msgid="9182794235292595296">"reproduzir áudio"</item>
+    <item msgid="8760743229597702019">"ler a área de transferência"</item>
+    <item msgid="2266923698240538544">"modificar a área de transferência"</item>
+    <item msgid="1801619438618539275">"botões de mídia"</item>
+    <item msgid="31588119965784465">"foco de áudio"</item>
+    <item msgid="7565226799008076833">"volume mestre"</item>
+    <item msgid="5420704980305018295">"volume da voz"</item>
+    <item msgid="5797363115508970204">"volume do toque"</item>
+    <item msgid="8233154098550715999">"volume da mídia"</item>
+    <item msgid="5196715605078153950">"volume do alarme"</item>
+    <item msgid="394030698764284577">"volume da notificação"</item>
+    <item msgid="8952898972491680178">"volume do Bluetooth"</item>
+    <item msgid="8506227454543690851">"permanecer ativo"</item>
+    <item msgid="1108160036049727420">"monitorar local"</item>
+    <item msgid="1496205959751719491">"monitorar local de alta potência"</item>
+    <item msgid="3776296279910987380">"obter estatísticas de uso"</item>
+    <item msgid="8827100324471975602">"ativar/desativar o som do microfone"</item>
+    <item msgid="6880736730520126864">"mostrar notificação toast"</item>
+    <item msgid="4933375960222609935">"projeção de mídia"</item>
+    <item msgid="8357907018938895462">"ativar VPN"</item>
+    <item msgid="8143812849911310973">"escrever plano de fundo"</item>
+    <item msgid="6266277260961066535">"estrutura de assistência"</item>
+    <item msgid="7715498149883482300">"captura de tela de assistência"</item>
+    <item msgid="4046679376726313293">"ler estado do telefone"</item>
+    <item msgid="6329507266039719587">"adicionar correio de voz"</item>
+    <item msgid="7692440726415391408">"usar sip"</item>
+    <item msgid="8572453398128326267">"processar chamada realizada"</item>
+    <item msgid="7775674394089376306">"impressão digital"</item>
+    <item msgid="3182815133441738779">"sensores corporais"</item>
+    <item msgid="2793100005496829513">"ler transmissões celulares"</item>
+    <item msgid="2633626056029384366">"locais fictícios"</item>
+    <item msgid="8356842191824684631">"ler armazenamento"</item>
+    <item msgid="5671906070163291500">"gravar armazenamento"</item>
+    <item msgid="2791955098549340418">"ativar tela"</item>
+    <item msgid="5599435119609178367">"adquirir contas"</item>
+    <item msgid="1165623660533024666">"executar em segundo plano"</item>
+    <item msgid="6423861043647911030">"volume da acessibilidade"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Localização"</item>
+    <item msgid="6656077694190491067">"Localização"</item>
+    <item msgid="8790228218278477369">"Localização"</item>
+    <item msgid="7836406246005211990">"Vibração"</item>
+    <item msgid="3951439024549922598">"Ler contatos"</item>
+    <item msgid="8802152411647068">"Modificar contatos"</item>
+    <item msgid="229544934599698735">"Ler registro de chamadas"</item>
+    <item msgid="7396102294405899613">"Modificar registro de chamadas"</item>
+    <item msgid="3597797992398484655">"Ler agenda"</item>
+    <item msgid="2705975774250907343">"Modificar agenda"</item>
+    <item msgid="4668747371441932697">"Localização"</item>
+    <item msgid="1487578921720243646">"Postar notificação"</item>
+    <item msgid="4636080349724146638">"Local"</item>
+    <item msgid="673510900286463926">"Chamar telefone"</item>
+    <item msgid="542083422784609790">"Ler SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Escrever SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Receber SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Receber SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Receber SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Receber SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Enviar SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Ler SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Escrever SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Modificar configurações"</item>
+    <item msgid="8705854389991425629">"Sobrepor"</item>
+    <item msgid="5861356020344153651">"Acessar notificações"</item>
+    <item msgid="78432174621628659">"Câmera"</item>
+    <item msgid="3986116419882154794">"Gravar áudio"</item>
+    <item msgid="4516840825756409490">"Reproduzir áudio"</item>
+    <item msgid="6811712502798183957">"Ler a área de transferência"</item>
+    <item msgid="2780369012602289114">"Modificar a área de transferência"</item>
+    <item msgid="2331359440170850868">"Botões de mídia"</item>
+    <item msgid="6133599737122751231">"Foco de áudio"</item>
+    <item msgid="6844485713404805301">"Volume mestre"</item>
+    <item msgid="1600379420669104929">"Volume da voz"</item>
+    <item msgid="6296768210470214866">"Volume do toque"</item>
+    <item msgid="510690696071629241">"Volume de mídia"</item>
+    <item msgid="406861638631430109">"Volume do alarme"</item>
+    <item msgid="4715864795872233884">"Volume das notificações"</item>
+    <item msgid="2311478519251301183">"Volume do Bluetooth"</item>
+    <item msgid="5133991377896747027">"Permanecer ativo"</item>
+    <item msgid="2464189519136248621">"Local"</item>
+    <item msgid="2062677934050803037">"Local"</item>
+    <item msgid="1735171933192715957">"Obter estatísticas de uso"</item>
+    <item msgid="1014093788778383554">"Ativar/desativar o som do microfone"</item>
+    <item msgid="4199297950608622850">"Mostrar notificação toast"</item>
+    <item msgid="2527962435313398821">"Projeção de mídia"</item>
+    <item msgid="5117506254221861929">"Ativar VPN"</item>
+    <item msgid="8291198322681891160">"Escrever plano de fundo"</item>
+    <item msgid="7106921284621230961">"Estrutura de assistência"</item>
+    <item msgid="4496533640894624799">"Captura de tela de assistência"</item>
+    <item msgid="2598847264853993611">"Ler estado do telefone"</item>
+    <item msgid="9215610846802973353">"Adicionar correio de voz"</item>
+    <item msgid="9186411956086478261">"Usar SIP"</item>
+    <item msgid="6884763100104539558">"Processar chamada realizada"</item>
+    <item msgid="125513972170580692">"Impressão digital"</item>
+    <item msgid="2556071024281275619">"Sensores corporais"</item>
+    <item msgid="617168514928339387">"Ler transmissões celulares"</item>
+    <item msgid="7134693570516523585">"Locais fictícios"</item>
+    <item msgid="7224489175375229399">"Ler armazenamento"</item>
+    <item msgid="8472735063903258202">"Gravar armazenamento"</item>
+    <item msgid="4069276819909595110">"Ativar tela"</item>
+    <item msgid="1228338896751121025">"Adquirir contas"</item>
+    <item msgid="3181581793459233672">"Executar em segundo plano"</item>
+    <item msgid="2340936043025374076">"Volume da acessibilidade"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Curto"</item>
+    <item msgid="4816511817309094890">"Média"</item>
+    <item msgid="8305084671259331134">"Longo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Padrão"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensado"</item>
+    <item msgid="6529379119163117545">"Sans-serif monoespaçada"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monoespaçada"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursiva"</item>
+    <item msgid="6896773537705206194">"Versalete"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Muito pequeno"</item>
+    <item msgid="5091603983404027034">"Pequeno"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Grande"</item>
+    <item msgid="218913203203160606">"Muito grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Padrão"</item>
+    <item msgid="6488643537808152001">"Nenhum"</item>
+    <item msgid="552332815156010137">"Contorno"</item>
+    <item msgid="7187891159463789272">"Sombra"</item>
+    <item msgid="8019330250538856521">"Aumentada"</item>
+    <item msgid="8987385315647049787">"Baixo relevo"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Usar padrões do app"</item>
+    <item msgid="8611890312638868524">"Branco em preto"</item>
+    <item msgid="5891360837786277638">"Preto em branco"</item>
+    <item msgid="2798457065945456853">"Amarelo em preto"</item>
+    <item msgid="5799049811524553967">"Amarelo em azul"</item>
+    <item msgid="3673930830658169860">"Personalizados"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN com chaves pré-compartilhadas"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec com certificados"</item>
+    <item msgid="312397853907741968">"VPN IPSec com chaves pré-compartilhadas e autenticação Xauth"</item>
+    <item msgid="3319427315593649917">"VPN IPSec com autenticação de certificados e Xauth"</item>
+    <item msgid="8258927774145391041">"VPN IPSec com certificados e autenticação híbrida"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Nenhum"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Desconectado"</item>
+    <item msgid="8754480102834556765">"Inicializando..."</item>
+    <item msgid="3351334355574270250">"Conectando..."</item>
+    <item msgid="8303882153995748352">"Conectada"</item>
+    <item msgid="9135049670787351881">"Tempo limite"</item>
+    <item msgid="2124868417182583926">"Falha"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Perguntar"</item>
+    <item msgid="7718817231348607934">"Nunca permitir"</item>
+    <item msgid="8184570120217958741">"Sempre permitir"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Persistente"</item>
+    <item msgid="167418068739176448">"Principal atividade"</item>
+    <item msgid="4760813290195199773">"Importante (primeiro plano)"</item>
+    <item msgid="2328684826817647595">"Importante (segundo plano)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Uso intenso"</item>
+    <item msgid="1290888779300174556">"Serviço (em execução)"</item>
+    <item msgid="7241098542073939046">"Serviço (reiniciando)"</item>
+    <item msgid="6610439017684111046">"Receptor"</item>
+    <item msgid="7367606086319921117">"Início"</item>
+    <item msgid="3344660712396741826">"Última atividade"</item>
+    <item msgid="5006559348883303865">"Em cache (atividade)"</item>
+    <item msgid="8633480732468137525">"Em cache (cliente de atividade)"</item>
+    <item msgid="6248998242443333892">"Em cache (vazio)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Azul-petróleo"</item>
+    <item msgid="3228505970082457852">"Azul"</item>
+    <item msgid="6590260735734795647">"Índigo"</item>
+    <item msgid="3521763377357218577">"Roxo"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Vermelho"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Com mais de 30 dias"</item>
+    <item msgid="8699273238891265610">"Com mais de 60 dias"</item>
+    <item msgid="8346279419423837266">"Com mais de 90 dias"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detectar automaticamente"</item>
+    <item msgid="773943026484148895">"Tratar como limitada"</item>
+    <item msgid="1008268820118852416">"Tratar como ilimitada"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Usar MAC aleatório (padrão)"</item>
+    <item msgid="214234417308375326">"Usar MAC do dispositivo"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Não"</item>
+    <item msgid="1930581185557754880">"Sim"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Escuro"</item>
+    <item msgid="5079453644557603349">"Claro"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Desativada"</item>
+    <item msgid="4072198137051566919">"Depuração"</item>
+    <item msgid="2473005316958868509">"Detalhado"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Somente doméstica"</item>
+    <item msgid="1161026694891024702">"Automático"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferencial"</item>
+    <item msgid="7581481130337402578">"Somente GSM"</item>
+    <item msgid="8579197487913425819">"Somente WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automático"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automático"</item>
+    <item msgid="4219607161971472471">"CDMA sem EvDo"</item>
+    <item msgid="7278975240951052041">"Somente EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"Somente TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"R-UIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-pt/strings.xml b/tests/CarDeveloperOptions/res/values-pt/strings.xml
index 1822119..0de3591 100644
--- a/tests/CarDeveloperOptions/res/values-pt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Proteja seu tablet com uma opção de bloqueio de tela para que ninguém possa usá-lo caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar a autenticação facial. Toque em \"Cancelar\", depois defina um PIN ou selecione outra opção de bloqueio de tela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Proteja seu dispositivo com uma opção de bloqueio de tela para que ninguém possa usá-lo caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar a autenticação facial. Toque em \"Cancelar\", depois defina um PIN ou selecione outra opção de bloqueio de tela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Proteja seu smartphone com uma opção de bloqueio de tela para que ninguém possa usá-lo caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar a autenticação facial. Toque em \"Cancelar\", depois defina um PIN ou selecione outra opção de bloqueio de tela."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Pular configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Pular configuração de senha?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Pular configuração de padrão?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurar bloqueio de tela"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Celular"</item>
+    <item msgid="6007360612667098926">"Somente Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1168,7 +1170,7 @@
     <string name="color_mode_option_natural" msgid="1292837781836645320">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="453557938434778933">"Realçadas"</string>
     <string name="color_mode_option_saturated" msgid="7758384943407859851">"Saturadas"</string>
-    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Adaptativo"</string>
+    <string name="color_mode_option_automatic" msgid="6572718611315165117">"Adaptável"</string>
     <string name="color_mode_summary_natural" msgid="1247153893843263340">"Usar apenas cores precisas"</string>
     <string name="color_mode_summary_automatic" msgid="6066740785261330514">"Ajuste entre cores vívidas e precisas"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="5750977897791656412">"Alternar orientação automaticamente ao girar o tablet"</string>
@@ -1202,7 +1204,7 @@
     <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Desativada"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"Evita que a tela seja desativada se você estiver olhando para ela."</string>
-    <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Usando a câmera frontal, o \"Reconhecimento de tela em uso\" detecta se alguém está olhando para tela. Ele funciona no dispositivo, e as imagens nunca são armazenada nem enviadas ao Google."</string>
+    <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Usando a câmera frontal, o \"Reconhecimento de tela em uso\" detecta se alguém está olhando para a tela. Ele funciona no dispositivo, e as imagens nunca são armazenadas nem enviadas ao Google."</string>
     <string name="night_display_title" msgid="1305002424893349814">"Modo noturno"</string>
     <string name="night_display_text" msgid="5330502493684652527">"O Modo noturno deixa sua tela na cor âmbar. Isso facilita olhar para a tela ou ler com pouca luz, ajudando você a adormecer com mais facilidade."</string>
     <string name="night_display_auto_mode_title" msgid="8493573087102481588">"Programar"</string>
@@ -1239,13 +1241,13 @@
     <string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"Personalizar sua tela"</string>
     <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"Selecionar de..."</string>
     <string name="screensaver_settings_title" msgid="7720091234133721021">"Protetor de tela"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"Ao carregar ou quando ancorado"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"Ao carregar ou quando encaixado na base"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2453772128682850053">"Ambos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6097363596749362692">"Ao carregar"</string>
-    <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"Quando ancorado"</string>
+    <string name="screensaver_settings_summary_dock" msgid="6297808146601570196">"Na base"</string>
     <string name="screensaver_settings_summary_never" msgid="3995259444981620707">"Nunca"</string>
     <string name="screensaver_settings_summary_off" msgid="6119947316484763131">"Desativado"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"Para controlar o que acontece quando o smartphone está ancorado e/ou no modo de suspensão, ative o protetor de tela."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1897518064782596947">"Para controlar o que acontece quando o smartphone está na base e/ou no modo de suspensão, ative o protetor de tela."</string>
     <string name="screensaver_settings_when_to_dream" msgid="3763052013516826348">"Quando começar"</string>
     <string name="screensaver_settings_current" msgid="4017556173596361672">"Protetor de tela atual"</string>
     <string name="screensaver_settings_dream_start" msgid="3772227299054662550">"Começar agora"</string>
@@ -2260,7 +2262,7 @@
     <string name="details_subtitle" msgid="7279638828004951382">"Detalhes de uso"</string>
     <string name="controls_subtitle" msgid="6920199888882834620">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="6506269487892204413">"Pacotes incluídos"</string>
-    <string name="battery_tip_summary_title" msgid="2750922152518825526">"Os apps estão sendo executados normalmente"</string>
+    <string name="battery_tip_summary_title" msgid="2750922152518825526">"Os apps estão funcionando normalmente"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="6294900413896440006">"O consumo de bateria em segundo plano do smartphone está normal."</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="5280099016800644130">"O tablet tem um consumo normal de bateria em segundo plano"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="4459840492610842705">"O dispositivo tem um consumo normal de bateria em segundo plano"</string>
@@ -3757,7 +3759,7 @@
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Permitir que o app assistivo acesse uma imagem da tela"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Piscar tela"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"Piscar as bordas da tela quando o app assistivo acessar textos da tela ou fizer uma captura de tela"</string>
-    <string name="assist_footer" msgid="7030121180457472165">"Apps assistivos podem ajudar com base nas informações da tela que você vê no momento. Alguns apps são compatíveis com a tela de início e com serviços de entrada de texto por voz para fornecer assistência integrada."</string>
+    <string name="assist_footer" msgid="7030121180457472165">"Apps assistivos podem ajudar com base nas informações que você vê na tela. Alguns apps oferecem tecnologia assistiva integrada, porque são compatíveis com a tela de início e com serviços de entrada de texto por voz."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"Uso médio de memória"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"Uso máximo de memória"</string>
     <string name="memory_usage" msgid="7963253555330830906">"Uso de memória"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Isso deixará seu smartphone mais lento"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forçar medições completas de GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Depurar troca de usuário"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Mostrar informações detalhadas durante a troca de usuário"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permitir início de atividades em segundo plano"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permitir o início de todas as atividades em segundo plano"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Sempre mostrar a caixa de diálogo de falha"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ro-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ro-nokeys/strings.xml
new file mode 100644
index 0000000..1ce4516
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ro-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Gestionați aplicațiile"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ro/arrays.xml b/tests/CarDeveloperOptions/res/values-ro/arrays.xml
new file mode 100644
index 0000000..39d046b
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ro/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"Toate"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 secunde"</item>
+    <item msgid="772029947136115322">"30 de secunde"</item>
+    <item msgid="8743663928349474087">"Un minut"</item>
+    <item msgid="1506508631223164814">"2 minute"</item>
+    <item msgid="8664703938127907662">"5 minute"</item>
+    <item msgid="5827960506924849753">"10 minute"</item>
+    <item msgid="6677424950124253938">"30 de minute"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Niciodată"</item>
+    <item msgid="2517785806387977252">"15 secunde"</item>
+    <item msgid="6347954399441173672">"30 de secunde"</item>
+    <item msgid="4858305253279921789">"Un minut"</item>
+    <item msgid="8109273437140044073">"2 minute"</item>
+    <item msgid="2788593551142462622">"5 minute"</item>
+    <item msgid="8012672183888404961">"10 minute"</item>
+    <item msgid="8271452751594598661">"30 de minute"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Imediat"</item>
+    <item msgid="2038544972632026612">"5 secunde"</item>
+    <item msgid="5558060663472279597">"15 secunde"</item>
+    <item msgid="45341168505452037">"30 de secunde"</item>
+    <item msgid="227647485917789272">"Un minut"</item>
+    <item msgid="3367011891231217504">"2 minute"</item>
+    <item msgid="4376575879222393045">"5 minute"</item>
+    <item msgid="811192536981678974">"10 minute"</item>
+    <item msgid="7258394417241706272">"30 de minute"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Mică"</item>
+    <item msgid="591935967183159581">"Prestabilit"</item>
+    <item msgid="1714184661981538355">"Mare"</item>
+    <item msgid="6195563047686707484">"Cea mai mare"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Se caută..."</item>
+    <item msgid="5597394826455877834">"Se conectează..."</item>
+    <item msgid="5848277343965362748">"Se autentifică..."</item>
+    <item msgid="3391238031431440676">"Se obține adresa IP..."</item>
+    <item msgid="5257597310494000224">"Conectată"</item>
+    <item msgid="8472497592913050396">"Suspendat"</item>
+    <item msgid="1228072488815999109">"În curs de deconectare..."</item>
+    <item msgid="7253087004422991731">"Deconectată"</item>
+    <item msgid="4169850917304751227">"Nereușit"</item>
+    <item msgid="6266658166690831131">"Blocat"</item>
+    <item msgid="4517230805854909775">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Se scanează..."</item>
+    <item msgid="8058143476674427024">"Se conectează la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Se autentifică cu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Se obține adresa IP de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Conectat la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspendat"</item>
+    <item msgid="4133290864821295785">"În curs de deconectare de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Deconectată"</item>
+    <item msgid="2847316776634969068">"Nereușit"</item>
+    <item msgid="4390990424746035383">"Blocat"</item>
+    <item msgid="3618248791367063949">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Buton WPS"</item>
+    <item msgid="7401896200768713930">"Codul PIN de la disp. pereche"</item>
+    <item msgid="4526848028011846710">"PIN de la ac. disp."</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Conectată"</item>
+    <item msgid="983792611851499732">"Invitat(ă)"</item>
+    <item msgid="5438273405428201793">"Nereușit"</item>
+    <item msgid="4646663015449312554">"Disponibil"</item>
+    <item msgid="3230556734162006146">"Fără acoperire"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minute"</item>
+    <item msgid="2759776603549270587">"5 minute"</item>
+    <item msgid="167772676068860015">"O oră"</item>
+    <item msgid="5985477119043628504">"Fără timp limită"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Utilizați setarea prestabilită a sistemului: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slab"</item>
+    <item msgid="7882129634982603782">"Slab"</item>
+    <item msgid="6457357501905996224">"Acceptabil"</item>
+    <item msgid="405271628162918841">"Bun"</item>
+    <item msgid="999948812884919584">"Excelent"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Ultimele 30 de zile"</item>
+    <item msgid="3211287705232736964">"Setați ciclu utilizare..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Durată de utilizare"</item>
+    <item msgid="2784401352592276015">"Ultima utilizare"</item>
+    <item msgid="249854287216326349">"Numele aplicației"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Niciuna"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Niciuna"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Niciuna"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Niciuna"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Config. automată proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Niciuna"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP sau CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Nespecificat"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Niciuna"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Stocare internă pe dispozitiv"</item>
+    <item msgid="3186681694079967527">"Card SD detașabil"</item>
+    <item msgid="6902033473986647035">"Permiteți sistemului să decidă"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Locație"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Mesagerie"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Dispozitiv"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"locație imprecisă"</item>
+    <item msgid="1830619568689922920">"locație exactă"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrează"</item>
+    <item msgid="8632513128515114092">"citește agenda"</item>
+    <item msgid="3741042113569620272">"modifică agenda"</item>
+    <item msgid="4204420969709009931">"citește jurnalul de apeluri"</item>
+    <item msgid="2260380357119423209">"modifică jurnalul de apeluri"</item>
+    <item msgid="6550710385014530934">"citește calendarul"</item>
+    <item msgid="3575906174264853951">"modifică calendarul"</item>
+    <item msgid="4319843242568057174">"scanează Wi-Fi"</item>
+    <item msgid="2981791890467303819">"notificare"</item>
+    <item msgid="6617825156152476692">"scanează semnal mobil"</item>
+    <item msgid="8865260890611559753">"apelează un telefon"</item>
+    <item msgid="3254999273961542982">"citește mesaje SMS"</item>
+    <item msgid="7711446453028825171">"scrie mesaje SMS"</item>
+    <item msgid="6123238544099198034">"primește mesaje SMS"</item>
+    <item msgid="838342167431596036">"primește mesaje SMS de urgență"</item>
+    <item msgid="8554432731560956686">"primește mesaje MMS"</item>
+    <item msgid="7464863464299515059">"primește mesaje WAP push"</item>
+    <item msgid="310463075729606765">"trimite mesaje SMS"</item>
+    <item msgid="7338021933527689514">"citește mesaje ICC SMS"</item>
+    <item msgid="6130369335466613036">"scrie mesaje ICC SMS"</item>
+    <item msgid="6536865581421670942">"modifică setările"</item>
+    <item msgid="4547203129183558973">"desenează deasupra"</item>
+    <item msgid="9080347512916542840">"accesează notificări"</item>
+    <item msgid="5332718516635907742">"cameră foto"</item>
+    <item msgid="6098422447246167852">"înregistrează conținut audio"</item>
+    <item msgid="9182794235292595296">"redă conținut audio"</item>
+    <item msgid="8760743229597702019">"citește clipboardul"</item>
+    <item msgid="2266923698240538544">"modifică clipboardul"</item>
+    <item msgid="1801619438618539275">"butoane media"</item>
+    <item msgid="31588119965784465">"focalizare audio"</item>
+    <item msgid="7565226799008076833">"volum principal"</item>
+    <item msgid="5420704980305018295">"volum voce"</item>
+    <item msgid="5797363115508970204">"volumul soneriei"</item>
+    <item msgid="8233154098550715999">"volum media"</item>
+    <item msgid="5196715605078153950">"volumul alarmei"</item>
+    <item msgid="394030698764284577">"volum notificări"</item>
+    <item msgid="8952898972491680178">"volumul Bluetooth"</item>
+    <item msgid="8506227454543690851">"mențineți activ"</item>
+    <item msgid="1108160036049727420">"monitorizarea locației"</item>
+    <item msgid="1496205959751719491">"monitorizarea localizării cu consum ridicat de energie"</item>
+    <item msgid="3776296279910987380">"obțineți statistici de utilizare"</item>
+    <item msgid="8827100324471975602">"activați/dezactivați microfonul"</item>
+    <item msgid="6880736730520126864">"afișează semnalarea"</item>
+    <item msgid="4933375960222609935">"proiectați conținutul media"</item>
+    <item msgid="8357907018938895462">"activează serviciul VPN"</item>
+    <item msgid="8143812849911310973">"scrie imaginea de fundal"</item>
+    <item msgid="6266277260961066535">"structură de asistență"</item>
+    <item msgid="7715498149883482300">"captură de ecran de asistență"</item>
+    <item msgid="4046679376726313293">"citește starea telefonului"</item>
+    <item msgid="6329507266039719587">"adaugă mesaje vocale"</item>
+    <item msgid="7692440726415391408">"folosește SIP"</item>
+    <item msgid="8572453398128326267">"procesează apelul de ieșire"</item>
+    <item msgid="7775674394089376306">"amprentă"</item>
+    <item msgid="3182815133441738779">"senzori corporali"</item>
+    <item msgid="2793100005496829513">"citește transmisiile celulare"</item>
+    <item msgid="2633626056029384366">"locație de testare"</item>
+    <item msgid="8356842191824684631">"citește spațiul de stocare"</item>
+    <item msgid="5671906070163291500">"scrie spațiul de stocare"</item>
+    <item msgid="2791955098549340418">"activează ecranul"</item>
+    <item msgid="5599435119609178367">"preia conturile"</item>
+    <item msgid="1165623660533024666">"rulează în fundal"</item>
+    <item msgid="6423861043647911030">"volum accesibilitate"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Scurtă"</item>
+    <item msgid="4816511817309094890">"Medie"</item>
+    <item msgid="8305084671259331134">"Lungă"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Prestabilit"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif condensat"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Obișnuit"</item>
+    <item msgid="4627069151979553527">"Cursiv"</item>
+    <item msgid="6896773537705206194">"Majuscule mici"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Foarte mic"</item>
+    <item msgid="5091603983404027034">"Mic"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Mare"</item>
+    <item msgid="218913203203160606">"Foarte mare"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Prestabilit"</item>
+    <item msgid="6488643537808152001">"Niciuna"</item>
+    <item msgid="552332815156010137">"Contur"</item>
+    <item msgid="7187891159463789272">"Umbră"</item>
+    <item msgid="8019330250538856521">"Ridicat"</item>
+    <item msgid="8987385315647049787">"Adâncită"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Setările prestabilite"</item>
+    <item msgid="8611890312638868524">"Alb pe negru"</item>
+    <item msgid="5891360837786277638">"Negru pe alb"</item>
+    <item msgid="2798457065945456853">"Galben pe negru"</item>
+    <item msgid="5799049811524553967">"Galben pe albastru"</item>
+    <item msgid="3673930830658169860">"Personalizat"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN cu chei predistribuite"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN cu certificate"</item>
+    <item msgid="312397853907741968">"IPSec VPN cu chei predistribuite și autentificare Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN cu certificate și autentificare Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN cu certificate și autentificare hibridă"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Niciunul"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Deconectată"</item>
+    <item msgid="8754480102834556765">"Se inițializează..."</item>
+    <item msgid="3351334355574270250">"Se conectează..."</item>
+    <item msgid="8303882153995748352">"Conectată"</item>
+    <item msgid="9135049670787351881">"Timp limită"</item>
+    <item msgid="2124868417182583926">"Nereușit"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Întrebați"</item>
+    <item msgid="7718817231348607934">"Nu permiteți niciodată"</item>
+    <item msgid="8184570120217958741">"Permiteți întotdeauna"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Permanent"</item>
+    <item msgid="167418068739176448">"Activitate principală"</item>
+    <item msgid="4760813290195199773">"Important (în prim-plan)"</item>
+    <item msgid="2328684826817647595">"Important (în fundal)"</item>
+    <item msgid="7746406490652867365">"Backup"</item>
+    <item msgid="5597404364389196754">"Complex"</item>
+    <item msgid="1290888779300174556">"Serviciu (în curs)"</item>
+    <item msgid="7241098542073939046">"Serviciu (repornește)"</item>
+    <item msgid="6610439017684111046">"Receptor"</item>
+    <item msgid="7367606086319921117">"Pornire"</item>
+    <item msgid="3344660712396741826">"Ultima activitate"</item>
+    <item msgid="5006559348883303865">"În cache (activitate)"</item>
+    <item msgid="8633480732468137525">"În cache (client de activitate)"</item>
+    <item msgid="6248998242443333892">"În cache (gol)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Turcoaz"</item>
+    <item msgid="3228505970082457852">"Albastru"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Violet"</item>
+    <item msgid="5932337981182999919">"Roz"</item>
+    <item msgid="5642914536624000094">"Roșu"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Vechi de peste 30 de zile"</item>
+    <item msgid="8699273238891265610">"Vechi de peste 60 de zile"</item>
+    <item msgid="8346279419423837266">"Vechi de peste 90 de zile"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Detectează automat"</item>
+    <item msgid="773943026484148895">"Tratează ca fiind contorizată"</item>
+    <item msgid="1008268820118852416">"Tratează ca fiind necontorizată"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Folosiți o adresă MAC aleatorie (prestabilit)"</item>
+    <item msgid="214234417308375326">"Folosiți adresa MAC a dispozitivului"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nu"</item>
+    <item msgid="1930581185557754880">"Da"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Întunecată"</item>
+    <item msgid="5079453644557603349">"Deschisă"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Dezactivat"</item>
+    <item msgid="4072198137051566919">"Remediați erorile"</item>
+    <item msgid="2473005316958868509">"Detaliat"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Doar domiciliu"</item>
+    <item msgid="1161026694891024702">"Automat"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA preferat"</item>
+    <item msgid="7581481130337402578">"Numai GSM"</item>
+    <item msgid="8579197487913425819">"Numai WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automat"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automat"</item>
+    <item msgid="4219607161971472471">"CDMA fără EvDo"</item>
+    <item msgid="7278975240951052041">"Numai EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Numai TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ro/strings.xml b/tests/CarDeveloperOptions/res/values-ro/strings.xml
index 69a00cc..721a81a 100644
--- a/tests/CarDeveloperOptions/res/values-ro/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ro/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protejați-vă tableta cu o opțiune de blocare a ecranului, astfel încât nimeni să nu o poată folosi dacă o pierdeți sau este furată. Aveți nevoie de o opțiune de blocare a ecranului și pentru a configura autentificarea facială. Atingeți Anulați, apoi setați un PIN sau alegeți o altă opțiune de blocare a ecranului."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protejați-vă dispozitivul cu o opțiune de blocare a ecranului, astfel încât nimeni să nu îl poată folosi dacă îl pierdeți sau este furat. Aveți nevoie de o opțiune de blocare a ecranului și pentru a configura autentificarea facială. Atingeți Anulați, apoi setați un PIN sau alegeți o altă opțiune de blocare a ecranului."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protejați-vă telefonul cu o opțiune de blocare a ecranului, astfel încât nimeni să nu îl poată folosi dacă îl pierdeți sau este furat. Aveți nevoie de o opțiune de blocare a ecranului și pentru a configura autentificarea facială. Atingeți Anulați, apoi setați un PIN sau alegeți o altă opțiune de blocare a ecranului."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Omiteți configurarea PIN-ului?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Omiteți configurarea parolei?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Omiteți configurarea modelului?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Configurați blocarea ecranului"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Date mobile"</item>
+    <item msgid="6007360612667098926">"Numai Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1672,7 +1674,7 @@
     <string name="location_no_recent_accesses" msgid="6289916310397279890">"Nicio aplicație nu a accesat recent locația"</string>
     <string name="location_high_battery_use" msgid="7177199869979522663">"Utilizare intensă a bateriei"</string>
     <string name="location_low_battery_use" msgid="5030448574501435888">"Utilizare redusă a bateriei"</string>
-    <string name="location_scanning_screen_title" msgid="7663329319689413454">"Scanare prin Wi‑Fi și Bluetooth"</string>
+    <string name="location_scanning_screen_title" msgid="7663329319689413454">"Căutare Wi‑Fi și Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6750542206763112172">"Căutare de rețele Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="4956048135941851712">"Permiteți aplicațiilor și serviciilor să caute permanent rețele Wi-Fi, chiar și atunci când setarea Wi-Fi este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"Căutare Bluetooth"</string>
@@ -4348,6 +4350,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Va încetini acest telefon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Forțați măsurători GNSS complete"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Urmăriți toate constelațiile și frecvențele GNSS fără ciclu de funcționare"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Remediați erorile la schimbarea utilizatorului"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Afișați informații detaliate la schimbarea utilizatorului"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Permiteți ca activitățile să pornească în fundal"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Permiteți tuturor activităților să pornească în fundal"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Afișați întotdeauna caseta de dialog pentru blocări"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ru-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ru-nokeys/strings.xml
new file mode 100644
index 0000000..84915e8
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ru-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Управление приложениями"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ru/arrays.xml b/tests/CarDeveloperOptions/res/values-ru/arrays.xml
new file mode 100644
index 0000000..8993349
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ru/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америка"</item>
+    <item msgid="4791956477275129121">"Европа"</item>
+    <item msgid="3812126832016254559">"Африка"</item>
+    <item msgid="2765816300353408280">"Азия"</item>
+    <item msgid="6683489385344409742">"Австралия"</item>
+    <item msgid="5194868215515664953">"Тихий океан"</item>
+    <item msgid="7044520255415007865">"Все"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 сек."</item>
+    <item msgid="772029947136115322">"30 секунд"</item>
+    <item msgid="8743663928349474087">"1 минута"</item>
+    <item msgid="1506508631223164814">"2 минуты"</item>
+    <item msgid="8664703938127907662">"5 мин."</item>
+    <item msgid="5827960506924849753">"10 мин."</item>
+    <item msgid="6677424950124253938">"30 мин."</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Никогда"</item>
+    <item msgid="2517785806387977252">"15 сек."</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 минута"</item>
+    <item msgid="8109273437140044073">"2 минуты"</item>
+    <item msgid="2788593551142462622">"5 мин."</item>
+    <item msgid="8012672183888404961">"10 мин."</item>
+    <item msgid="8271452751594598661">"30 мин."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Сразу"</item>
+    <item msgid="2038544972632026612">"Через 5 сек."</item>
+    <item msgid="5558060663472279597">"Через 15 сек."</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 минута"</item>
+    <item msgid="3367011891231217504">"2 минуты"</item>
+    <item msgid="4376575879222393045">"Через 5 мин."</item>
+    <item msgid="811192536981678974">"Через 10 мин."</item>
+    <item msgid="7258394417241706272">"Через 30 мин."</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Мелкий"</item>
+    <item msgid="591935967183159581">"По умолчанию"</item>
+    <item msgid="1714184661981538355">"Крупный"</item>
+    <item msgid="6195563047686707484">"Максимальный"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Поиск..."</item>
+    <item msgid="5597394826455877834">"Подключение..."</item>
+    <item msgid="5848277343965362748">"Аутентификация..."</item>
+    <item msgid="3391238031431440676">"Получение IP-адреса..."</item>
+    <item msgid="5257597310494000224">"Подключено"</item>
+    <item msgid="8472497592913050396">"Приостановлено"</item>
+    <item msgid="1228072488815999109">"Отключение..."</item>
+    <item msgid="7253087004422991731">"Нет подключения"</item>
+    <item msgid="4169850917304751227">"Сбой"</item>
+    <item msgid="6266658166690831131">"Заблокировано"</item>
+    <item msgid="4517230805854909775">"Временно избегать плохого соединения"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Поиск..."</item>
+    <item msgid="8058143476674427024">"Соединение с сетью <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Аутентификация в сети <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Получение IP-адреса в сети <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Подключено к <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Приостановлено"</item>
+    <item msgid="4133290864821295785">"Отключение от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Нет подключения"</item>
+    <item msgid="2847316776634969068">"Сбой"</item>
+    <item msgid="4390990424746035383">"Заблокировано"</item>
+    <item msgid="3618248791367063949">"Временно избегать плохого соединения"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Push-кнопка"</item>
+    <item msgid="7401896200768713930">"PIN-код с обнаруженного устройства"</item>
+    <item msgid="4526848028011846710">"PIN-код этого устройства"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Подключено"</item>
+    <item msgid="983792611851499732">"Приглашено"</item>
+    <item msgid="5438273405428201793">"Сбой"</item>
+    <item msgid="4646663015449312554">"Доступна"</item>
+    <item msgid="3230556734162006146">"Вне диапазона"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 минуты"</item>
+    <item msgid="2759776603549270587">"5 мин."</item>
+    <item msgid="167772676068860015">"1 час"</item>
+    <item msgid="5985477119043628504">"Без тайм-аута"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Использовать значение по умолчанию: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слабый"</item>
+    <item msgid="7882129634982603782">"Слабый"</item>
+    <item msgid="6457357501905996224">"Достаточный"</item>
+    <item msgid="405271628162918841">"Хороший"</item>
+    <item msgid="999948812884919584">"Отличный"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"За последние 30 дней"</item>
+    <item msgid="3211287705232736964">"Цикл использования данных"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Время использования"</item>
+    <item msgid="2784401352592276015">"Последнее использование"</item>
+    <item msgid="249854287216326349">"Название приложения"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Нет сетей"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Нет"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Нет сетей"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Пользовательские"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Нет сетей"</item>
+    <item msgid="1464741437353223198">"Руководство"</item>
+    <item msgid="5793600062487886090">"Автоконфигурация прокси"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Нет сетей"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP или CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Не указано"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Нет"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Внутренний накопитель устройства"</item>
+    <item msgid="3186681694079967527">"Съемная SD-карта"</item>
+    <item msgid="6902033473986647035">"На усмотрение системы"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Определение местоположения"</item>
+    <item msgid="6842381562497597649">"Личные данные"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Мультимедиа"</item>
+    <item msgid="5323851085993963783">"На устройстве"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"приблизительное местоположение"</item>
+    <item msgid="1830619568689922920">"точное местоположение"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"вибросигнал"</item>
+    <item msgid="8632513128515114092">"считывать данные контактов"</item>
+    <item msgid="3741042113569620272">"изменение контактов"</item>
+    <item msgid="4204420969709009931">"просмотр списка вызовов"</item>
+    <item msgid="2260380357119423209">"изменение списка вызовов"</item>
+    <item msgid="6550710385014530934">"считывать данные календаря"</item>
+    <item msgid="3575906174264853951">"изменение календаря"</item>
+    <item msgid="4319843242568057174">"поиск Wi-Fi"</item>
+    <item msgid="2981791890467303819">"уведомление"</item>
+    <item msgid="6617825156152476692">"поиск мобильных сетей"</item>
+    <item msgid="8865260890611559753">"позвонить"</item>
+    <item msgid="3254999273961542982">"чтение SMS"</item>
+    <item msgid="7711446453028825171">"создание SMS"</item>
+    <item msgid="6123238544099198034">"Получение SMS"</item>
+    <item msgid="838342167431596036">"получение экстренных SMS"</item>
+    <item msgid="8554432731560956686">"получение MMS"</item>
+    <item msgid="7464863464299515059">"получение сообщений WAP PUSH"</item>
+    <item msgid="310463075729606765">"отправка SMS"</item>
+    <item msgid="7338021933527689514">"чтение SMS со смарт-карты"</item>
+    <item msgid="6130369335466613036">"запись SMS на смарт-карту"</item>
+    <item msgid="6536865581421670942">"изменение настроек"</item>
+    <item msgid="4547203129183558973">"отображать поверх других элементов"</item>
+    <item msgid="9080347512916542840">"Доступ к уведомлениям"</item>
+    <item msgid="5332718516635907742">"камера"</item>
+    <item msgid="6098422447246167852">"записать аудио"</item>
+    <item msgid="9182794235292595296">"воспроизвести аудио"</item>
+    <item msgid="8760743229597702019">"считать из буфера обмена"</item>
+    <item msgid="2266923698240538544">"изменить буфер обмена"</item>
+    <item msgid="1801619438618539275">"кнопки мультимедиа"</item>
+    <item msgid="31588119965784465">"аудиофокус"</item>
+    <item msgid="7565226799008076833">"общая громкость"</item>
+    <item msgid="5420704980305018295">"громкость голоса"</item>
+    <item msgid="5797363115508970204">"громкость звонка"</item>
+    <item msgid="8233154098550715999">"громкость мультимедиа"</item>
+    <item msgid="5196715605078153950">"громкость будильника"</item>
+    <item msgid="394030698764284577">"громкость уведомлений"</item>
+    <item msgid="8952898972491680178">"громкость Bluetooth-устройств"</item>
+    <item msgid="8506227454543690851">"не отключать"</item>
+    <item msgid="1108160036049727420">"Отслеживать местоположение"</item>
+    <item msgid="1496205959751719491">"контролировать использование энергии при определении местоположения"</item>
+    <item msgid="3776296279910987380">"посмотреть статистику использования"</item>
+    <item msgid="8827100324471975602">"включить/отключить микрофон"</item>
+    <item msgid="6880736730520126864">"показ оповещения"</item>
+    <item msgid="4933375960222609935">"трансляция контента"</item>
+    <item msgid="8357907018938895462">"активация VPN"</item>
+    <item msgid="8143812849911310973">"сохранение обоев"</item>
+    <item msgid="6266277260961066535">"вспомогательная структура"</item>
+    <item msgid="7715498149883482300">"вспомогательный скриншот"</item>
+    <item msgid="4046679376726313293">"чтение состояния телефона"</item>
+    <item msgid="6329507266039719587">"добавление голосовой почты"</item>
+    <item msgid="7692440726415391408">"использование SIP"</item>
+    <item msgid="8572453398128326267">"обработка исходящих вызовов"</item>
+    <item msgid="7775674394089376306">"отпечаток пальца"</item>
+    <item msgid="3182815133441738779">"нательные датчики"</item>
+    <item msgid="2793100005496829513">"чтение сообщений системы оповещения населения"</item>
+    <item msgid="2633626056029384366">"подмена геоданных"</item>
+    <item msgid="8356842191824684631">"чтение из хранилища"</item>
+    <item msgid="5671906070163291500">"запись в хранилище"</item>
+    <item msgid="2791955098549340418">"включение экрана"</item>
+    <item msgid="5599435119609178367">"получение данных об аккаунтах"</item>
+    <item msgid="1165623660533024666">"запуск в фоновом режиме"</item>
+    <item msgid="6423861043647911030">"громкость подсказок"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Определение местоположения"</item>
+    <item msgid="6656077694190491067">"Определение местоположения"</item>
+    <item msgid="8790228218278477369">"Определение местоположения"</item>
+    <item msgid="7836406246005211990">"Вибросигнал"</item>
+    <item msgid="3951439024549922598">"Считывать данные контактов"</item>
+    <item msgid="8802152411647068">"Изменение контактов"</item>
+    <item msgid="229544934599698735">"Просмотр списка вызовов"</item>
+    <item msgid="7396102294405899613">"Изменение списка вызовов"</item>
+    <item msgid="3597797992398484655">"Считывать данные календаря"</item>
+    <item msgid="2705975774250907343">"Изменение календаря"</item>
+    <item msgid="4668747371441932697">"Определение местоположения"</item>
+    <item msgid="1487578921720243646">"Разместить уведомление"</item>
+    <item msgid="4636080349724146638">"Местоположение"</item>
+    <item msgid="673510900286463926">"Позвонить"</item>
+    <item msgid="542083422784609790">"Чтение SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Запись SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Получение SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Получение SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Получение SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Получение SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Отправка SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Чтение SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Запись SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Изменение настроек"</item>
+    <item msgid="8705854389991425629">"Отображать поверх других элементов"</item>
+    <item msgid="5861356020344153651">"Доступ к уведомлениям"</item>
+    <item msgid="78432174621628659">"Камера"</item>
+    <item msgid="3986116419882154794">"Записать аудио"</item>
+    <item msgid="4516840825756409490">"Воспроизвести аудио"</item>
+    <item msgid="6811712502798183957">"Считать из буфера обмена"</item>
+    <item msgid="2780369012602289114">"Изменить буфер обмена"</item>
+    <item msgid="2331359440170850868">"Кнопки мультимедиа"</item>
+    <item msgid="6133599737122751231">"Аудиофокус"</item>
+    <item msgid="6844485713404805301">"Общая громкость"</item>
+    <item msgid="1600379420669104929">"Громкость голоса"</item>
+    <item msgid="6296768210470214866">"Рингтон"</item>
+    <item msgid="510690696071629241">"Музыка, видео, игры"</item>
+    <item msgid="406861638631430109">"Будильник"</item>
+    <item msgid="4715864795872233884">"Громкость уведомлений"</item>
+    <item msgid="2311478519251301183">"Громкость Bluetooth-устройств"</item>
+    <item msgid="5133991377896747027">"Акт. режим"</item>
+    <item msgid="2464189519136248621">"Местоположение"</item>
+    <item msgid="2062677934050803037">"Местоположение"</item>
+    <item msgid="1735171933192715957">"Посмотреть статистику использования"</item>
+    <item msgid="1014093788778383554">"Включить/отключить микрофон"</item>
+    <item msgid="4199297950608622850">"Показ оповещения"</item>
+    <item msgid="2527962435313398821">"Трансляция контента"</item>
+    <item msgid="5117506254221861929">"Активация VPN"</item>
+    <item msgid="8291198322681891160">"Сохранение обоев"</item>
+    <item msgid="7106921284621230961">"Вспомогательная структура"</item>
+    <item msgid="4496533640894624799">"Вспомогательный скриншот"</item>
+    <item msgid="2598847264853993611">"Чтение состояния телефона"</item>
+    <item msgid="9215610846802973353">"Добавление голосовой почты"</item>
+    <item msgid="9186411956086478261">"Использование SIP"</item>
+    <item msgid="6884763100104539558">"Обработка исходящих вызовов"</item>
+    <item msgid="125513972170580692">"Отпечатки пальцев"</item>
+    <item msgid="2556071024281275619">"Нательные датчики"</item>
+    <item msgid="617168514928339387">"Чтение сообщений системы оповещения населения"</item>
+    <item msgid="7134693570516523585">"Подмена геоданных"</item>
+    <item msgid="7224489175375229399">"Чтение из хранилища"</item>
+    <item msgid="8472735063903258202">"Запись в хранилище"</item>
+    <item msgid="4069276819909595110">"Включение экрана"</item>
+    <item msgid="1228338896751121025">"Получение данных об аккаунтах"</item>
+    <item msgid="3181581793459233672">"Запуск в фоновом режиме"</item>
+    <item msgid="2340936043025374076">"Громкость подсказок"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Небольшая"</item>
+    <item msgid="4816511817309094890">"Средняя"</item>
+    <item msgid="8305084671259331134">"Большая"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"По умолчанию"</item>
+    <item msgid="4147246073737933622">"Без засечек"</item>
+    <item msgid="3117680749167407907">"Без засечек, сжатый"</item>
+    <item msgid="6529379119163117545">"Без засечек, моноширинный"</item>
+    <item msgid="1487203730637617924">"С засечками"</item>
+    <item msgid="4937790671987480464">"C засечками, моноширинный"</item>
+    <item msgid="4448481989108928248">"Обычный"</item>
+    <item msgid="4627069151979553527">"Курсив"</item>
+    <item msgid="6896773537705206194">"Капитель"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Очень мелкий"</item>
+    <item msgid="5091603983404027034">"Мелкий"</item>
+    <item msgid="176844712416932112">"Средний"</item>
+    <item msgid="2784236342175159295">"Крупный"</item>
+    <item msgid="218913203203160606">"Очень крупный"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"По умолчанию"</item>
+    <item msgid="6488643537808152001">"Нет сетей"</item>
+    <item msgid="552332815156010137">"Контур"</item>
+    <item msgid="7187891159463789272">"С тенью"</item>
+    <item msgid="8019330250538856521">"Приподнятый"</item>
+    <item msgid="8987385315647049787">"Утопленный"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"По умолчанию"</item>
+    <item msgid="8611890312638868524">"Белый на черном"</item>
+    <item msgid="5891360837786277638">"Черный на белом"</item>
+    <item msgid="2798457065945456853">"Желтый на черном"</item>
+    <item msgid="5799049811524553967">"Желтый на синем"</item>
+    <item msgid="3673930830658169860">"Пользовательские"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN-подключение по протоколу PPTP"</item>
+    <item msgid="1349760781118368659">"VPN-соединение по протоколу L2TP/IPSec с общими ключами"</item>
+    <item msgid="6128519070545038358">"VPN-подключение по протоколу L2TP/IPSec с использованием сертификатов"</item>
+    <item msgid="312397853907741968">"VPN-подключение IPSec с общими ключами и аутентификацией Xauth"</item>
+    <item msgid="3319427315593649917">"VPN-подключение IPSec с использованием сертификатов и аутентификации Xauth"</item>
+    <item msgid="8258927774145391041">"VPN-подключение IPSec с использованием сертификатов и комбинированной аутентификации"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Отменить выбор"</item>
+    <item msgid="1157046369795346308">"Руководство"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Нет подключения"</item>
+    <item msgid="8754480102834556765">"Инициализация..."</item>
+    <item msgid="3351334355574270250">"Подключение..."</item>
+    <item msgid="8303882153995748352">"Подключено"</item>
+    <item msgid="9135049670787351881">"Тайм-аут"</item>
+    <item msgid="2124868417182583926">"Сбой"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Спрашивать"</item>
+    <item msgid="7718817231348607934">"Не разрешать"</item>
+    <item msgid="8184570120217958741">"Разрешать всегда"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Стабильное"</item>
+    <item msgid="167418068739176448">"Наиболее частое действие"</item>
+    <item msgid="4760813290195199773">"Важное (активный режим)"</item>
+    <item msgid="2328684826817647595">"Важное (фоновый режим)"</item>
+    <item msgid="7746406490652867365">"Резервное копирование"</item>
+    <item msgid="5597404364389196754">"Большой объем данных"</item>
+    <item msgid="1290888779300174556">"Служба (работает)"</item>
+    <item msgid="7241098542073939046">"Служба (перезапуск)"</item>
+    <item msgid="6610439017684111046">"Получатель"</item>
+    <item msgid="7367606086319921117">"Главная"</item>
+    <item msgid="3344660712396741826">"Последнее действие"</item>
+    <item msgid="5006559348883303865">"Кешировано (действие)"</item>
+    <item msgid="8633480732468137525">"Кешировано (клиент)"</item>
+    <item msgid="6248998242443333892">"Кешировано (пусто)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Сине-зеленый"</item>
+    <item msgid="3228505970082457852">"Синий"</item>
+    <item msgid="6590260735734795647">"Индиго"</item>
+    <item msgid="3521763377357218577">"Фиолетовый"</item>
+    <item msgid="5932337981182999919">"Розовый"</item>
+    <item msgid="5642914536624000094">"Красный"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Добавленные более 30 дней назад"</item>
+    <item msgid="8699273238891265610">"Добавленные более 60 дней назад"</item>
+    <item msgid="8346279419423837266">"Добавленные более 90 дней назад"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Определять автоматически"</item>
+    <item msgid="773943026484148895">"С тарификацией"</item>
+    <item msgid="1008268820118852416">"Без тарификации"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Случайный MAC-адрес (по умолчанию)"</item>
+    <item msgid="214234417308375326">"Использовать MAC-адрес устройства"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Нет"</item>
+    <item msgid="1930581185557754880">"Да"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Темная"</item>
+    <item msgid="5079453644557603349">"Светлая"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Отключено"</item>
+    <item msgid="4072198137051566919">"Сведения об отладке"</item>
+    <item msgid="2473005316958868509">"Подробная информация"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Только домашние сети"</item>
+    <item msgid="1161026694891024702">"Автоматически"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA (предпочтительный режим)"</item>
+    <item msgid="7581481130337402578">"Только GSM"</item>
+    <item msgid="8579197487913425819">"Только WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA (авторежим)"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo (авторежим)"</item>
+    <item msgid="4219607161971472471">"CDMA без EvDo"</item>
+    <item msgid="7278975240951052041">"Только EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA и LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Весь мир"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Только TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Весь мир"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ru/strings.xml b/tests/CarDeveloperOptions/res/values-ru/strings.xml
index 7f3df1e..817026d 100644
--- a/tests/CarDeveloperOptions/res/values-ru/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ru/strings.xml
@@ -120,7 +120,7 @@
     <string name="bluetooth_is_visible_message" msgid="6341088682252805612">"Устройства поблизости могут обнаружить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, пока открыты настройки Bluetooth."</string>
     <string name="bluetooth_footer_mac_message" product="default" msgid="335341476746836260">"Bluetooth-адрес телефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_footer_mac_message" product="tablet" msgid="6033609611245782463">"Адрес Bluetooth для планшета: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_footer_mac_message" product="device" msgid="7639919867088358038">"Адрес Bluetooth для устройства: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_footer_mac_message" product="device" msgid="7639919867088358038">"Адрес Bluetooth: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_disconnect_question" msgid="6180709281434591654">"Отключить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="8926408584599563760">"Передача данных"</string>
     <string name="bluetooth_device" msgid="3170974107364990008">"Bluetooth-устройство без названия"</string>
@@ -128,7 +128,7 @@
     <string name="bluetooth_no_devices_found" msgid="4396050022213494322">"Устройства Bluetooth не найдены."</string>
     <string name="bluetooth_notif_ticker" msgid="8398481099943141819">"Запрос подключения Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="5090288898529286011">"Запрос подключения"</string>
-    <string name="bluetooth_notif_message" msgid="6612367890895077938">"Нажмите, чтобы установить соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_notif_message" msgid="6612367890895077938">"Нажмите, чтобы подключить устройство \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_show_received_files" msgid="5060846395852236652">"Полученные файлы"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="1699095577431389560">"Файлы, полученные по Bluetooth"</string>
     <string name="device_picker" msgid="8345264486071697705">"Выбрать устройство Bluetooth"</string>
@@ -353,13 +353,13 @@
     <string name="time_picker_title" msgid="1596400307061268660">"Время"</string>
     <string name="lock_after_timeout" msgid="7755520959071097304">"Автоблокировка"</string>
     <string name="lock_after_timeout_summary" msgid="3160517585613694740">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Сразу после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"Сразу после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии функцией <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"Показывать данные о владельце на экране блокировки"</string>
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Текст на экране"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Включить виджеты"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Отключено администратором"</string>
-    <string name="lockdown_settings_title" msgid="4534779922580115990">"Добавить функцию блокировки входа"</string>
+    <string name="lockdown_settings_title" msgid="4534779922580115990">"Добавить кнопку блокировки"</string>
     <string name="lockdown_settings_summary" msgid="7270756909878256174">"Добавить в меню кнопки питания функцию, которая позволяет отключить Smart Lock, разблокировку по отпечатку пальца и уведомления на заблокированном экране"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Агенты доверия откладывают блокировку"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Если параметр включен, агенты доверия могут увеличивать время, в течение которого устройство остается разблокированным, но не могут разблокировать его"</string>
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Для настройки функции \"Распознавание лиц\" необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи планшета. Чтобы включить блокировку, нажмите \"Отмена\" и установите PIN-код или выберите другой способ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Для настройки сканера отпечатков пальцев необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи устройства. Чтобы включить блокировку, нажмите \"Отмена\" и установите PIN-код или выберите другой способ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Для настройки сканера отпечатков пальцев необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи телефона. Чтобы включить блокировку, нажмите \"Отмена\" и установите PIN-код или выберите другой способ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Не устанавливать PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Не устанавливать пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Не устанавливать графический ключ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Настроить блокировку экрана"</string>
@@ -760,7 +759,7 @@
     <string name="bluetooth_settings" msgid="5228032727293770389">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="7261244857456521825">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="1221689092429277887">"Настройка подключений, видимости и имени устройства"</string>
-    <string name="bluetooth_pairing_request" msgid="7221745525632573125">"Добавить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_pairing_request" msgid="7221745525632573125">"Подключить устройство \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1139230917419961975">"Код подключения Bluetooth"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6205151011298670207">"Введите код подключения и нажмите клавишу ввода"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="9138308197078115672">"PIN-код содержит буквы или символы"</string>
@@ -801,7 +800,7 @@
     <string name="ble_scan_notify_text" msgid="6290170236546386932">"Чтобы точнее определять местоположение, системные приложения и сервисы продолжат искать находящиеся поблизости Bluetooth-устройства. Вы можете отключить эту функцию в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках сканирования<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_failed" msgid="1151234676456333786">"Ошибка подключения. Повторите попытку."</string>
     <string name="device_details_title" msgid="726517818032923222">"Об устройстве"</string>
-    <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Адрес Bluetooth для устройства: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_mac_address" msgid="5328203122581150405">"Адрес Bluetooth: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="3669848977755142047">"Прервать соединение?"</string>
     <string name="bluetooth_unpair_dialog_body" product="default" msgid="5998071227980078077">"Соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" будет прервано."</string>
     <string name="bluetooth_unpair_dialog_body" product="tablet" msgid="4696157463230518866">"Соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" будет прервано."</string>
@@ -1111,7 +1110,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="4081852770996455902">"Настройка точки доступа Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="1000003286253019522">"Настройка точки доступа Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="2303120188509955656">"Точка доступа AndroidAP WPA2 PSK"</string>
-    <string name="wifi_tether_configure_ssid_default" msgid="1722238925876152663">"Хот-спот Android"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="1722238925876152663">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="626821542308601806">"Звонки по Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="1402265373543523970">"Звонки по Wi-Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="198402175473169630">"Звоните по Wi-Fi, когда нет сигнала сотовой связи."</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобильный Интернет"</item>
+    <item msgid="6007360612667098926">"Только Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1612,7 +1614,7 @@
     <string name="reset_network_complete_toast" msgid="128225929536005495">"Сетевые настройки сброшены"</string>
     <string name="reset_esim_error_title" msgid="4728931209471875632">"Не удалось стереть данные SIM-карт"</string>
     <string name="reset_esim_error_msg" msgid="4716366079119742235">"Не удалось стереть данные скачанных SIM-карт из-за ошибки.\n\nПерезагрузите устройство и повторите попытку."</string>
-    <string name="master_clear_title" msgid="1560712943955904673">"Удалить все данные (сброс к заводским настройкам)"</string>
+    <string name="master_clear_title" msgid="1560712943955904673">"Стереть данные (к заводским настройкам)"</string>
     <string name="master_clear_short_title" msgid="919098101581335101">"Удалить все данные"</string>
     <string name="master_clear_desc" product="tablet" msgid="3432373610755760899">"Будут удалены все данные из "<b>"внутренней памяти"</b>" планшета, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Установленные приложения"</li></string>
     <string name="master_clear_desc" product="default" msgid="8765543541962866697">"Будут удалены все данные из "<b>"внутренней памяти"</b>" телефона, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Установленные приложения"</li></string>
@@ -1654,7 +1656,7 @@
     <string name="usb_tethering_subtext" product="tablet" msgid="154536000235361034">"Открыть доступ к интернет-подключению планшета через USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="7257293066139372774">"Bluetooth-модем"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="6868756914621131635">"Открыть доступ к интернет-подключению планшета по Bluetooth"</string>
-    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Открыть доступ к интернет-подключению телефона по Bluetooth"</string>
+    <string name="bluetooth_tethering_subtext" product="default" msgid="9167912297565425178">"Открыть доступ к интернет-подключению телефона через Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="3981528184780083266">"Доступ к интернет-подключению устройства \"<xliff:g id="DEVICE_NAME">%1$d</xliff:g>\" по Bluetooth открыт"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6946561351369376943">"Макс. число подключаемых устройств: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5428300773782256084">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
@@ -1799,7 +1801,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="5338893138982642228">"Показывать графический ключ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="3203621862806531947">"Виброотклик"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5890335732200257777">"Блокир. кнопкой питания"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="1279989004145567840">"Если экран не поддерживается в разблокированном состоянии функцией <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="9042142745571386381">"Установить ключ"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1456643060737114885">"Изменить ключ"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="6037403647312543908">"Как начертить графический ключ разблокировки"</string>
@@ -2098,7 +2100,7 @@
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Быстрое включение сервиса"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Разрешить на заблокированном экране"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Чтобы использовать функцию специальных возможностей, когда она включена, нажмите и удерживайте обе кнопки регулировки громкости в течение трех секунд."</string>
-    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Высококонтрастный текст"</string>
+    <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Контрастный текст"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Сохранять масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"Сохранять масштаб при переходе между приложениями"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Кн. питания завершает вызов"</string>
@@ -2554,8 +2556,8 @@
     <string name="menu_duration_6h" msgid="6169009210638008417">"6 часов"</string>
     <string name="menu_duration_12h" msgid="1435242738163843797">"12 часов"</string>
     <string name="menu_duration_1d" msgid="6476370834372352174">"1 день"</string>
-    <string name="menu_show_system" msgid="6315865548558708248">"Показать системные процессы"</string>
-    <string name="menu_hide_system" msgid="8457027118873733782">"Скрыть системные процессы"</string>
+    <string name="menu_show_system" msgid="6315865548558708248">"Показать сист. процессы"</string>
+    <string name="menu_hide_system" msgid="8457027118873733782">"Скрыть сист. процессы"</string>
     <string name="menu_show_percentage" msgid="6983272380729890884">"Показать в процентах"</string>
     <string name="menu_use_uss" msgid="3765054705208926803">"Использовать USS"</string>
     <string name="menu_proc_stats_type" msgid="2680179749566186247">"Тип статистических данных"</string>
@@ -3125,7 +3127,7 @@
     <string name="keywords_wifi_notify_open_networks" msgid="1031260564121854773">"Уведомления о Wi‑Fi, уведомления о wifi"</string>
     <string name="keywords_auto_brightness" msgid="5007188989783072428">"Автоматическая регулировка яркости"</string>
     <string name="keywords_vibrate_on_touch" msgid="3615173661462446877">"Вибрация, нажатие, клавиатура"</string>
-    <string name="keywords_time_format" msgid="8265826377023617424">"Использовать 24-часовой формат"</string>
+    <string name="keywords_time_format" msgid="8265826377023617424">"24-часовой формат"</string>
     <string name="keywords_storage_files" msgid="1995055540202216399">"Скачивание"</string>
     <string name="keywords_app_default" msgid="1265502485415708667">"Открыть с помощью"</string>
     <string name="keywords_applications_settings" msgid="2078776051110952597">"Приложения"</string>
@@ -3178,7 +3180,7 @@
     <string name="keywords_android_version" msgid="4842749998088987740">"обновление системы безопасности, прошивка модуля связи, версия ядра"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"тема, светлая, тёмная, режим"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"финансовое приложение, sms, разрешение"</string>
-    <string name="keywords_systemui_theme" msgid="9150908170417305866">"темная тема"</string>
+    <string name="keywords_systemui_theme" msgid="9150908170417305866">"тёмная тема"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"ошибка"</string>
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"Автоматическое включение экрана, заблокированный экран"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"уведомление на экране блокировки, уведомления"</string>
@@ -4202,7 +4204,7 @@
     <string name="dark_ui_mode" msgid="703844190192599217">"Тема"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"Выберите тему"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"Эта настройка также применяется к приложениям."</string>
-    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Приложения, которые поддерживают эту функцию, также перейдут в ночной режим."</string>
+    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"Приложения, которые поддерживают эту функцию, также переключатся на тёмную тему."</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"Элементы в быстрых настройках"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Трассировка Winscope"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"Датчики отключены"</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Она замедляет работу телефона."</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Полные измерения GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Отслеживать все группировки GNSS и частоты без рабочего цикла"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Данные отладки при переключении пользователей"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Показывать детализированные данные отладки во время переключения пользователей"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Разрешить запуск компонентов в фоновом режиме"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Разрешен запуск всех компонентов в фоновом режиме"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Всегда показывать сообщение об ошибке"</string>
diff --git a/tests/CarDeveloperOptions/res/values-si-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-si-nokeys/strings.xml
new file mode 100644
index 0000000..24c66cb
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-si-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"යෙදුම් කළමනාකරණය කරන්න"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-si/arrays.xml b/tests/CarDeveloperOptions/res/values-si/arrays.xml
new file mode 100644
index 0000000..e348b4c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-si/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"ඇමරිකාව"</item>
+    <item msgid="4791956477275129121">"යුරෝපය"</item>
+    <item msgid="3812126832016254559">"අප්‍රිකාව"</item>
+    <item msgid="2765816300353408280">"ආසියාව"</item>
+    <item msgid="6683489385344409742">"ඕස්ට්‍රේලියාව"</item>
+    <item msgid="5194868215515664953">"පැසිෆික්"</item>
+    <item msgid="7044520255415007865">"සියලු"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"තත්පර 15"</item>
+    <item msgid="772029947136115322">"තත්පර 30"</item>
+    <item msgid="8743663928349474087">"මිනිත්තු 1"</item>
+    <item msgid="1506508631223164814">"මිනිත්තු 2"</item>
+    <item msgid="8664703938127907662">"මිනිත්තු 5"</item>
+    <item msgid="5827960506924849753">"මිනිත්තු 10"</item>
+    <item msgid="6677424950124253938">"මිනිත්තු 30"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"කවදාවත් නෑ"</item>
+    <item msgid="2517785806387977252">"තත්පර 15"</item>
+    <item msgid="6347954399441173672">"තත්පර 30"</item>
+    <item msgid="4858305253279921789">"මිනිත්තු 1"</item>
+    <item msgid="8109273437140044073">"මිනිත්තු 2"</item>
+    <item msgid="2788593551142462622">"මිනිත්තු 5"</item>
+    <item msgid="8012672183888404961">"මිනිත්තු 10"</item>
+    <item msgid="8271452751594598661">"මිනිත්තු 30"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"වහාම"</item>
+    <item msgid="2038544972632026612">"තත්පර 5"</item>
+    <item msgid="5558060663472279597">"තත්පර 15"</item>
+    <item msgid="45341168505452037">"තත්පර 30"</item>
+    <item msgid="227647485917789272">"මිනිත්තු 1"</item>
+    <item msgid="3367011891231217504">"මිනිත්තු 2"</item>
+    <item msgid="4376575879222393045">"මිනිත්තු 5"</item>
+    <item msgid="811192536981678974">"මිනිත්තු 10"</item>
+    <item msgid="7258394417241706272">"මිනිත්තු 30"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"කුඩා"</item>
+    <item msgid="591935967183159581">"පෙරනිමි"</item>
+    <item msgid="1714184661981538355">"විශාල"</item>
+    <item msgid="6195563047686707484">"විශාලතම"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"පරිලෝකනය කරමින්…"</item>
+    <item msgid="5597394826455877834">"සම්බන්ධ වෙමින්…"</item>
+    <item msgid="5848277343965362748">"සත්‍යාපනය වෙමින්…"</item>
+    <item msgid="3391238031431440676">"IP ලිපිනය ලබාගනිමින්…"</item>
+    <item msgid="5257597310494000224">"සම්බන්ධයි"</item>
+    <item msgid="8472497592913050396">"තහනම් කරන ලදී"</item>
+    <item msgid="1228072488815999109">"විසන්ධි වෙමින්…"</item>
+    <item msgid="7253087004422991731">"විසන්ධි වුණි"</item>
+    <item msgid="4169850917304751227">"අසාර්ථකයි"</item>
+    <item msgid="6266658166690831131">"අවහිර කරන ලදි"</item>
+    <item msgid="4517230805854909775">"දුර්වල සම්බන්ධතාවය තාවකාලිකව මඟහරිමින්"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"පරිලෝකනය කරමින්…"</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සම්බන්ධ වෙමින්…"</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> සමග සත්‍යාපනය කරමින්…"</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙතින් IP ලිපිනය ලබා ගනිමින්..."</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සම්බන්ධ වුණි"</item>
+    <item msgid="6600156231416890902">"තහනම් කරන ලදී"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙතින් විසන්ධි වෙමින්…"</item>
+    <item msgid="3980154971187953257">"විසන්ධි වුණි"</item>
+    <item msgid="2847316776634969068">"අසාර්ථකයි"</item>
+    <item msgid="4390990424746035383">"අවහිර කරන ලදි"</item>
+    <item msgid="3618248791367063949">"දුර්වල සම්බන්ධතාවය තාවකාලිකව මඟහරිමින්"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"ඔබන බොත්තම"</item>
+    <item msgid="7401896200768713930">"සමයන්ගේ උපාංග වෙතින් PIN"</item>
+    <item msgid="4526848028011846710">"මෙම උපකරණයේ සිට PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"සම්බන්ධයි"</item>
+    <item msgid="983792611851499732">"ආරාධිත"</item>
+    <item msgid="5438273405428201793">"අසාර්ථකයි"</item>
+    <item msgid="4646663015449312554">"ලද හැක"</item>
+    <item msgid="3230556734162006146">"සීමාවෙන් පිටත"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"මිනිත්තු 2"</item>
+    <item msgid="2759776603549270587">"මිනිත්තු 5"</item>
+    <item msgid="167772676068860015">"1 පැයක්"</item>
+    <item msgid="5985477119043628504">"කිසිවිටෙක කල් ඉකුත් නොවන්න"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"පද්ධති පෙරනිමිය භාවිත කරන්න: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"දුර්වල"</item>
+    <item msgid="7882129634982603782">"දුර්වල"</item>
+    <item msgid="6457357501905996224">"සතුටුදායක"</item>
+    <item msgid="405271628162918841">"හොඳ"</item>
+    <item msgid="999948812884919584">"ඉතා හොඳ"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"අවසන් දින 30"</item>
+    <item msgid="3211287705232736964">"භාවිත කිරීමේ කවය සකසන්න..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"භාවිත කාලය"</item>
+    <item msgid="2784401352592276015">"අවසන් වරට භාවිත කළේ"</item>
+    <item msgid="249854287216326349">"යෙදුමේ නම"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"කිසිවක් නැත"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"කිසිවක් නැත"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"කිසිවක් නැත"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"ස්ථිතික"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"කිසිවක් නැත"</item>
+    <item msgid="1464741437353223198">"අත්පොත"</item>
+    <item msgid="5793600062487886090">"ප්‍රොක්සිය ස්වයංක්‍රීය-වින්‍යාසය"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"කිසිවක් නැත"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP හෝ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"සඳහන් නොකළ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"කිසිවක් නැත"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"අභ්‍යන්තර උපාංග ආචයනය"</item>
+    <item msgid="3186681694079967527">"ඉවත් කළ හැකි SD කාඩ් පත"</item>
+    <item msgid="6902033473986647035">"තීරණය කිරීමට පද්ධතියට ඉඩ දෙන්න"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ස්ථානය"</item>
+    <item msgid="6842381562497597649">"පෞද්ගලික"</item>
+    <item msgid="3966700236695683444">"පණිවිඩ යැවීම"</item>
+    <item msgid="8563996233342430477">"මාධ්‍ය"</item>
+    <item msgid="5323851085993963783">"උපාංගය"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"දළ ස්ථානය"</item>
+    <item msgid="1830619568689922920">"බොහෝ නිවැරදි ස්ථානය"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"කම්පනය"</item>
+    <item msgid="8632513128515114092">"සම්බන්ධතා කියවන්න"</item>
+    <item msgid="3741042113569620272">"සම්බන්ධතා වෙනස් කරන්න"</item>
+    <item msgid="4204420969709009931">"ඇමතුම් ලොගය කියවන්න"</item>
+    <item msgid="2260380357119423209">"ඇමතුම් ලොගය වෙනස් කරන්න"</item>
+    <item msgid="6550710385014530934">"දින දසුන කියවන්න"</item>
+    <item msgid="3575906174264853951">"දින දර්ශනය වෙනස් කරන්න"</item>
+    <item msgid="4319843242568057174">"wi-fi පරිලෝකනය"</item>
+    <item msgid="2981791890467303819">"දැනුම්දීම"</item>
+    <item msgid="6617825156152476692">"කොටු පරිලෝකනය"</item>
+    <item msgid="8865260890611559753">"දුරකතනය අමතන්න"</item>
+    <item msgid="3254999273961542982">"SMS කියවන්න"</item>
+    <item msgid="7711446453028825171">"SMS ලියන්න"</item>
+    <item msgid="6123238544099198034">"SMS ලබන්න"</item>
+    <item msgid="838342167431596036">"හදිසි SMS ලබාගන්න"</item>
+    <item msgid="8554432731560956686">"MMS ලබන්න"</item>
+    <item msgid="7464863464299515059">"WAP තල්ලු කිරීම ලැබීම"</item>
+    <item msgid="310463075729606765">"SMS යවන්න"</item>
+    <item msgid="7338021933527689514">"ICC SMS කියවන්න"</item>
+    <item msgid="6130369335466613036">"ICC SMS ලියන්න"</item>
+    <item msgid="6536865581421670942">"සැකසුම් වෙනස් කරන්න"</item>
+    <item msgid="4547203129183558973">"ඉහළින් අඳින්න"</item>
+    <item msgid="9080347512916542840">"ප්‍රවේශ දැනුම්දීම්"</item>
+    <item msgid="5332718516635907742">"කැමරාව"</item>
+    <item msgid="6098422447246167852">"ශබ්ද පටිගත කරන්න"</item>
+    <item msgid="9182794235292595296">"ශ්‍රව්‍ය ධාවනය කරන්න"</item>
+    <item msgid="8760743229597702019">"පසුරු පුවරුව කියවන්න"</item>
+    <item msgid="2266923698240538544">"පසුරු පුවරුව වෙනස් කරන්න"</item>
+    <item msgid="1801619438618539275">"මාධ්‍ය බොත්තම"</item>
+    <item msgid="31588119965784465">"ශ්‍රව්‍ය අවධානය"</item>
+    <item msgid="7565226799008076833">"උසස් ශබ්දය"</item>
+    <item msgid="5420704980305018295">"හඬ ශබ්දය"</item>
+    <item msgid="5797363115508970204">"නාද ශබ්දය"</item>
+    <item msgid="8233154098550715999">"මාධ්‍ය ශබ්දය"</item>
+    <item msgid="5196715605078153950">"සීනුවේ ශබ්දය"</item>
+    <item msgid="394030698764284577">"දැනුම්දීමේ ශබ්දය"</item>
+    <item msgid="8952898972491680178">"බ්ලූටූත් ශබ්දය"</item>
+    <item msgid="8506227454543690851">"අවදිව සිටින්න"</item>
+    <item msgid="1108160036049727420">"නිරීක්ෂණ ස්ථානය"</item>
+    <item msgid="1496205959751719491">"වැඩි බල ස්ථානය නිරීක්ෂණය"</item>
+    <item msgid="3776296279910987380">"භාවිත කිරීමේ තත්ත්ව ලබාගන්න"</item>
+    <item msgid="8827100324471975602">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
+    <item msgid="6880736730520126864">"ටෝස්ට් පෙන්වීම"</item>
+    <item msgid="4933375960222609935">"මාධ්‍ය ව්‍යාපෘතිය"</item>
+    <item msgid="8357907018938895462">"VPN සක්‍රිය කරන්න"</item>
+    <item msgid="8143812849911310973">"වෝල්පේපරය ලියන්න"</item>
+    <item msgid="6266277260961066535">"ව්‍යුහයට සහාය"</item>
+    <item msgid="7715498149883482300">"තිර රුවට සහාය"</item>
+    <item msgid="4046679376726313293">"දුරකථන තත්ත්වය කියවීම"</item>
+    <item msgid="6329507266039719587">"හඬ තැපෑල එක් කිරීම"</item>
+    <item msgid="7692440726415391408">"SIP භාවිතය"</item>
+    <item msgid="8572453398128326267">"පිටතට යන ඇමතුම් ක්‍රියාවලිය"</item>
+    <item msgid="7775674394089376306">"ඇඟිලි සලකුණ"</item>
+    <item msgid="3182815133441738779">"ශරීර සංවේදක"</item>
+    <item msgid="2793100005496829513">"සෙල් විකාශන කියවීම"</item>
+    <item msgid="2633626056029384366">"ව්‍යාජ ස්ථාන"</item>
+    <item msgid="8356842191824684631">"ගබඩාව කියවීම"</item>
+    <item msgid="5671906070163291500">"ගබඩාව ලිවීම"</item>
+    <item msgid="2791955098549340418">"තිරය ක්‍රියාත්මක කිරීම"</item>
+    <item msgid="5599435119609178367">"ගිණුම් ලබා ගැනීම"</item>
+    <item msgid="1165623660533024666">"පසුබිමෙහි ධාවනය"</item>
+    <item msgid="6423861043647911030">"ප්‍රවේශ්‍යතා හඬ පරිමාව"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"කොට"</item>
+    <item msgid="4816511817309094890">"මධ්‍යම"</item>
+    <item msgid="8305084671259331134">"දීර්ඝ"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"පෙරනිමි"</item>
+    <item msgid="4147246073737933622">"සෑන්ස්-සේරිෆ්"</item>
+    <item msgid="3117680749167407907">"සෑන්ස්-සේරිෆ් කන්ඩෙන්ස්ඩ්"</item>
+    <item msgid="6529379119163117545">"සැන්ස්-සේරිෆ් මොනෝස්පේස්"</item>
+    <item msgid="1487203730637617924">"සේරිෆ්"</item>
+    <item msgid="4937790671987480464">"සේරිෆ් මොනෝස්පේස්"</item>
+    <item msgid="4448481989108928248">"සාමාන්‍ය"</item>
+    <item msgid="4627069151979553527">"බැඳි අකුරුමය"</item>
+    <item msgid="6896773537705206194">"කුඩා ලොකු අකුරු"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"ඉතා කුඩා"</item>
+    <item msgid="5091603983404027034">"කුඩා"</item>
+    <item msgid="176844712416932112">"සාමාන්‍ය"</item>
+    <item msgid="2784236342175159295">"විශාල"</item>
+    <item msgid="218913203203160606">"ඉතා විශාල"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"පෙරනිමි"</item>
+    <item msgid="6488643537808152001">"කිසිවක් නැත"</item>
+    <item msgid="552332815156010137">"පිට මායිම"</item>
+    <item msgid="7187891159463789272">"පතිත ඡායාව"</item>
+    <item msgid="8019330250538856521">"නංවන ලද"</item>
+    <item msgid="8987385315647049787">"අවපාත කරන ලද"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"යෙදුම් වල සුපුරුද්ද භාවිතා කරන්න"</item>
+    <item msgid="8611890312638868524">"කළු මත සුදු"</item>
+    <item msgid="5891360837786277638">"සුදු මත කළු"</item>
+    <item msgid="2798457065945456853">"කළු මත කහ"</item>
+    <item msgid="5799049811524553967">"නිල් මත කහ"</item>
+    <item msgid="3673930830658169860">"අභිරුචි"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"පෙර බෙදාගත් යතුරු සමඟ L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN සමඟ සහතික"</item>
+    <item msgid="312397853907741968">"Xauth සත්‍යාපනය සහ පෙර බෙදාගත් යතුරු සමඟ IPSec VPN"</item>
+    <item msgid="3319427315593649917">"සහතික සහ Xauth සත්‍යාපනය සමග IPSec VPN"</item>
+    <item msgid="8258927774145391041">"IPSec VPN සමඟ සහතික සහ දෙමුහුන් සත්‍යාපනය"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"කිසිවක් නැත"</item>
+    <item msgid="1157046369795346308">"අත්පොත"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"විසන්ධි වුණි"</item>
+    <item msgid="8754480102834556765">"මුල පුරමින්…"</item>
+    <item msgid="3351334355574270250">"සම්බන්ධ වෙමින්…"</item>
+    <item msgid="8303882153995748352">"සම්බන්ධයි"</item>
+    <item msgid="9135049670787351881">"කල් ඉකුත්වීම"</item>
+    <item msgid="2124868417182583926">"අසාර්ථකයි"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"විමසන්න"</item>
+    <item msgid="7718817231348607934">"කිසිවිටෙකත් අවසර නොදෙන්න"</item>
+    <item msgid="8184570120217958741">"සැමවිටම ඉඩ දෙන්න"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ස්ථාවර"</item>
+    <item msgid="167418068739176448">"උඩම ක්‍රියාකාරකම"</item>
+    <item msgid="4760813290195199773">"වැදගත් (පෙරබිම)"</item>
+    <item msgid="2328684826817647595">"වැදගත් (පසුබිම)"</item>
+    <item msgid="7746406490652867365">"උපස්ථය"</item>
+    <item msgid="5597404364389196754">"වැඩි බර"</item>
+    <item msgid="1290888779300174556">"සේවාව (ධාවනය වන)"</item>
+    <item msgid="7241098542073939046">"සේවාව (නැවත පටන් ගැනෙන)"</item>
+    <item msgid="6610439017684111046">"ග්‍රාහකය"</item>
+    <item msgid="7367606086319921117">"මුල් පිටුව"</item>
+    <item msgid="3344660712396741826">"අවසන් ක්‍රියාකාරකම"</item>
+    <item msgid="5006559348883303865">"හැඹිලි ගත කළ (ක්‍රියාකාරකම)"</item>
+    <item msgid="8633480732468137525">"හැඹිලි ගත කළ (ක්‍රියාකාරකම් සේවාලාභියා)"</item>
+    <item msgid="6248998242443333892">"හැඹිලි ගත කළ (හිස්)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"සේරා"</item>
+    <item msgid="3228505970082457852">"නිල්"</item>
+    <item msgid="6590260735734795647">"ඉන්ඩිගෝ"</item>
+    <item msgid="3521763377357218577">"දම්"</item>
+    <item msgid="5932337981182999919">"රෝස"</item>
+    <item msgid="5642914536624000094">"රතු"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"දින 30කට වඩා පැරණි"</item>
+    <item msgid="8699273238891265610">"දින 60කට වඩා පැරණි"</item>
+    <item msgid="8346279419423837266">"දින 90කට වඩා පැරණි"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ස්වයංක්‍රීයව හඳුනා ගන්න"</item>
+    <item msgid="773943026484148895">"මනින ලද ලෙස සලකන්න"</item>
+    <item msgid="1008268820118852416">"නොමනින ලද ලෙස සලකන්න"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"අහඹු කළ MAC භාවිත කරන්න (පෙරනිමි)"</item>
+    <item msgid="214234417308375326">"උපාංග MAC භාවිත කරන්න"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"නැත"</item>
+    <item msgid="1930581185557754880">"ඔව්"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"අඳුරු"</item>
+    <item msgid="5079453644557603349">"ආලෝකය"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ක්‍රියාවිරහිතයි"</item>
+    <item msgid="4072198137051566919">"නිදොස්කරණය"</item>
+    <item msgid="2473005316958868509">"කථික"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"නිවසේ පමණි"</item>
+    <item msgid="1161026694891024702">"ස්වයංක්‍රිය"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA කැමතියි"</item>
+    <item msgid="7581481130337402578">"GSM පමණි"</item>
+    <item msgid="8579197487913425819">"WCDMA පමණි"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA ස්වයංක්‍රිය"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ස්වයංක්‍රිය"</item>
+    <item msgid="4219607161971472471">"EvDo රහිත CDMA"</item>
+    <item msgid="7278975240951052041">"EvDo පමණි"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ගෝලීය"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA පමණි"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ගෝලීය"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-si/strings.xml b/tests/CarDeveloperOptions/res/values-si/strings.xml
index d018af6..21e056c 100644
--- a/tests/CarDeveloperOptions/res/values-si/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-si/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ඔබේ ටැබ්ලටය අහිමි වූ හෝ සොරකම් කළ විට කිසිවෙකුට එය භාවිතා කිරීමට නොහැකි වනු ඇති පරිදි තිර අගුළු විකල්පයක් සමඟ ආරක්ෂා කර ගන්න. ඔබට මුහුණ සත්‍යාපනය පිහිටුවීමට තිර අගුළු විකල්පයකුත් අවශ්‍යයි. අවලංගු කරන්න තට්ටු කර, PIN එකක් සකසන්න හෝ වෙනත් තිර අගුළු විකල්පයක් තෝරා ගන්න."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ඔබේ උපාංගය අහිමි වූ හෝ සොරකම් කළ විට කිසිවෙකුට එය භාවිතා කිරීමට නොහැකි වනු ඇති පරිදි තිර අගුළු විකල්පයක් සමඟ ආරක්ෂා කර ගන්න. ඔබට මුහුණ සත්‍යාපනය පිහිටුවීමට තිර අගුළු විකල්පයකුත් අවශ්‍යයි. අවලංගු කරන්න තට්ටු කර, PIN එකක් සකසන්න හෝ වෙනත් තිර අගුළු විකල්පයක් තෝරා ගන්න."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ඔබේ දුරකථනය අහිමි වූ හෝ සොරකම් කළ විට කිසිවෙකුට එය භාවිතා කිරීමට නොහැකි වනු ඇති පරිදි තිර අගුළු විකල්පයක් සමඟ ආරක්ෂා කර ගන්න. ඔබට මුහුණ සත්‍යාපනය පිහිටුවීමට තිර අගුළු විකල්පයකුත් අවශ්‍යයි. අවලංගු කරන්න තට්ටු කර, PIN එකක් සකසන්න හෝ වෙනත් තිර අගුළු විකල්පයක් තෝරා ගන්න."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN පිහිටුවීම මඟ හරින්න ද?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"මුරපදය පිහිටුවීම මඟ හරින්න ද?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"රටාව පිහිටුවීම මඟ හරින්න ද?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"තිර අගුළු දැමීම සකසන්න"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"ජංගම"</item>
+    <item msgid="6007360612667098926">"Wi-Fi පමණයි"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"එය මෙම දුරකථනය මන්දගාමී කරනු ඇත"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"සම්පූර්ණ GNSS මිනුම් බලාත්මක කරන්න"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"කාර්ය චක්‍රය රහිත සියලු GNSS සබැඳි තාරකා ගෝල සහ සංඛ්‍යාත"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"පරිශීලක ස්විචය නිදොස් කරන්න"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"පරිශීලක ස්විචය අතරතුර විස්තරාත්මක තොරතුරු පෙන්වන්න"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"පසුබිම් ක්‍රියාකාරකම් පටන් ගැනීමට ඉඩ දෙන්න"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"පසුබිම් ක්‍රියාකාරකම් සියල්ල පටන් ගැනීමට ඉඩ දෙන්න"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"බිඳ වැටීම් සංවාදය සැම විට පෙන්වන්න"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sk-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-sk-nokeys/strings.xml
new file mode 100644
index 0000000..24e5b39
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sk-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Správa aplikácií"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sk/arrays.xml b/tests/CarDeveloperOptions/res/values-sk/arrays.xml
new file mode 100644
index 0000000..fb66e63
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sk/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Európa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Ázia"</item>
+    <item msgid="6683489385344409742">"Austrália"</item>
+    <item msgid="5194868215515664953">"Tichomorie"</item>
+    <item msgid="7044520255415007865">"Všetko"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekúnd"</item>
+    <item msgid="772029947136115322">"30 sekúnd"</item>
+    <item msgid="8743663928349474087">"1 minúta"</item>
+    <item msgid="1506508631223164814">"2 minúty"</item>
+    <item msgid="8664703938127907662">"5 minút"</item>
+    <item msgid="5827960506924849753">"10 min."</item>
+    <item msgid="6677424950124253938">"30 minút"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikdy"</item>
+    <item msgid="2517785806387977252">"15 sekúnd"</item>
+    <item msgid="6347954399441173672">"30 sekúnd"</item>
+    <item msgid="4858305253279921789">"1 minúta"</item>
+    <item msgid="8109273437140044073">"2 minúty"</item>
+    <item msgid="2788593551142462622">"5 minút"</item>
+    <item msgid="8012672183888404961">"10 minút"</item>
+    <item msgid="8271452751594598661">"30 minút"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Okamžite"</item>
+    <item msgid="2038544972632026612">"5 sekúnd"</item>
+    <item msgid="5558060663472279597">"15 sekúnd"</item>
+    <item msgid="45341168505452037">"30 sekúnd"</item>
+    <item msgid="227647485917789272">"1 minúta"</item>
+    <item msgid="3367011891231217504">"2 minúty"</item>
+    <item msgid="4376575879222393045">"5 minút"</item>
+    <item msgid="811192536981678974">"10 minút"</item>
+    <item msgid="7258394417241706272">"30 minút"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Malé"</item>
+    <item msgid="591935967183159581">"Predvolené"</item>
+    <item msgid="1714184661981538355">"Veľké"</item>
+    <item msgid="6195563047686707484">"Najväčšie"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Prebieha vyhľadávanie..."</item>
+    <item msgid="5597394826455877834">"Pripája sa..."</item>
+    <item msgid="5848277343965362748">"Prebieha overovanie totožnosti..."</item>
+    <item msgid="3391238031431440676">"Získava sa adresa IP…"</item>
+    <item msgid="5257597310494000224">"Pripojené"</item>
+    <item msgid="8472497592913050396">"Pozastavená"</item>
+    <item msgid="1228072488815999109">"Prebieha odpájanie..."</item>
+    <item msgid="7253087004422991731">"Odpojený"</item>
+    <item msgid="4169850917304751227">"Neúspešné"</item>
+    <item msgid="6266658166690831131">"Blokované"</item>
+    <item msgid="4517230805854909775">"Dočasne bolo zabránené slabému pripojeniu"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Vyhľadávanie..."</item>
+    <item msgid="8058143476674427024">"Prebieha pripájanie k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Prebieha overovanie v sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Prebieha získavanie adresy IP zo siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Pripojené k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Pozastavená"</item>
+    <item msgid="4133290864821295785">"Prebieha odpájanie od siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3980154971187953257">"Odpojený"</item>
+    <item msgid="2847316776634969068">"Neúspešné"</item>
+    <item msgid="4390990424746035383">"Blokované"</item>
+    <item msgid="3618248791367063949">"Dočasne bolo zabránené slabému pripojeniu"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Stlačenie tlačidla"</item>
+    <item msgid="7401896200768713930">"PIN zo zdieľaného zariadenia"</item>
+    <item msgid="4526848028011846710">"PIN zo zariadenia"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Pripojené"</item>
+    <item msgid="983792611851499732">"Pozvané"</item>
+    <item msgid="5438273405428201793">"Neúspešné"</item>
+    <item msgid="4646663015449312554">"K dispozícii"</item>
+    <item msgid="3230556734162006146">"Mimo dosah"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minúty"</item>
+    <item msgid="2759776603549270587">"5 minút"</item>
+    <item msgid="167772676068860015">"1 hodina"</item>
+    <item msgid="5985477119043628504">"Bez časového limitu"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Použiť predvolenú hodnotu systému: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Slabé"</item>
+    <item msgid="7882129634982603782">"Slabá"</item>
+    <item msgid="6457357501905996224">"Priemerné"</item>
+    <item msgid="405271628162918841">"Dobrá"</item>
+    <item msgid="999948812884919584">"Vynikajúca"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Posledných 30 dní"</item>
+    <item msgid="3211287705232736964">"Nastaviť cyklus spotreby"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Doba použitia"</item>
+    <item msgid="2784401352592276015">"Naposledy použité"</item>
+    <item msgid="249854287216326349">"Názov aplikácie"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Žiadne"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Žiadne"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Žiadne"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statická"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Žiadne"</item>
+    <item msgid="1464741437353223198">"Príručka"</item>
+    <item msgid="5793600062487886090">"Autom. konfigurácia proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Žiadne"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP alebo CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4 alebo IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Neurčené"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Žiadne"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Interné úložisko zariadenia"</item>
+    <item msgid="3186681694079967527">"Odnímateľná SD karta"</item>
+    <item msgid="6902033473986647035">"Automaticky vyberie systém"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Poloha"</item>
+    <item msgid="6842381562497597649">"Osobné"</item>
+    <item msgid="3966700236695683444">"SMS a MMS"</item>
+    <item msgid="8563996233342430477">"Médiá"</item>
+    <item msgid="5323851085993963783">"Zariadenie"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"približná poloha"</item>
+    <item msgid="1830619568689922920">"presná poloha"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibrovanie"</item>
+    <item msgid="8632513128515114092">"čítanie kontaktov"</item>
+    <item msgid="3741042113569620272">"úprava kontaktov"</item>
+    <item msgid="4204420969709009931">"čítanie denníka hovorov"</item>
+    <item msgid="2260380357119423209">"úprava denníka hovorov"</item>
+    <item msgid="6550710385014530934">"čítanie kalendára"</item>
+    <item msgid="3575906174264853951">"úprava kalendára"</item>
+    <item msgid="4319843242568057174">"prehľadanie sietí Wi‑Fi"</item>
+    <item msgid="2981791890467303819">"upozornenie"</item>
+    <item msgid="6617825156152476692">"prehľadanie mobilných sietí"</item>
+    <item msgid="8865260890611559753">"volanie na telefón"</item>
+    <item msgid="3254999273961542982">"čítanie správ SMS"</item>
+    <item msgid="7711446453028825171">"písanie správ SMS"</item>
+    <item msgid="6123238544099198034">"príjem správ SMS"</item>
+    <item msgid="838342167431596036">"príjem tiesňových SMS"</item>
+    <item msgid="8554432731560956686">"príjem správ MMS"</item>
+    <item msgid="7464863464299515059">"príjem správ WAP push"</item>
+    <item msgid="310463075729606765">"odosielanie správ SMS"</item>
+    <item msgid="7338021933527689514">"čítanie správ ICC SMS"</item>
+    <item msgid="6130369335466613036">"písanie správ ICC SMS"</item>
+    <item msgid="6536865581421670942">"úprava nastavení"</item>
+    <item msgid="4547203129183558973">"vykreslenie navrch"</item>
+    <item msgid="9080347512916542840">"prístup k upozorneniam"</item>
+    <item msgid="5332718516635907742">"fotoaparát:"</item>
+    <item msgid="6098422447246167852">"nahrávať zvuk"</item>
+    <item msgid="9182794235292595296">"prehrávanie zvuku"</item>
+    <item msgid="8760743229597702019">"načítať schránku"</item>
+    <item msgid="2266923698240538544">"upraviť schránku"</item>
+    <item msgid="1801619438618539275">"mediálne tlačidlá"</item>
+    <item msgid="31588119965784465">"zvukové zameranie"</item>
+    <item msgid="7565226799008076833">"hlavná hlasitosť"</item>
+    <item msgid="5420704980305018295">"hlasitosť hlasu"</item>
+    <item msgid="5797363115508970204">"hlasitosť zvonenia"</item>
+    <item msgid="8233154098550715999">"hlasitosť médií"</item>
+    <item msgid="5196715605078153950">"hlasitosť budíkov"</item>
+    <item msgid="394030698764284577">"hlasitosť upozornení"</item>
+    <item msgid="8952898972491680178">"hlasitosť bluetooth"</item>
+    <item msgid="8506227454543690851">"zakázať režim spánku"</item>
+    <item msgid="1108160036049727420">"sledovať polohu"</item>
+    <item msgid="1496205959751719491">"sledovanie polohy s vysokým výkonnom"</item>
+    <item msgid="3776296279910987380">"získanie štatistiky používania"</item>
+    <item msgid="8827100324471975602">"stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+    <item msgid="6880736730520126864">"zobrazenie oznamu"</item>
+    <item msgid="4933375960222609935">"projekcia médií"</item>
+    <item msgid="8357907018938895462">"aktivácia VPN"</item>
+    <item msgid="8143812849911310973">"zápis tapety"</item>
+    <item msgid="6266277260961066535">"asistujúca štruktúra"</item>
+    <item msgid="7715498149883482300">"asistujúca snímka obrazovky"</item>
+    <item msgid="4046679376726313293">"čítanie stavu telefónu"</item>
+    <item msgid="6329507266039719587">"pridanie hlasovej schránky"</item>
+    <item msgid="7692440726415391408">"používanie volania SIP"</item>
+    <item msgid="8572453398128326267">"spracovanie odchádzajúcich hovorov"</item>
+    <item msgid="7775674394089376306">"odtlačok prsta"</item>
+    <item msgid="3182815133441738779">"telesné senzory"</item>
+    <item msgid="2793100005496829513">"čítať správy informačných služieb"</item>
+    <item msgid="2633626056029384366">"napodobnenie miesta"</item>
+    <item msgid="8356842191824684631">"čítanie úložiska"</item>
+    <item msgid="5671906070163291500">"zápis do úložiska"</item>
+    <item msgid="2791955098549340418">"zapnutie obrazovky"</item>
+    <item msgid="5599435119609178367">"získanie účtov"</item>
+    <item msgid="1165623660533024666">"spustenie na pozadí"</item>
+    <item msgid="6423861043647911030">"objem aplikácií dostupnosti"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Krátke"</item>
+    <item msgid="4816511817309094890">"Stredná"</item>
+    <item msgid="8305084671259331134">"Dlhé"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Predvolené"</item>
+    <item msgid="4147246073737933622">"Bezpätkové"</item>
+    <item msgid="3117680749167407907">"Bezpätkové zhustené"</item>
+    <item msgid="6529379119163117545">"Bezpätkové neproporcionálne"</item>
+    <item msgid="1487203730637617924">"Pätkové"</item>
+    <item msgid="4937790671987480464">"Pätkové neproporcionálne"</item>
+    <item msgid="4448481989108928248">"Neformálne"</item>
+    <item msgid="4627069151979553527">"Kurzíva"</item>
+    <item msgid="6896773537705206194">"Kapitálky"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Veľmi malé"</item>
+    <item msgid="5091603983404027034">"Malé"</item>
+    <item msgid="176844712416932112">"Normálne"</item>
+    <item msgid="2784236342175159295">"Veľké"</item>
+    <item msgid="218913203203160606">"Veľmi veľké"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Predvolené"</item>
+    <item msgid="6488643537808152001">"Žiadne"</item>
+    <item msgid="552332815156010137">"Obrys"</item>
+    <item msgid="7187891159463789272">"Tieň"</item>
+    <item msgid="8019330250538856521">"Zvýšený"</item>
+    <item msgid="8987385315647049787">"Rytina"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Predvolené nastavenie aplikácie"</item>
+    <item msgid="8611890312638868524">"Biele na čiernom"</item>
+    <item msgid="5891360837786277638">"Čierne na bielom"</item>
+    <item msgid="2798457065945456853">"Žlté na čiernom"</item>
+    <item msgid="5799049811524553967">"Žlté na modrom"</item>
+    <item msgid="3673930830658169860">"Vlastné"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN s protokolom PPTP"</item>
+    <item msgid="1349760781118368659">"Sieť VPN založená na protokole L2TP/IPSec s predzdieľanými kľúčmi"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN s certifikátmi"</item>
+    <item msgid="312397853907741968">"IPSec VPN s predzdieľanými kľúčmi a overením Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN s certifikátmi a overením Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN s certifikátmi a hybridným overením"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Žiadny"</item>
+    <item msgid="1157046369795346308">"Príručka"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Odpojený"</item>
+    <item msgid="8754480102834556765">"Prebieha inicializácia..."</item>
+    <item msgid="3351334355574270250">"Pripája sa..."</item>
+    <item msgid="8303882153995748352">"Pripojené"</item>
+    <item msgid="9135049670787351881">"Časový limit"</item>
+    <item msgid="2124868417182583926">"Neúspešné"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Opýtať sa"</item>
+    <item msgid="7718817231348607934">"Nikdy nepovoliť"</item>
+    <item msgid="8184570120217958741">"Vždy povoliť"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Pretrvávajúci"</item>
+    <item msgid="167418068739176448">"Najčastejšia aktivita"</item>
+    <item msgid="4760813290195199773">"Dôležitý (v popredí)"</item>
+    <item msgid="2328684826817647595">"Dôležitý (v pozadí)"</item>
+    <item msgid="7746406490652867365">"Zálohovanie"</item>
+    <item msgid="5597404364389196754">"Vysoké vyťaženie"</item>
+    <item msgid="1290888779300174556">"Služba (spustená)"</item>
+    <item msgid="7241098542073939046">"Služba (reštartuje sa)"</item>
+    <item msgid="6610439017684111046">"Prijímač"</item>
+    <item msgid="7367606086319921117">"Plocha"</item>
+    <item msgid="3344660712396741826">"Posledná aktivita"</item>
+    <item msgid="5006559348883303865">"Vo vyrovnávacej pamäti (aktivita)"</item>
+    <item msgid="8633480732468137525">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
+    <item msgid="6248998242443333892">"Vo vyrovnávacej pamäti (prázdne)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Modrozelená"</item>
+    <item msgid="3228505970082457852">"Modrá"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Purpurová"</item>
+    <item msgid="5932337981182999919">"Ružová"</item>
+    <item msgid="5642914536624000094">"Červená"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Staršie ako 30 dní"</item>
+    <item msgid="8699273238891265610">"Staršie ako 60 dní"</item>
+    <item msgid="8346279419423837266">"Staršie ako 90 dní"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Zistiť automaticky"</item>
+    <item msgid="773943026484148895">"Považovať za meranú sieť"</item>
+    <item msgid="1008268820118852416">"Považovať za nemeranú sieť"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Používať randomizovanú adresu MAC (predvolené)"</item>
+    <item msgid="214234417308375326">"Použiť adresu MAC zariadenia"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nie"</item>
+    <item msgid="1930581185557754880">"Áno"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tmavý"</item>
+    <item msgid="5079453644557603349">"Svetlý"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Vypnutý"</item>
+    <item msgid="4072198137051566919">"Ladenie"</item>
+    <item msgid="2473005316958868509">"Podrobné informácie"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Iba plocha"</item>
+    <item msgid="1161026694891024702">"Automaticky"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA – preferované"</item>
+    <item msgid="7581481130337402578">"Iba GSM"</item>
+    <item msgid="8579197487913425819">"Iba WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA – automaticky"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo – automaticky"</item>
+    <item msgid="4219607161971472471">"CDMA bez EvDo"</item>
+    <item msgid="7278975240951052041">"Iba EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globálne"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Iba TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globálne"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sk/strings.xml b/tests/CarDeveloperOptions/res/values-sk/strings.xml
index eaa17fe..8b68658 100644
--- a/tests/CarDeveloperOptions/res/values-sk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sk/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Ochráňte svoj tablet pomocou možnosti zámky obrazovky, aby ho v prípade krádeže alebo straty nemohol nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie overenia tváre. Klepnite na Zrušiť, potom nastavte PIN alebo vyberte inú možnosť zámky obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Ochráňte svoje zariadenie pomocou možnosti zámky obrazovky, aby ho v prípade krádeže alebo straty nemohol nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie overenia tváre. Klepnite na Zrušiť, potom nastavte PIN alebo vyberte inú možnosť zámky obrazovky."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Ochráňte svoj telefón pomocou možnosti zámky obrazovky, aby ho v prípade krádeže alebo straty nemohol nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie overenia tváre. Klepnite na Zrušiť, potom nastavte PIN alebo vyberte inú možnosť zámky obrazovky."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Preskočiť nastavenie kódu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Preskočiť nastavenie hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Preskočiť nastavenie vzoru?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nastaviť zámku obrazovky"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi‑Fi"</item>
+    <item msgid="4421333712484542489">"Mobilné dáta"</item>
+    <item msgid="6007360612667098926">"Len Wi‑Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1233,7 +1235,7 @@
     <string name="auto_brightness_description" msgid="8209140379089535411">"Jas obrazovky sa automaticky prispôsobí prostrediu a aktivitám. Ručným posúvaním posúvača učíte adaptáciu jasu svoje preferované nastavenia."</string>
     <string name="display_white_balance_title" msgid="5747260735311935143">"Zobrazenie vyváženia bielej"</string>
     <string name="adaptive_sleep_title" msgid="3237620948260957018">"Screen aware"</string>
-    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Zapnuté – Obrazovka sa nevypne, ak sa na ňu budete pozerať"</string>
+    <string name="adaptive_sleep_summary_on" msgid="6670369739228487082">"Zapnuté, obrazovka sa nevypne, keď sa na ňu budete pozerať"</string>
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"Vypnuté"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"Zabráni vypnutiu obrazovky, keď sa na ňu budete pozerať."</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"Screen aware pomocou predného fotoaparátu zisťuje, či sa používateľ pozerá na obrazovku. Pracuje v zariadení a snímky sa nikdy neodosielajú do Googlu."</string>
@@ -2095,7 +2097,7 @@
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Keď je funkcia priblíženia zapnutá, môžete pomocou tlačidla dostupnosti v dolnej časti obrazovky zobrazenie rýchlo priblížiť.\n\n"<b>"Zobrazenie priblížite"</b>" klepnutím na tlačidlo dostupnosti a následne na ľubovoľné miesto na obrazovke.\n"<ul><li>"Zobrazenie posuniete presúvaním dvoch alebo viacerých prstov."</li>\n<li>"Priblíženie upravíte priblížením dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Ak chcete zobrazenie priblížiť iba dočasne"</b>", klepnite na tlačidlo dostupnosti a následne sa dotknite ľubovoľného miesta na obrazovke a podržte ho.\n"<ul><li>"Obrazovku môžete posúvať presúvaním prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Klávesnica ani navigačný panel sa nedajú priblížiť."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Tlačidlo dostupnosti je nastavené na službu <xliff:g id="SERVICE">%1$s</xliff:g>. Ak chcete použiť priblíženie, klepnite na tlačidlo dostupnosti, podržte ho a potom vyberte priblíženie."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Skratka klávesa hlasitosti"</string>
-    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Pripojená služba"</string>
+    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Služba ovládaná skratkou"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Povoliť z uzamknutej obrazovky"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Keď je klávesová skratka zapnutá, stlačením obidvoch klávesov hlasitosti na tri sekundy spustíte funkciu dostupnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Text s vysokým kontrastom"</string>
@@ -2205,7 +2207,7 @@
     <string name="captioning_foreground_color" msgid="7412509133818882005">"Farba textu"</string>
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Nepriehľadnosť textu"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Farba okraja"</string>
-    <string name="captioning_edge_type" msgid="4414946407430588162">"Typ okraja"</string>
+    <string name="captioning_edge_type" msgid="4414946407430588162">"Druh okraja"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Skupina písiem"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Titulky budú vyzerať takto."</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
@@ -2692,9 +2694,9 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Odstrániť účet"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Pridať účet"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Chcete účet odstrániť?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Odstránením tohto účtu budú z tabletu odstránené aj všetky správy, kontakty a ďalšie údaje!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Odstránením tohto účtu budú z telefónu odstránené aj všetky správy, kontakty a ďalšie dáta."</string>
-    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Odstránením tohto účtu budú zo zariadenia odstránené aj všetky správy, kontakty a ďalšie dáta."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Odstránením účtu odstránite z tabletu aj všetky správy, kontakty a ďalšie údaje tohto účtu."</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Odstránením účtu odstránite z telefónu aj všetky správy, kontakty a ďalšie údaje tohto účtu."</string>
+    <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Odstránením účtu odstránite zo zariadenia aj všetky správy, kontakty a ďalšie údaje tohto účtu."</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Správca túto zmenu zakázal"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Nie je možné ručne synchronizovať"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete toto nastavenie zmeniť, dočasne zapnite dátové prenosy na pozadí a automatickú synchronizáciu."</string>
@@ -3375,7 +3377,7 @@
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"Ďalšie zvuky a vibrácie"</string>
     <string name="configure_notification_settings" msgid="291914315140851270">"Upozornenia"</string>
     <string name="recent_notifications" msgid="8125865995065032049">"Nedávno odoslané"</string>
-    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Zobraziť všetky aplikácie za posledných 7 dní"</string>
+    <string name="recent_notifications_see_all_title" msgid="4089007770442871469">"Zobraziť všetko za posledných 7 dní"</string>
     <string name="advanced_section_header" msgid="984680389373090015">"Rozšírené"</string>
     <string name="profile_section_header" msgid="5471479005472037417">"Pracovné upozornenia"</string>
     <string name="asst_capability_prioritizer_title" msgid="3488284760645922160">"Automatické priority upozornení"</string>
@@ -3914,7 +3916,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Zobrazenie cez iné aplikácie"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Aplikácie"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Zobrazenie cez iné aplikácie"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Povoliť zobrazenie cez iné aplikácie"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Povoliť zobrazenie nad ostatnými aplikáciami"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Umožní tejto aplikácií zobrazovať sa nad inými aplikáciami, ktoré používate. Môže tak narušiť používanie týchto aplikácií alebo zmeniť ich vzhľad či správanie."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr virtuálna realita prijímač stereo pomocné zariadenie"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"zobrazenie dialógového okna s upozornením systému nad inými aplikáciami"</string>
@@ -3929,8 +3931,8 @@
     <string name="write_settings_summary" msgid="4650251358459404247">"Úprava nastavení systému je povolená pre <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> aplikácií"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"Prístup k správam SMS finančných aplikácií"</string>
     <string name="filter_install_sources_apps" msgid="4519839764020866701">"Môže inštalovať ďalšie aplikácie"</string>
-    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Môže upravovať nastavenia systému"</string>
-    <string name="write_settings_title" msgid="5852614614193830632">"Môže upravovať nastavenia systému"</string>
+    <string name="filter_write_settings_apps" msgid="6864144615530081121">"Môže meniť nastavenia systému"</string>
+    <string name="write_settings_title" msgid="5852614614193830632">"Môže meniť nastavenia systému"</string>
     <string name="write_system_settings" msgid="20450765210832463">"Úprava nastavení systému"</string>
     <string name="permit_write_settings" msgid="4198491281216818756">"Povoliť úpravy nastavení systému"</string>
     <string name="write_settings_description" msgid="2536706293042882500">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Spomalí tento telefón"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Vynútiť úplné meranie GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Sledovať všetky konštelácie a frekvencie GNSS bez cyklického vypínania a zapínania"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Ladenie prepínania používateľov"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Zobrazovať podrobné informácie počas prepínania používateľov"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Povoliť spúšťanie aktivity na pozadí"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Povolí spúšťanie všetkých aktivít na pozadí"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vždy zobrazovať dialógové okno zlyhania"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sl-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-sl-nokeys/strings.xml
new file mode 100644
index 0000000..db3d9f0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sl-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Upravljanje aplikacij"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sl/arrays.xml b/tests/CarDeveloperOptions/res/values-sl/arrays.xml
new file mode 100644
index 0000000..6ac10d1
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sl/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Evropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Azija"</item>
+    <item msgid="6683489385344409742">"Avstralija"</item>
+    <item msgid="5194868215515664953">"Pacifiški čas"</item>
+    <item msgid="7044520255415007865">"Vse"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 s"</item>
+    <item msgid="772029947136115322">"30 sekund"</item>
+    <item msgid="8743663928349474087">"1 minuta"</item>
+    <item msgid="1506508631223164814">"2 minuti"</item>
+    <item msgid="8664703938127907662">"5 minut"</item>
+    <item msgid="5827960506924849753">"10 min"</item>
+    <item msgid="6677424950124253938">"30 minut"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Nikoli"</item>
+    <item msgid="2517785806387977252">"15 sekund"</item>
+    <item msgid="6347954399441173672">"30 sekund"</item>
+    <item msgid="4858305253279921789">"1 minuta"</item>
+    <item msgid="8109273437140044073">"2 minuti"</item>
+    <item msgid="2788593551142462622">"5 minut"</item>
+    <item msgid="8012672183888404961">"10 minut"</item>
+    <item msgid="8271452751594598661">"30 minut"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Takoj"</item>
+    <item msgid="2038544972632026612">"5 sekund"</item>
+    <item msgid="5558060663472279597">"15 sekund"</item>
+    <item msgid="45341168505452037">"30 sekund"</item>
+    <item msgid="227647485917789272">"1 minuta"</item>
+    <item msgid="3367011891231217504">"2 minuti"</item>
+    <item msgid="4376575879222393045">"5 minut"</item>
+    <item msgid="811192536981678974">"10 minut"</item>
+    <item msgid="7258394417241706272">"30 minut"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Majhna"</item>
+    <item msgid="591935967183159581">"Privzeto"</item>
+    <item msgid="1714184661981538355">"Velika"</item>
+    <item msgid="6195563047686707484">"Največje"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Iskanje …"</item>
+    <item msgid="5597394826455877834">"Povezovanje ..."</item>
+    <item msgid="5848277343965362748">"Preverjanje pristnosti ..."</item>
+    <item msgid="3391238031431440676">"Pridobivanje naslova IP …"</item>
+    <item msgid="5257597310494000224">"Povezano"</item>
+    <item msgid="8472497592913050396">"Začasno ustavljeno"</item>
+    <item msgid="1228072488815999109">"Prekinjanje povezave ..."</item>
+    <item msgid="7253087004422991731">"Prekinjena povezava"</item>
+    <item msgid="4169850917304751227">"Ni uspelo"</item>
+    <item msgid="6266658166690831131">"Blokirano"</item>
+    <item msgid="4517230805854909775">"Začasno izogibanje slabi povezavi"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Iskanje ..."</item>
+    <item msgid="8058143476674427024">"Vzpostavljanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="7547609081339573756">"Preverjanje pristnosti v omrežju <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="5145158315060185414">"Pridobivanje naslova IP iz omrežja <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="3283243151651124831">"Povezava z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> je vzpostavljena"</item>
+    <item msgid="6600156231416890902">"Začasno ustavljeno"</item>
+    <item msgid="4133290864821295785">"Prekinjanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="3980154971187953257">"Prekinjena povezava"</item>
+    <item msgid="2847316776634969068">"Ni uspelo"</item>
+    <item msgid="4390990424746035383">"Blokirano"</item>
+    <item msgid="3618248791367063949">"Začasno izogibanje slabi povezavi"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Pritisnite gumb"</item>
+    <item msgid="7401896200768713930">"PIN iz enakovredne naprave"</item>
+    <item msgid="4526848028011846710">"PIN iz te naprave"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Povezano"</item>
+    <item msgid="983792611851499732">"Povabljen"</item>
+    <item msgid="5438273405428201793">"Ni uspelo"</item>
+    <item msgid="4646663015449312554">"Na voljo"</item>
+    <item msgid="3230556734162006146">"Zunaj dosega"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuti"</item>
+    <item msgid="2759776603549270587">"5 min"</item>
+    <item msgid="167772676068860015">"1 ura"</item>
+    <item msgid="5985477119043628504">"Brez časovne omejitve"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Uporaba sistemsko privzete nastavitve: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Šibko"</item>
+    <item msgid="7882129634982603782">"Šibko"</item>
+    <item msgid="6457357501905996224">"Kar dobro"</item>
+    <item msgid="405271628162918841">"Dobro"</item>
+    <item msgid="999948812884919584">"Odlično"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Zadnjih 30 dni"</item>
+    <item msgid="3211287705232736964">"Nastav. cikla porabe ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Čas uporabe"</item>
+    <item msgid="2784401352592276015">"Zadnjič uporabljeno"</item>
+    <item msgid="249854287216326349">"Ime aplikacije"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Brez"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Brez"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Brez"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statično"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Brez"</item>
+    <item msgid="1464741437353223198">"Ročno"</item>
+    <item msgid="5793600062487886090">"Samodejni proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Brez"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ali CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Neopredeljeno"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Brez"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Notranji pomnilnik naprave"</item>
+    <item msgid="3186681694079967527">"Izmenljiva kartica SD"</item>
+    <item msgid="6902033473986647035">"Naj odloči sistem"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokacija"</item>
+    <item msgid="6842381562497597649">"Osebno"</item>
+    <item msgid="3966700236695683444">"Sporočila"</item>
+    <item msgid="8563996233342430477">"Predstavnost"</item>
+    <item msgid="5323851085993963783">"Naprava"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"groba lokacija"</item>
+    <item msgid="1830619568689922920">"natančna lokacija"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibriranje"</item>
+    <item msgid="8632513128515114092">"branje stikov"</item>
+    <item msgid="3741042113569620272">"spreminjanje stikov"</item>
+    <item msgid="4204420969709009931">"branje dnevnika klicev"</item>
+    <item msgid="2260380357119423209">"spreminjanje dnevnika klicev"</item>
+    <item msgid="6550710385014530934">"branje koledarja"</item>
+    <item msgid="3575906174264853951">"spreminjanje koledarja"</item>
+    <item msgid="4319843242568057174">"iskanje omrežij Wi-Fi"</item>
+    <item msgid="2981791890467303819">"obvestilo"</item>
+    <item msgid="6617825156152476692">"iskanje celic mobilnega omrežja"</item>
+    <item msgid="8865260890611559753">"klicanje telefonske številke"</item>
+    <item msgid="3254999273961542982">"branje sporočil SMS"</item>
+    <item msgid="7711446453028825171">"pisanje sporočil SMS"</item>
+    <item msgid="6123238544099198034">"prejemanje sporočil SMS"</item>
+    <item msgid="838342167431596036">"prejemanje sporočil SMS v sili"</item>
+    <item msgid="8554432731560956686">"prejemanje sporočil MMS"</item>
+    <item msgid="7464863464299515059">"prejemanje potisnih sporočil WAP"</item>
+    <item msgid="310463075729606765">"pošiljanje sporočil SMS"</item>
+    <item msgid="7338021933527689514">"branje sporočil SMS na kartici SIM"</item>
+    <item msgid="6130369335466613036">"pisanje sporočil SMS na kartici SIM"</item>
+    <item msgid="6536865581421670942">"spreminjanje nastavitev"</item>
+    <item msgid="4547203129183558973">"vlečenje na vrh"</item>
+    <item msgid="9080347512916542840">"dostop do obvestil"</item>
+    <item msgid="5332718516635907742">"fotoaparat"</item>
+    <item msgid="6098422447246167852">"snemanje zvoka"</item>
+    <item msgid="9182794235292595296">"predvajanje zvoka"</item>
+    <item msgid="8760743229597702019">"preberi odložišče"</item>
+    <item msgid="2266923698240538544">"spremeni odložišče"</item>
+    <item msgid="1801619438618539275">"gumbi za predstavnosti"</item>
+    <item msgid="31588119965784465">"fokus zvoka"</item>
+    <item msgid="7565226799008076833">"glavna glasnost"</item>
+    <item msgid="5420704980305018295">"glasnost glasu"</item>
+    <item msgid="5797363115508970204">"glasnost zvonjenja"</item>
+    <item msgid="8233154098550715999">"glasnost predstavnosti"</item>
+    <item msgid="5196715605078153950">"glasnost alarma"</item>
+    <item msgid="394030698764284577">"glasnost obvestila"</item>
+    <item msgid="8952898972491680178">"glasnost za Bluetooth"</item>
+    <item msgid="8506227454543690851">"ohrani odklenjen zaslon"</item>
+    <item msgid="1108160036049727420">"spremljanje lokacije"</item>
+    <item msgid="1496205959751719491">"nadzor natančno določene lokacije"</item>
+    <item msgid="3776296279910987380">"pridobivanje statističnih podatkov o uporabi"</item>
+    <item msgid="8827100324471975602">"izklop/vklop mikrofona"</item>
+    <item msgid="6880736730520126864">"prikaz obvestila"</item>
+    <item msgid="4933375960222609935">"predstavnost projektov"</item>
+    <item msgid="8357907018938895462">"aktiviranje omrežja VPN"</item>
+    <item msgid="8143812849911310973">"ozadje pisanja"</item>
+    <item msgid="6266277260961066535">"struktura pomoči"</item>
+    <item msgid="7715498149883482300">"posnetek zaslona pomoči"</item>
+    <item msgid="4046679376726313293">"branje stanja telefona"</item>
+    <item msgid="6329507266039719587">"dodajanje odzivnika"</item>
+    <item msgid="7692440726415391408">"uporaba protokola SIP"</item>
+    <item msgid="8572453398128326267">"obdelava odhodnega klica"</item>
+    <item msgid="7775674394089376306">"prstni odtis"</item>
+    <item msgid="3182815133441738779">"tipala telesnih funkcij"</item>
+    <item msgid="2793100005496829513">"branje oddaj v celici"</item>
+    <item msgid="2633626056029384366">"lažna lokacija"</item>
+    <item msgid="8356842191824684631">"branje shrambe"</item>
+    <item msgid="5671906070163291500">"pisanje v shrambo"</item>
+    <item msgid="2791955098549340418">"vklop zaslona"</item>
+    <item msgid="5599435119609178367">"pridobivanje računov"</item>
+    <item msgid="1165623660533024666">"izvajanje v ozadju"</item>
+    <item msgid="6423861043647911030">"glasnost za funkcije za ljudi s posebnimi potrebami"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kratko"</item>
+    <item msgid="4816511817309094890">"Srednja pomembnost"</item>
+    <item msgid="8305084671259331134">"Dolgo"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Privzeto"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif, zgoščena"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Vsakdanje"</item>
+    <item msgid="4627069151979553527">"Ležeče"</item>
+    <item msgid="6896773537705206194">"Pomanjšane velike črke"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Zelo majhna"</item>
+    <item msgid="5091603983404027034">"Majhna"</item>
+    <item msgid="176844712416932112">"Običajna"</item>
+    <item msgid="2784236342175159295">"Velika"</item>
+    <item msgid="218913203203160606">"Zelo velika"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Privzeto"</item>
+    <item msgid="6488643537808152001">"Brez"</item>
+    <item msgid="552332815156010137">"Oris"</item>
+    <item msgid="7187891159463789272">"Senca"</item>
+    <item msgid="8019330250538856521">"Dvignjeno"</item>
+    <item msgid="8987385315647049787">"Znižano"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Uporabi privzeto nastavitev aplik."</item>
+    <item msgid="8611890312638868524">"Belo na črnem"</item>
+    <item msgid="5891360837786277638">"Črno na belem"</item>
+    <item msgid="2798457065945456853">"Rumeno na črnem"</item>
+    <item msgid="5799049811524553967">"Rumeno na modrem"</item>
+    <item msgid="3673930830658169860">"Po meri"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN s ključi v predhodni skupni rabi"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN s potrdili"</item>
+    <item msgid="312397853907741968">"IPSec VPN s ključi v predhodni skupni rabi in preverjanjem pristnosti Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN s potrdili in preverjanjem pristnosti Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN s potrdili in hibridnim preverjanjem pristnosti"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Brez"</item>
+    <item msgid="1157046369795346308">"Ročno"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Prekinjena povezava"</item>
+    <item msgid="8754480102834556765">"Inicializacija ..."</item>
+    <item msgid="3351334355574270250">"Povezovanje ..."</item>
+    <item msgid="8303882153995748352">"Povezano"</item>
+    <item msgid="9135049670787351881">"Časovna omejitev"</item>
+    <item msgid="2124868417182583926">"Ni uspelo"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Vprašaj"</item>
+    <item msgid="7718817231348607934">"Nikoli ne dovoli"</item>
+    <item msgid="8184570120217958741">"Vedno dovoli"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Trajno"</item>
+    <item msgid="167418068739176448">"Najpogostejša dejavnost"</item>
+    <item msgid="4760813290195199773">"Pomembno (v ospredju)"</item>
+    <item msgid="2328684826817647595">"Pomembno (v ozadju)"</item>
+    <item msgid="7746406490652867365">"Varnostno kopiranje"</item>
+    <item msgid="5597404364389196754">"Zahtevno"</item>
+    <item msgid="1290888779300174556">"Storitev (izvajanje)"</item>
+    <item msgid="7241098542073939046">"Storitev (vnovičen zagon)"</item>
+    <item msgid="6610439017684111046">"Sprejemnik"</item>
+    <item msgid="7367606086319921117">"Začetni zaslon"</item>
+    <item msgid="3344660712396741826">"Zadnja dejavnost"</item>
+    <item msgid="5006559348883303865">"Predpomnjeno (dejavnost)"</item>
+    <item msgid="8633480732468137525">"Predpomnjeno (odjemalec dejavnosti)"</item>
+    <item msgid="6248998242443333892">"Predpomnjeno (prazno)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Zelenomodra"</item>
+    <item msgid="3228505970082457852">"Modra"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Vijolična"</item>
+    <item msgid="5932337981182999919">"Rožnata"</item>
+    <item msgid="5642914536624000094">"Rdeča"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Starejše od 30 dni"</item>
+    <item msgid="8699273238891265610">"Starejše od 60 dni"</item>
+    <item msgid="8346279419423837266">"Starejše od 90 dni"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Zaznaj samodejno"</item>
+    <item msgid="773943026484148895">"Obravnavaj kot omrežje z omejenim prenosom podatkov"</item>
+    <item msgid="1008268820118852416">"Obravnavaj kot omrežje z neomejenim prenosom podatkov"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Uporaba naključno izbranega naslova MAC (privzeto)"</item>
+    <item msgid="214234417308375326">"Uporaba naslova MAC naprave"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ne"</item>
+    <item msgid="1930581185557754880">"Da"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Temna"</item>
+    <item msgid="5079453644557603349">"Svetla"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Izklopljeno"</item>
+    <item msgid="4072198137051566919">"Odpravljanje napak"</item>
+    <item msgid="2473005316958868509">"Podrobno"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Samo domače"</item>
+    <item msgid="1161026694891024702">"Samodejno"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Prednostno GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Samo GSM"</item>
+    <item msgid="8579197487913425819">"Samo WCDMA"</item>
+    <item msgid="8465243227505412498">"Samodejno GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Samodejno CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA brez EvDo"</item>
+    <item msgid="7278975240951052041">"Samo EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalno"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Samo TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalno"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sl/strings.xml b/tests/CarDeveloperOptions/res/values-sl/strings.xml
index 60983ad..7151979 100644
--- a/tests/CarDeveloperOptions/res/values-sl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sl/strings.xml
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Tablični računalnik zaščitite z možnostjo zaklepanja zaslona, tako da ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev preverjanja pristnosti z obrazom. Dotaknite se »Prekliči«, nato pa nastavite kodo PIN ali izberite drugo možnost zaklepanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Napravo zaščitite z možnostjo zaklepanja zaslona, tako da je ne bo mogel uporabljati nihče drug, če jo izgubite ali vam jo ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev preverjanja pristnosti z obrazom. Dotaknite se »Prekliči«, nato pa nastavite kodo PIN ali izberite drugo možnost zaklepanja zaslona."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefon zaščitite z možnostjo zaklepanja zaslona, tako da ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev preverjanja pristnosti z obrazom. Dotaknite se »Prekliči«, nato pa nastavite kodo PIN ali izberite drugo možnost zaklepanja zaslona."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ne želite nastaviti kode PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ne želite nastaviti gesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ne želite nastaviti vzorca?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Nastavi zaklepanje zaslona"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobilno"</item>
+    <item msgid="6007360612667098926">"Samo Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1241,7 +1243,7 @@
     <string name="night_display_text" msgid="5330502493684652527">"Nočna svetloba zaslon obarva z jantarnim odtenkom. To olajša gledanje na zaslon ali branje pri šibki svetlobi in vam lahko pomaga prej zaspati."</string>
     <string name="night_display_auto_mode_title" msgid="8493573087102481588">"Urnik"</string>
     <string name="night_display_auto_mode_never" msgid="2897444637217807088">"Brez"</string>
-    <string name="night_display_auto_mode_custom" msgid="1400891076453963151">"Vklop ob poljubni nastavljeni uri"</string>
+    <string name="night_display_auto_mode_custom" msgid="1400891076453963151">"Vklop ob poljubni uri"</string>
     <string name="night_display_auto_mode_twilight" msgid="4000162110017520674">"Vklop od sončn. zahoda do vzhoda"</string>
     <string name="night_display_start_time_title" msgid="1069255169673371077">"Začetni čas"</string>
     <string name="night_display_end_time_title" msgid="2760793157124245911">"Končni čas"</string>
@@ -1853,13 +1855,13 @@
     <string name="data_size_label" msgid="7790201846922671662">"Uporabniški podatki"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="8004991551882573479">"Podatki na pogonu USB"</string>
     <string name="external_data_size_label" product="default" msgid="1097584278225902734">"Kartica SD"</string>
-    <string name="uninstall_text" msgid="4859715815689705801">"Odstrani"</string>
+    <string name="uninstall_text" msgid="4859715815689705801">"Odmesti"</string>
     <string name="uninstall_all_users_text" msgid="2620518509352561416">"Odstrani za vse uporabnike"</string>
     <string name="install_text" msgid="2798092278891807849">"Namesti"</string>
     <string name="disable_text" msgid="5065834603951474397">"Onemogoči"</string>
     <string name="enable_text" msgid="7179141636849225884">"Omogoči"</string>
     <string name="clear_user_data_text" msgid="8894073247302821764">"Počisti shrambo"</string>
-    <string name="app_factory_reset" msgid="8718986000278776272">"Odstrani posodobitve"</string>
+    <string name="app_factory_reset" msgid="8718986000278776272">"Odmesti posodobitve"</string>
     <string name="auto_launch_enable_text" msgid="3372898942144027341">"Izbrali ste, da se bo pri nekaterih dejanjih ta aplikacija samodejno zagnala."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2286211654774611037">"Aplikaciji dovolite, da ustvari pripomočke in dostopa do njihovih podatkov."</string>
     <string name="auto_launch_disable_text" msgid="8560921288036801416">"Ni privzetih nastavitev."</string>
@@ -2083,7 +2085,7 @@
     <string name="talkback_title" msgid="3717960404234260050">"TalkBack"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"Bralnik zaslona je predvsem za slepe in slabovidne"</string>
     <string name="select_to_speak_summary" msgid="7514180457557735421">"Če želite slišati vsebino elementov na zaslonu, se jih dotaknite"</string>
-    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Napisi"</string>
+    <string name="accessibility_captioning_title" msgid="5878371993023439642">"Podnapisi"</string>
     <string name="accessibility_screen_magnification_title" msgid="7250949681883917360">"Povečava"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="9199287875401817974">"Povečevanje s trikratnim dotikom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="400655612610761242">"Povečevanje z gumbom"</string>
@@ -2130,7 +2132,7 @@
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"Vibriranje ob dotiku"</string>
     <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"Uporaba storitve"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"Uporaba popravljanja barv"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Uporaba napisov"</string>
+    <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"Uporaba podnapisov"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"Naprej"</string>
     <string name="accessibility_hearingaid_title" msgid="3700978781235124891">"Slušni pripomočki"</string>
     <string name="accessibility_hearingaid_not_connected_summary" msgid="634573930469952213">"Noben slušni pripomoček ni povezan"</string>
@@ -2196,7 +2198,7 @@
     <string name="captioning_standard_options_title" msgid="4124898413348084226">"Standardne možnosti"</string>
     <string name="captioning_locale" msgid="4734464353806207943">"Jezik"</string>
     <string name="captioning_text_size" msgid="1707122517246408084">"Velikost besedila"</string>
-    <string name="captioning_preset" msgid="7429888317480872337">"Slog napisov"</string>
+    <string name="captioning_preset" msgid="7429888317480872337">"Slog podnapisov"</string>
     <string name="captioning_custom_options_title" msgid="4530479671071326732">"Možnosti po meri"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"Barva ozadja"</string>
     <string name="captioning_background_opacity" msgid="8178926599201811936">"Neprosojnost ozadja"</string>
@@ -2207,7 +2209,7 @@
     <string name="captioning_edge_color" msgid="4330622137047993780">"Barva roba"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Vrsta roba"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"Skupina pisav"</string>
-    <string name="captioning_preview_text" msgid="4877753964772618049">"Napisi bodo videti tako:"</string>
+    <string name="captioning_preview_text" msgid="4877753964772618049">"Podnapisi bodo videti tako:"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"Privzeto"</string>
     <string name="color_title" msgid="132875486061816584">"Barva"</string>
@@ -3235,7 +3237,7 @@
     <string name="emergency_tone_vibrate" msgid="5020068066905681181">"Vibriranje"</string>
     <string name="boot_sounds_title" msgid="7583926202411353620">"Zvoki ob zagonu"</string>
     <string name="live_caption_title" msgid="7926591158657997051">"Samodejni podnapisi"</string>
-    <string name="live_caption_summary" msgid="9064771862352393125">"Samodejni napisi predstavnosti"</string>
+    <string name="live_caption_summary" msgid="9064771862352393125">"Samodejni podnapisi predstavnosti"</string>
     <string name="zen_mode_settings_summary_off" msgid="6929319200478424962">"Nikoli"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="6061723291126091396">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> omogočen</item>
@@ -3873,7 +3875,7 @@
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Aplikaciji za pomoč dovoli dostop do posnetka zaslona"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Utripanje zaslona"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"Utripanje robov zaslona, ko aplikacija za pomoč dostopa do besedila z zaslona ali posnetka zaslona"</string>
-    <string name="assist_footer" msgid="7030121180457472165">"Aplikacije za pomoč vam pomagajo na podlagi podatkov na zaslonu, ki si ga ogledujete. Nekatere aplikacije podpirajo storitve zaganjalnika in glasovnega vnosa pri zagotavljanju integrirane pomoči."</string>
+    <string name="assist_footer" msgid="7030121180457472165">"Aplikacije za pomoč vam lahko pomagajo na podlagi podatkov na zaslonu, ki si ga ogledujete. Nekatere aplikacije podpirajo storitve zaganjalnika in glasovnega vnosa in vam tako zagotavljajo celovito pomoč."</string>
     <string name="average_memory_use" msgid="5333366040118953945">"Povprečna uporaba pomnilnika"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"Največja uporaba pomnilnika"</string>
     <string name="memory_usage" msgid="7963253555330830906">"Uporaba pomnilnika"</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Upočasnila bo delovanje tega telefona"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Vsili popolne meritve GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Spremljaj vse razmestitve in frekvence GNSS brez ciklov"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Stikalo uporabnika za odpravljanje napak"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Prikaz podrobnih podatkov, ko uporabnik preklopi stikalo"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Dovoli začetek dejavnosti v ozadju"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Dovoli začetek vseh dejavnosti v ozadju"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Vedno pokaži pogovorno okno zrušitve"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sq-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-sq-nokeys/strings.xml
new file mode 100644
index 0000000..c31b070
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sq-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Menaxho aplikacionet"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sq/arrays.xml b/tests/CarDeveloperOptions/res/values-sq/arrays.xml
new file mode 100644
index 0000000..11c7d80
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sq/arrays.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Evropa"</item>
+    <item msgid="3812126832016254559">"Afrikë"</item>
+    <item msgid="2765816300353408280">"Azi"</item>
+    <item msgid="6683489385344409742">"Australi"</item>
+    <item msgid="5194868215515664953">"Oqeani Paqësor"</item>
+    <item msgid="7044520255415007865">"Të gjitha"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Menjëherë"</item>
+    <item msgid="2038544972632026612">"5 sek."</item>
+    <item msgid="5558060663472279597">"15 sek."</item>
+    <item msgid="45341168505452037">"30 sekonda"</item>
+    <item msgid="227647485917789272">"1 minutë"</item>
+    <item msgid="3367011891231217504">"2 minuta"</item>
+    <item msgid="4376575879222393045">"5 min."</item>
+    <item msgid="811192536981678974">"10 min."</item>
+    <item msgid="7258394417241706272">"30 min."</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Lidhur"</item>
+    <item msgid="983792611851499732">"I ftuar"</item>
+    <item msgid="5438273405428201793">"Pa sukses"</item>
+    <item msgid="4646663015449312554">"Në shitje"</item>
+    <item msgid="3230556734162006146">"Jashtë rrezes"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Përdor parazgjedhjen e sistemit: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 ditët e fundit"</item>
+    <item msgid="3211287705232736964">"Cakto ciklin e përdorimit..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Koha e përdorimit"</item>
+    <item msgid="2784401352592276015">"Përdorur për herë të fundit"</item>
+    <item msgid="249854287216326349">"Emri i aplikacionit"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Asnjë"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Asnjë"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Asnjë"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Asnjë"</item>
+    <item msgid="1464741437353223198">"Manuale"</item>
+    <item msgid="5793600062487886090">"Auto-konfig. i përfaqësuesit"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Asnjë"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP ose CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"I papërcaktuar"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Asnjë"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Hapësira e brendshme ruajtëse e pajisjes"</item>
+    <item msgid="3186681694079967527">"Kartë SD e lëvizshme"</item>
+    <item msgid="6902033473986647035">"Lejo sistemin të marrë vendim"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Vendndodhja"</item>
+    <item msgid="6842381562497597649">"Personale"</item>
+    <item msgid="3966700236695683444">"Mesazhet"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Pajisja"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"vendndodhja e përafërt"</item>
+    <item msgid="1830619568689922920">"vendndodhja e saktë"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"dridhje"</item>
+    <item msgid="8632513128515114092">"lexo kontaktet"</item>
+    <item msgid="3741042113569620272">"modifiko kontaktet"</item>
+    <item msgid="4204420969709009931">"lexo ditarin e telefonatave"</item>
+    <item msgid="2260380357119423209">"modifiko ditarin e telefonatave"</item>
+    <item msgid="6550710385014530934">"lexo kalendarin"</item>
+    <item msgid="3575906174264853951">"modifiko kalendarin"</item>
+    <item msgid="4319843242568057174">"skanimi për Wi-Fi"</item>
+    <item msgid="2981791890467303819">"njoftimi"</item>
+    <item msgid="6617825156152476692">"skanimi i rrjetit celular"</item>
+    <item msgid="8865260890611559753">"telefono telefonin"</item>
+    <item msgid="3254999273961542982">"lexo SMS-të"</item>
+    <item msgid="7711446453028825171">"shkruaj SMS"</item>
+    <item msgid="6123238544099198034">"prano SMS"</item>
+    <item msgid="838342167431596036">"merr SMS emergjence"</item>
+    <item msgid="8554432731560956686">"merr MMS"</item>
+    <item msgid="7464863464299515059">"prano \"WAP push\""</item>
+    <item msgid="310463075729606765">"dërgo SMS"</item>
+    <item msgid="7338021933527689514">"lexo ICC SMS-të"</item>
+    <item msgid="6130369335466613036">"shkruaj ICC SMS"</item>
+    <item msgid="6536865581421670942">"modifiko cilësimet"</item>
+    <item msgid="4547203129183558973">"vizato sipër"</item>
+    <item msgid="9080347512916542840">"qasju njoftimeve"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"regjistro audio"</item>
+    <item msgid="9182794235292595296">"luaj audio"</item>
+    <item msgid="8760743229597702019">"lexo memorien e fragmenteve"</item>
+    <item msgid="2266923698240538544">"modifiko memorien e fragmenteve"</item>
+    <item msgid="1801619438618539275">"butonat e medias"</item>
+    <item msgid="31588119965784465">"përqendrimi i audios"</item>
+    <item msgid="7565226799008076833">"kontrollo volumin"</item>
+    <item msgid="5420704980305018295">"volumi i zërit"</item>
+    <item msgid="5797363115508970204">"volumi i ziles"</item>
+    <item msgid="8233154098550715999">"volumi i medias"</item>
+    <item msgid="5196715605078153950">"volumi i alarmit"</item>
+    <item msgid="394030698764284577">"volumi i njoftimit"</item>
+    <item msgid="8952898972491680178">"Volumi i \"Bluetooth-it\""</item>
+    <item msgid="8506227454543690851">"mbaje të zgjuar"</item>
+    <item msgid="1108160036049727420">"monitoro vendndodhjen"</item>
+    <item msgid="1496205959751719491">"monitoro vendndodhjen e energjisë së lartë"</item>
+    <item msgid="3776296279910987380">"merr statistikat e përdorimit"</item>
+    <item msgid="8827100324471975602">"çaktivizo/aktivizo mikrofonin"</item>
+    <item msgid="6880736730520126864">"shfaq kodin toast"</item>
+    <item msgid="4933375960222609935">"projekto media"</item>
+    <item msgid="8357907018938895462">"aktivizo rrjetin VPN"</item>
+    <item msgid="8143812849911310973">"shkruaj në imazhin e sfondit"</item>
+    <item msgid="6266277260961066535">"ndihmo strukturën"</item>
+    <item msgid="7715498149883482300">"ndihmo pamjen e ekranit"</item>
+    <item msgid="4046679376726313293">"lexo gjendjen e telefonit"</item>
+    <item msgid="6329507266039719587">"shto postë zanore"</item>
+    <item msgid="7692440726415391408">"përdor kodin sip"</item>
+    <item msgid="8572453398128326267">"përpuno thirrjen dalëse"</item>
+    <item msgid="7775674394089376306">"gjurmë gishti"</item>
+    <item msgid="3182815133441738779">"sensorët e trupit"</item>
+    <item msgid="2793100005496829513">"lexo transmetimet celulare"</item>
+    <item msgid="2633626056029384366">"vendndodhja e simuluar"</item>
+    <item msgid="8356842191824684631">"lexo hapësirën ruajtëse"</item>
+    <item msgid="5671906070163291500">"shkruaj hapësirën ruajtëse"</item>
+    <item msgid="2791955098549340418">"ndiz ekranin"</item>
+    <item msgid="5599435119609178367">"merr llogaritë"</item>
+    <item msgid="1165623660533024666">"ekzekuto në sfond"</item>
+    <item msgid="6423861043647911030">"volumi i qasshmërisë"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"E shkurtër"</item>
+    <item msgid="4816511817309094890">"Mesatare"</item>
+    <item msgid="8305084671259331134">"E gjatë"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"E parazgjedhur"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif i kondensuar"</item>
+    <item msgid="6529379119163117545">"Sans-serif me hapësirë fikse"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif me hapësirë fikse"</item>
+    <item msgid="4448481989108928248">"Rastësor"</item>
+    <item msgid="4627069151979553527">"I pjerrët"</item>
+    <item msgid="6896773537705206194">"Shkronja të mëdha të minimizuara"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:4 (8019330250538856521) -->
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"VPN PPTP"</item>
+    <item msgid="1349760781118368659">"Rrjeti VPN L2TP/IPSec me çelësat e ndarë paraprakisht"</item>
+    <item msgid="6128519070545038358">"VPN L2TP/IPSec me certifikata"</item>
+    <item msgid="312397853907741968">"VPN IPSec me çelësa të ndarë paraprakisht dhe verifikimin Xauth"</item>
+    <item msgid="3319427315593649917">"Rrjeti VPN IPSec me certifikata dhe me verifikimin Xauth"</item>
+    <item msgid="8258927774145391041">"Rrjeti VPN IPSec me certifikata dhe me vërtetim hibrid"</item>
+  </string-array>
+    <!-- no translation found for vpn_proxy_settings:0 (2958623927055120839) -->
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Pyet"</item>
+    <item msgid="7718817231348607934">"Mos lejo asnjëherë"</item>
+    <item msgid="8184570120217958741">"Lejo gjithmonë"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Pa ndalim"</item>
+    <item msgid="167418068739176448">"Aktiviteti kryesor"</item>
+    <item msgid="4760813290195199773">"E rëndësishme (në plan të parë)"</item>
+    <item msgid="2328684826817647595">"E rëndësishme (sfondi)"</item>
+    <item msgid="7746406490652867365">"Rezervimi"</item>
+    <item msgid="5597404364389196754">"Peshë e rëndë"</item>
+    <item msgid="1290888779300174556">"Shërbimi (në ekzekutim)"</item>
+    <item msgid="7241098542073939046">"Shërbimi (në rinisje)"</item>
+    <item msgid="6610439017684111046">"Marrësi"</item>
+    <item msgid="7367606086319921117">"Ekrani bazë"</item>
+    <item msgid="3344660712396741826">"Aktiviteti i fundit"</item>
+    <item msgid="5006559348883303865">"I ruajtur në memorie specifike (aktivitet)"</item>
+    <item msgid="8633480732468137525">"I ruajtur në memorie specifike (aktiviteti i klientit)"</item>
+    <item msgid="6248998242443333892">"I ruajtur në memorie specifike (bosh)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Gurkali"</item>
+    <item msgid="3228505970082457852">"E kaltër"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Vjollcë"</item>
+    <item msgid="5932337981182999919">"Rozë"</item>
+    <item msgid="5642914536624000094">"E kuqe"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Mbi 30 ditë të vjetra"</item>
+    <item msgid="8699273238891265610">"Mbi 60 ditë të vjetra"</item>
+    <item msgid="8346279419423837266">"Mbi 90 ditë të vjetra"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Zbulo automatikisht"</item>
+    <item msgid="773943026484148895">"Trajto si me matje"</item>
+    <item msgid="1008268820118852416">"Trajto si pa matje"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Përdor adresë MAC të rastësishme (parazgjedhje)"</item>
+    <item msgid="214234417308375326">"Përdor adresën MAC të pajisjes"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Jo"</item>
+    <item msgid="1930581185557754880">"Po"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"E errët"</item>
+    <item msgid="5079453644557603349">"E ndriçuar"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Joaktiv"</item>
+    <item msgid="4072198137051566919">"Korrigjo"</item>
+    <item msgid="2473005316958868509">"Me shumë fjalë"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Vetëm rrjeti vendor"</item>
+    <item msgid="1161026694891024702">"Automatike"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA i preferuar"</item>
+    <item msgid="7581481130337402578">"Vetëm GSM"</item>
+    <item msgid="8579197487913425819">"Vetëm WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA automatik"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo automatik"</item>
+    <item msgid="4219607161971472471">"CDMA pa EvDo"</item>
+    <item msgid="7278975240951052041">"Vetëm EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globale"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"Vetëm TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globale"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sq/strings.xml b/tests/CarDeveloperOptions/res/values-sq/strings.xml
index 84cf6a8..ef73ea6 100644
--- a/tests/CarDeveloperOptions/res/values-sq/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sq/strings.xml
@@ -294,7 +294,7 @@
     <string name="okay" msgid="5838476766924989056">"Në rregull"</string>
     <string name="forget" msgid="7735525146062672874">"Harro"</string>
     <string name="save" msgid="3418211178410498517">"Ruaj"</string>
-    <string name="done" msgid="5143229467535372339">"U krye!"</string>
+    <string name="done" msgid="5143229467535372339">"U krye"</string>
     <string name="apply" msgid="951230399613164126">"Zbato"</string>
     <string name="share" msgid="3567029787293158575">"Ndaj"</string>
     <string name="add" msgid="903114118076816060">"Shto"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Mbroje tabletin tënd me një opsion për kyçjen e ekranit në mënyrë që askush të mos jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar vërtetimin me fytyrë. Trokit tek \"Anulo\", më pas vendos një kod PIN ose zgjidh një tjetër opsion për kyçjen e ekranit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Mbroje pajisjen tënde me një opsion për kyçjen e ekranit në mënyrë që askush të mos jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar vërtetimin me fytyrë. Trokit tek \"Anulo\", më pas vendos një kod PIN ose zgjidh një tjetër opsion për kyçjen e ekranit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Mbroje telefonin tënd me një opsion për kyçjen e ekranit në mënyrë që askush të mos jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar vërtetimin me fytyrë. Trokit tek \"Anulo\", më pas vendos një kod PIN ose zgjidh një tjetër opsion për kyçjen e ekranit."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Dëshiron ta kapërcesh konfigurimin e kodit PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Dëshiron të kapërcesh konfigurimin e fjalëkalimit?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Dëshiron të kapërcesh konfigurimin e motivit?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Konfiguro kyçjen e ekranit"</string>
@@ -807,7 +806,7 @@
     <string name="wifi_display_details" msgid="6379855523460749126">"Shfaq cilësimet"</string>
     <string name="wifi_display_options_title" msgid="4587264519668872213">"Opsionet e shfaqjes së Wi-Fi"</string>
     <string name="wifi_display_options_forget" msgid="7882982544626742073">"Harro"</string>
-    <string name="wifi_display_options_done" msgid="5922060890309265817">"U krye!"</string>
+    <string name="wifi_display_options_done" msgid="5922060890309265817">"U krye"</string>
     <string name="wifi_display_options_name" msgid="8477627781133827607">"Emri"</string>
     <string name="wifi_band_24ghz" msgid="2973143764653628618">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6469832209748522207">"5 GHz"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Celular"</item>
+    <item msgid="6007360612667098926">"Vetëm Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2659,7 +2661,7 @@
     <string name="data_usage_menu_show_ethernet" msgid="2130574690318410238">"Shfaq përdorimin e Eternetit"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="1191233197312414533">"Fshih përdorimin e eternetit"</string>
     <string name="data_usage_menu_metered" msgid="3087525150259956831">"Kufizimet e rrjetit"</string>
-    <string name="data_usage_menu_auto_sync" msgid="3350154877737572146">"Të dhënat e autosinkronizimit"</string>
+    <string name="data_usage_menu_auto_sync" msgid="3350154877737572146">"Të dhënat e sinkronizimit automatik"</string>
     <string name="data_usage_menu_sim_cards" msgid="8508154611676507088">"Kartat SIM"</string>
     <string name="data_usage_cellular_data_summary" msgid="9162777397135709280">"U ndërpre në kufi"</string>
     <string name="account_settings_menu_auto_sync" msgid="2673669556006027506">"Auto-sinkronizo të dhënat"</string>
@@ -2822,7 +2824,7 @@
     <string name="backup_pw_cancel_button_text" msgid="6170984655621611957">"Anulo"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="8674710454802166341">"Përditësime të sistemit"</string>
     <string name="ssl_ca_cert_warning" msgid="7794291734272626026">"Rrjeti mund të jetë i monitoruar"</string>
-    <string name="done_button" msgid="7652373284597307008">"U krye!"</string>
+    <string name="done_button" msgid="7652373284597307008">"U krye"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7323708984446517980">
       <item quantity="other">Besoji ose hiqi certifikatat</item>
       <item quantity="one">Besoje ose hiqe certifikatën</item>
@@ -3154,7 +3156,7 @@
     <string name="emergency_tone_alert" msgid="907868135091891015">"Tonet"</string>
     <string name="emergency_tone_vibrate" msgid="5020068066905681181">"Dridhjet"</string>
     <string name="boot_sounds_title" msgid="7583926202411353620">"Aktivizo tingujt"</string>
-    <string name="live_caption_title" msgid="7926591158657997051">"Titra automatike"</string>
+    <string name="live_caption_title" msgid="7926591158657997051">"Titra në çast"</string>
     <string name="live_caption_summary" msgid="9064771862352393125">"Media me titra automatike"</string>
     <string name="zen_mode_settings_summary_off" msgid="6929319200478424962">"Asnjëherë"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="6061723291126091396">
@@ -3421,7 +3423,7 @@
     <string name="app_notification_row_banned" msgid="2079325338122151677">"I bllokuar"</string>
     <string name="app_notification_row_priority" msgid="432299064888787236">"Me prioritet"</string>
     <string name="app_notification_row_sensitive" msgid="4919671519227722958">"Delikate"</string>
-    <string name="app_notifications_dialog_done" msgid="5395611029779655968">"U krye!"</string>
+    <string name="app_notifications_dialog_done" msgid="5395611029779655968">"U krye"</string>
     <string name="app_notification_importance_title" msgid="1902794400671001142">"Rëndësia"</string>
     <string name="notification_show_lights_title" msgid="5381920725933228542">"Drita me pulsim"</string>
     <string name="notification_vibrate_title" msgid="8221718258793835282">"Dridhje"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Ai do ta ngadalësojë këtë telefon"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Matjet GNSS me fuqi të plotë"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Gjurmo të gjitha koleksionet dhe frekuencat e GNSS pa ciklim të detyruar"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Ndryshimi i përdoruesit për korrigjimin"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Shfaq informacione të detajuara gjatë ndryshimit të përdoruesit"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Lejo nisjet e aktiviteteve në sfond"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Lejon të gjitha nisjet e aktiviteteve në sfond"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Gjithmonë shfaq dialogun e ndërprerjes aksidentale"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sr-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-sr-nokeys/strings.xml
new file mode 100644
index 0000000..5d0cdd7
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sr-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Управљање апликацијама"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sr/arrays.xml b/tests/CarDeveloperOptions/res/values-sr/arrays.xml
new file mode 100644
index 0000000..e6f117a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sr/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америка"</item>
+    <item msgid="4791956477275129121">"Европа"</item>
+    <item msgid="3812126832016254559">"Африка"</item>
+    <item msgid="2765816300353408280">"Азија"</item>
+    <item msgid="6683489385344409742">"Аустралија"</item>
+    <item msgid="5194868215515664953">"Пацифик"</item>
+    <item msgid="7044520255415007865">"Све"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 секунди"</item>
+    <item msgid="772029947136115322">"30 секунди"</item>
+    <item msgid="8743663928349474087">"1 минут"</item>
+    <item msgid="1506508631223164814">"2 минута"</item>
+    <item msgid="8664703938127907662">"5 минута"</item>
+    <item msgid="5827960506924849753">"10 минута"</item>
+    <item msgid="6677424950124253938">"30 минута"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Никада"</item>
+    <item msgid="2517785806387977252">"15 секунди"</item>
+    <item msgid="6347954399441173672">"30 секунди"</item>
+    <item msgid="4858305253279921789">"1 минут"</item>
+    <item msgid="8109273437140044073">"2 минута"</item>
+    <item msgid="2788593551142462622">"5 минута"</item>
+    <item msgid="8012672183888404961">"10 минута"</item>
+    <item msgid="8271452751594598661">"30 минута"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Одмах"</item>
+    <item msgid="2038544972632026612">"5 секунди"</item>
+    <item msgid="5558060663472279597">"15 секунди"</item>
+    <item msgid="45341168505452037">"30 секунди"</item>
+    <item msgid="227647485917789272">"1 минут"</item>
+    <item msgid="3367011891231217504">"2 минута"</item>
+    <item msgid="4376575879222393045">"5 минута"</item>
+    <item msgid="811192536981678974">"10 минута"</item>
+    <item msgid="7258394417241706272">"30 минута"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Мала"</item>
+    <item msgid="591935967183159581">"Подразумевано"</item>
+    <item msgid="1714184661981538355">"Велика"</item>
+    <item msgid="6195563047686707484">"Највећа"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Скенирање..."</item>
+    <item msgid="5597394826455877834">"Повезивање…"</item>
+    <item msgid="5848277343965362748">"Проверавање аутентичности..."</item>
+    <item msgid="3391238031431440676">"Преузимање IP адресе..."</item>
+    <item msgid="5257597310494000224">"Повезано"</item>
+    <item msgid="8472497592913050396">"Обустављено"</item>
+    <item msgid="1228072488815999109">"Прекидање везе..."</item>
+    <item msgid="7253087004422991731">"Веза је прекинута"</item>
+    <item msgid="4169850917304751227">"Неуспешно"</item>
+    <item msgid="6266658166690831131">"Блокирано"</item>
+    <item msgid="4517230805854909775">"Привремено избегавање лоше везе"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Скенирање..."</item>
+    <item msgid="8058143476674427024">"Повезивање са мрежом <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Потврђивање аутентичности на мрежи <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Добијање IP адресе од мреже <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Повезано са мрежом <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Обустављено"</item>
+    <item msgid="4133290864821295785">"Прекидање везе са мрежом <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Веза је прекинута"</item>
+    <item msgid="2847316776634969068">"Неуспешно"</item>
+    <item msgid="4390990424746035383">"Блокирано"</item>
+    <item msgid="3618248791367063949">"Привремено избегавање лоше везе"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Притисните дугме"</item>
+    <item msgid="7401896200768713930">"PIN са равноправног уређаја"</item>
+    <item msgid="4526848028011846710">"PIN са овог уређаја"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Повезано"</item>
+    <item msgid="983792611851499732">"Позван"</item>
+    <item msgid="5438273405428201793">"Неуспешно"</item>
+    <item msgid="4646663015449312554">"Доступна"</item>
+    <item msgid="3230556734162006146">"Изван опсега"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 минута"</item>
+    <item msgid="2759776603549270587">"5 минута"</item>
+    <item msgid="167772676068860015">"1 сат"</item>
+    <item msgid="5985477119043628504">"Без чекања"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Користи подразумевано системско подешавање: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слаба"</item>
+    <item msgid="7882129634982603782">"Слаба"</item>
+    <item msgid="6457357501905996224">"Задовољавајућа"</item>
+    <item msgid="405271628162918841">"Добра"</item>
+    <item msgid="999948812884919584">"Одлична"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Последњих 30 дана"</item>
+    <item msgid="3211287705232736964">"Подеси циклус потрошње..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Време коришћења"</item>
+    <item msgid="2784401352592276015">"Последњи пут коришћено"</item>
+    <item msgid="249854287216326349">"Назив апликације"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Ниједна"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ништа"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"АКА"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Ниједна"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Статички"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Ниједна"</item>
+    <item msgid="1464741437353223198">"Упутство"</item>
+    <item msgid="5793600062487886090">"Аутом. конфиг. проксија"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Ниједна"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP или CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Није наведено"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ниједан"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Складиште унутрашњег уређаја"</item>
+    <item msgid="3186681694079967527">"Уклоњива SD картица"</item>
+    <item msgid="6902033473986647035">"Нека систем одлучи"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Локација"</item>
+    <item msgid="6842381562497597649">"Лични"</item>
+    <item msgid="3966700236695683444">"Размена порука"</item>
+    <item msgid="8563996233342430477">"Медији"</item>
+    <item msgid="5323851085993963783">"Уређај"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"оквирна локација"</item>
+    <item msgid="1830619568689922920">"прецизна локација"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"вибрација"</item>
+    <item msgid="8632513128515114092">"читање контаката"</item>
+    <item msgid="3741042113569620272">"мењање контаката"</item>
+    <item msgid="4204420969709009931">"читање евиденције позива"</item>
+    <item msgid="2260380357119423209">"мењање евиденције позива"</item>
+    <item msgid="6550710385014530934">"читање календара"</item>
+    <item msgid="3575906174264853951">"мењање календара"</item>
+    <item msgid="4319843242568057174">"Wi-Fi скенирање"</item>
+    <item msgid="2981791890467303819">"обавештење"</item>
+    <item msgid="6617825156152476692">"скенирање телефона"</item>
+    <item msgid="8865260890611559753">"позивање телефона"</item>
+    <item msgid="3254999273961542982">"читање SMS порука"</item>
+    <item msgid="7711446453028825171">"писање SMS порука"</item>
+    <item msgid="6123238544099198034">"пријем SMS порука"</item>
+    <item msgid="838342167431596036">"пријем хитних SMS порука"</item>
+    <item msgid="8554432731560956686">"пријем MMS порука"</item>
+    <item msgid="7464863464299515059">"пријем push порука преко WAP-а"</item>
+    <item msgid="310463075729606765">"слање SMS порука"</item>
+    <item msgid="7338021933527689514">"читање ICC SMS порука"</item>
+    <item msgid="6130369335466613036">"писање ICC SMS порука"</item>
+    <item msgid="6536865581421670942">"мењање подешавања"</item>
+    <item msgid="4547203129183558973">"повлачење на врх"</item>
+    <item msgid="9080347512916542840">"приступ обавештењима"</item>
+    <item msgid="5332718516635907742">"камера"</item>
+    <item msgid="6098422447246167852">"снимање аудио записа"</item>
+    <item msgid="9182794235292595296">"пуштање аудио записа"</item>
+    <item msgid="8760743229597702019">"читање меморије"</item>
+    <item msgid="2266923698240538544">"мењање меморије"</item>
+    <item msgid="1801619438618539275">"дугмад за медије"</item>
+    <item msgid="31588119965784465">"аудио фокус"</item>
+    <item msgid="7565226799008076833">"главна јачина звука"</item>
+    <item msgid="5420704980305018295">"јачина звука гласа"</item>
+    <item msgid="5797363115508970204">"јачина звука звона"</item>
+    <item msgid="8233154098550715999">"јачина звука медија"</item>
+    <item msgid="5196715605078153950">"јачина звука аларма"</item>
+    <item msgid="394030698764284577">"јачина звука обавештења"</item>
+    <item msgid="8952898972491680178">"јачина звука Bluetooth-а"</item>
+    <item msgid="8506227454543690851">"задржавање ван стања спавања"</item>
+    <item msgid="1108160036049727420">"праћење локације"</item>
+    <item msgid="1496205959751719491">"надгледање локације са високим напоном"</item>
+    <item msgid="3776296279910987380">"преузми статистику о коришћењу"</item>
+    <item msgid="8827100324471975602">"искључи/укључи звук микрофона"</item>
+    <item msgid="6880736730520126864">"приказивање искачућих порука"</item>
+    <item msgid="4933375960222609935">"медији за пројекат"</item>
+    <item msgid="8357907018938895462">"активирање VPN-а"</item>
+    <item msgid="8143812849911310973">"упис на позадину"</item>
+    <item msgid="6266277260961066535">"структура помоћи"</item>
+    <item msgid="7715498149883482300">"снимак екрана помоћи"</item>
+    <item msgid="4046679376726313293">"читање стања телефона"</item>
+    <item msgid="6329507266039719587">"додавање говорне поште"</item>
+    <item msgid="7692440726415391408">"коришћење SIP-а"</item>
+    <item msgid="8572453398128326267">"обрада одлазног позива"</item>
+    <item msgid="7775674394089376306">"дигитални отисак"</item>
+    <item msgid="3182815133441738779">"сензори за тело"</item>
+    <item msgid="2793100005496829513">"читање порука за мобилне уређаје на локалитету"</item>
+    <item msgid="2633626056029384366">"лажна локација"</item>
+    <item msgid="8356842191824684631">"читање меморијског простора"</item>
+    <item msgid="5671906070163291500">"упис података у меморијски простор"</item>
+    <item msgid="2791955098549340418">"укључивање екрана"</item>
+    <item msgid="5599435119609178367">"приступ налозима"</item>
+    <item msgid="1165623660533024666">"рад у позадини"</item>
+    <item msgid="6423861043647911030">"јачина звука за приступачност"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Кратко"</item>
+    <item msgid="4816511817309094890">"Средњи"</item>
+    <item msgid="8305084671259331134">"Дугачко"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Подразумевано"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Скупљени sans-serif"</item>
+    <item msgid="6529379119163117545">"Sans-serif фиксне ширине"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif фиксне ширине"</item>
+    <item msgid="4448481989108928248">"Опуштено"</item>
+    <item msgid="4627069151979553527">"Курзив"</item>
+    <item msgid="6896773537705206194">"Мала почетна слова"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Веома мала"</item>
+    <item msgid="5091603983404027034">"Мала"</item>
+    <item msgid="176844712416932112">"Нормална"</item>
+    <item msgid="2784236342175159295">"Велика"</item>
+    <item msgid="218913203203160606">"Веома велика"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Подразумевано"</item>
+    <item msgid="6488643537808152001">"Ниједна"</item>
+    <item msgid="552332815156010137">"Контура"</item>
+    <item msgid="7187891159463789272">"Падајућа сенка"</item>
+    <item msgid="8019330250538856521">"Издигнуто"</item>
+    <item msgid="8987385315647049787">"Удубљена"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Подразумевано за апликацију"</item>
+    <item msgid="8611890312638868524">"Бело на црно"</item>
+    <item msgid="5891360837786277638">"Црно на бело"</item>
+    <item msgid="2798457065945456853">"Жуто на црно"</item>
+    <item msgid="5799049811524553967">"Жуто на плаво"</item>
+    <item msgid="3673930830658169860">"Прилагођено"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN са унапред дељеним кључевима"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN са сертификатима"</item>
+    <item msgid="312397853907741968">"IPSec VPN са унапред дељеним кључевима и Xauth потврдом идентитета"</item>
+    <item msgid="3319427315593649917">"IPSec VPN са сертификатима и Xauth потврдом идентитета"</item>
+    <item msgid="8258927774145391041">"IPSec VPN са сертификатима и хибридном потврдом идентитета"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Нема"</item>
+    <item msgid="1157046369795346308">"Упутство"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Веза је прекинута"</item>
+    <item msgid="8754480102834556765">"Покретање..."</item>
+    <item msgid="3351334355574270250">"Повезивање…"</item>
+    <item msgid="8303882153995748352">"Повезано"</item>
+    <item msgid="9135049670787351881">"Време чекања"</item>
+    <item msgid="2124868417182583926">"Неуспешно"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Питај"</item>
+    <item msgid="7718817231348607934">"Никада не дозволи"</item>
+    <item msgid="8184570120217958741">"Увек дозволи"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Непрекидна"</item>
+    <item msgid="167418068739176448">"Највећа активност"</item>
+    <item msgid="4760813290195199773">"Важна (први план)"</item>
+    <item msgid="2328684826817647595">"Важна (други план)"</item>
+    <item msgid="7746406490652867365">"Резервне копије"</item>
+    <item msgid="5597404364389196754">"Тешка"</item>
+    <item msgid="1290888779300174556">"Услуга (активна)"</item>
+    <item msgid="7241098542073939046">"Услуга (поново се покреће)"</item>
+    <item msgid="6610439017684111046">"Пријемник"</item>
+    <item msgid="7367606086319921117">"Почетна"</item>
+    <item msgid="3344660712396741826">"Последња активност"</item>
+    <item msgid="5006559348883303865">"Кеширана (активност)"</item>
+    <item msgid="8633480732468137525">"Кеширана (клијент активности)"</item>
+    <item msgid="6248998242443333892">"Кеширана (празно)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Плавозелена"</item>
+    <item msgid="3228505970082457852">"Плава"</item>
+    <item msgid="6590260735734795647">"Тамноплава"</item>
+    <item msgid="3521763377357218577">"Љубичаста"</item>
+    <item msgid="5932337981182999919">"Розе"</item>
+    <item msgid="5642914536624000094">"Црвена"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Старије од 30 дана"</item>
+    <item msgid="8699273238891265610">"Старије од 60 дана"</item>
+    <item msgid="8346279419423837266">"Старије од 90 дана"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Аутоматски откриј"</item>
+    <item msgid="773943026484148895">"Третирај као мрежу са ограничењем"</item>
+    <item msgid="1008268820118852416">"Третирај као мрежу без ограничења"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Користи насумично изабрану MAC адресу (подразумевано)"</item>
+    <item msgid="214234417308375326">"Користи MAC адресу уређаја"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Не"</item>
+    <item msgid="1930581185557754880">"Да"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Тамна"</item>
+    <item msgid="5079453644557603349">"Светла"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Искључено"</item>
+    <item msgid="4072198137051566919">"Отклони грешке"</item>
+    <item msgid="2473005316958868509">"Детаљно"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Само кућна"</item>
+    <item msgid="1161026694891024702">"Аутоматски"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA има предност"</item>
+    <item msgid="7581481130337402578">"Само GSM"</item>
+    <item msgid="8579197487913425819">"Само WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA аутоматски"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo аутоматски"</item>
+    <item msgid="4219607161971472471">"CDMA без EvDo-а"</item>
+    <item msgid="7278975240951052041">"Само EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Глобална"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Само TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Глобална"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sr/strings.xml b/tests/CarDeveloperOptions/res/values-sr/strings.xml
index effa3b4..699cf07 100644
--- a/tests/CarDeveloperOptions/res/values-sr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sr/strings.xml
@@ -485,8 +485,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Заштитите таблет помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили потврду идентитета лицем. Додирните Откажи, па подесите PIN или одаберите другу опцију закључавања екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Заштитите уређај помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили потврду идентитета лицем. Додирните Откажи, па подесите PIN или одаберите другу опцију закључавања екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Заштитите телефон помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили потврду идентитета лицем. Додирните Откажи, па подесите PIN или одаберите другу опцију закључавања екрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Прескочити подешавање PIN-а?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Прескочити подешавање лозинке?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Прескочити подешавање шаблона?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Подеси закључавање екрана"</string>
@@ -1109,8 +1108,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобилни подаци"</item>
+    <item msgid="6007360612667098926">"Само Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2880,9 +2882,9 @@
       <item quantity="other">Провери сертификате</item>
     </plurals>
     <string name="user_settings_title" msgid="7917598650933179545">"Више корисника"</string>
-    <string name="user_settings_footer_text" product="device" msgid="4573858247439190545">"Делите уређај тако што ћете додати нове кориснике. Сваки корисник има лични простор на уређају за прилагођене почетне екране, налоге, апликације, подешавања и још много тога."</string>
-    <string name="user_settings_footer_text" product="tablet" msgid="780018221428132918">"Делите таблет тако што ћете додати нове кориснике. Сваки корисник има лични простор на таблету за прилагођене почетне екране, налоге, апликације, подешавања и још много тога."</string>
-    <string name="user_settings_footer_text" product="default" msgid="1470859614968237491">"Делите телефон тако што ћете додати нове кориснике. Сваки корисник има лични простор на телефону за прилагођене почетне екране, налоге, апликације, подешавања и још много тога."</string>
+    <string name="user_settings_footer_text" product="device" msgid="4573858247439190545">"Делите уређај тако што ћете додати нове кориснике. Сваки корисник има лични простор на уређају за прилагођене почетне екране, налоге, апликације, подешавања и друго."</string>
+    <string name="user_settings_footer_text" product="tablet" msgid="780018221428132918">"Делите таблет тако што ћете додати нове кориснике. Сваки корисник има лични простор на таблету за прилагођене почетне екране, налоге, апликације, подешавања и друго."</string>
+    <string name="user_settings_footer_text" product="default" msgid="1470859614968237491">"Делите телефон тако што ћете додати нове кориснике. Сваки корисник има лични простор на телефону за прилагођене почетне екране, налоге, апликације, подешавања и друго."</string>
     <string name="user_list_title" msgid="6670258645246192324">"Корисници и профили"</string>
     <string name="user_add_user_or_profile_menu" msgid="4220679989900149336">"Додај корисника или профил"</string>
     <string name="user_add_user_menu" msgid="9006572936456324794">"Додај корисника"</string>
@@ -4348,6 +4350,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Успориће овај телефон"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Принудно покрени пуна GNSS мерења"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Прати све GNSS консталације и фреквенције без циклуса рада"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Отклањање грешака у вези са променом корисника"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Приказује детаљне информације током промене корисника"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Дозволи покретање апликација у позадини"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Дозвољава покретање свих активности у позадини"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Увек приказуј дијалог о отказивању"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sv-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-sv-nokeys/strings.xml
new file mode 100644
index 0000000..75f34a2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sv-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Hantera appar"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sv/arrays.xml b/tests/CarDeveloperOptions/res/values-sv/arrays.xml
new file mode 100644
index 0000000..8b5cdd4
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sv/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Europa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asien"</item>
+    <item msgid="6683489385344409742">"Australien"</item>
+    <item msgid="5194868215515664953">"Stilla havet"</item>
+    <item msgid="7044520255415007865">"Alla"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 sekunder"</item>
+    <item msgid="772029947136115322">"30 sekunder"</item>
+    <item msgid="8743663928349474087">"1 minut"</item>
+    <item msgid="1506508631223164814">"2 minuter"</item>
+    <item msgid="8664703938127907662">"5 minuter"</item>
+    <item msgid="5827960506924849753">"10 minuter"</item>
+    <item msgid="6677424950124253938">"30 minuter"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Aldrig"</item>
+    <item msgid="2517785806387977252">"15 sekunder"</item>
+    <item msgid="6347954399441173672">"30 sekunder"</item>
+    <item msgid="4858305253279921789">"1 minut"</item>
+    <item msgid="8109273437140044073">"2 minuter"</item>
+    <item msgid="2788593551142462622">"5 minuter"</item>
+    <item msgid="8012672183888404961">"10 minuter"</item>
+    <item msgid="8271452751594598661">"30 minuter"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Omedelbart"</item>
+    <item msgid="2038544972632026612">"5 sekunder"</item>
+    <item msgid="5558060663472279597">"15 sekunder"</item>
+    <item msgid="45341168505452037">"30 sekunder"</item>
+    <item msgid="227647485917789272">"1 minut"</item>
+    <item msgid="3367011891231217504">"2 minuter"</item>
+    <item msgid="4376575879222393045">"5 minuter"</item>
+    <item msgid="811192536981678974">"10 minuter"</item>
+    <item msgid="7258394417241706272">"30 minuter"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Liten"</item>
+    <item msgid="591935967183159581">"Standard"</item>
+    <item msgid="1714184661981538355">"Stor"</item>
+    <item msgid="6195563047686707484">"Störst"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Skannar…"</item>
+    <item msgid="5597394826455877834">"Ansluter ..."</item>
+    <item msgid="5848277343965362748">"Autentiserar ..."</item>
+    <item msgid="3391238031431440676">"Erhåller IP-adress…"</item>
+    <item msgid="5257597310494000224">"Ansluten"</item>
+    <item msgid="8472497592913050396">"Pausad"</item>
+    <item msgid="1228072488815999109">"Kopplar ifrån…"</item>
+    <item msgid="7253087004422991731">"Frånkopplad"</item>
+    <item msgid="4169850917304751227">"Misslyckades"</item>
+    <item msgid="6266658166690831131">"Blockerad"</item>
+    <item msgid="4517230805854909775">"Undviker just nu dålig anslutning"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Skannar …"</item>
+    <item msgid="8058143476674427024">"Ansluter till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Autentiserar med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="5145158315060185414">"IP-adress hämtas från <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="3283243151651124831">"Ansluten till: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Pausad"</item>
+    <item msgid="4133290864821295785">"Kopplar ifrån <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Frånkopplad"</item>
+    <item msgid="2847316776634969068">"Misslyckades"</item>
+    <item msgid="4390990424746035383">"Blockerad"</item>
+    <item msgid="3618248791367063949">"Undviker just nu dålig anslutning"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Tryckknapp"</item>
+    <item msgid="7401896200768713930">"PIN-kod från den andra enheten"</item>
+    <item msgid="4526848028011846710">"PIN-kod från enheten"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Ansluten"</item>
+    <item msgid="983792611851499732">"Inbjuden"</item>
+    <item msgid="5438273405428201793">"Misslyckades"</item>
+    <item msgid="4646663015449312554">"Tillgängligt"</item>
+    <item msgid="3230556734162006146">"Utanför intervallet"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuter"</item>
+    <item msgid="2759776603549270587">"5 minuter"</item>
+    <item msgid="167772676068860015">"1 timme"</item>
+    <item msgid="5985477119043628504">"Ange aldrig tidsgräns"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Använd systemstandard: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dålig"</item>
+    <item msgid="7882129634982603782">"Dålig"</item>
+    <item msgid="6457357501905996224">"Ganska bra"</item>
+    <item msgid="405271628162918841">"Bra"</item>
+    <item msgid="999948812884919584">"Utmärkt"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Senaste 30 dagarna"</item>
+    <item msgid="3211287705232736964">"Ange användningscykel ..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Användningstid"</item>
+    <item msgid="2784401352592276015">"Användes senast"</item>
+    <item msgid="249854287216326349">"Appnamn"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Inget"</item>
+    <item msgid="8655686691660180616">"MSCHAPv2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Ingen"</item>
+    <item msgid="212906109313512425">"MSCHAPv2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Inget"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPv2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statisk"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Inget"</item>
+    <item msgid="1464741437353223198">"Handbok"</item>
+    <item msgid="5793600062487886090">"Autokonfig. av proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Inget"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP eller CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ej angiven"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Ingen"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Lagring på intern enhet"</item>
+    <item msgid="3186681694079967527">"Flyttbart SD-kort"</item>
+    <item msgid="6902033473986647035">"Låt systemet bestämma"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Plats"</item>
+    <item msgid="6842381562497597649">"Personligt"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Enhet"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ungefärlig plats"</item>
+    <item msgid="1830619568689922920">"exakt plats"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"vibration"</item>
+    <item msgid="8632513128515114092">"läsa kontakter"</item>
+    <item msgid="3741042113569620272">"ändra kontakter"</item>
+    <item msgid="4204420969709009931">"läsa samtalslogg"</item>
+    <item msgid="2260380357119423209">"ändra samtalslogg"</item>
+    <item msgid="6550710385014530934">"läsa kalender"</item>
+    <item msgid="3575906174264853951">"ändra kalender"</item>
+    <item msgid="4319843242568057174">"Wi-Fi-skanning"</item>
+    <item msgid="2981791890467303819">"meddelande"</item>
+    <item msgid="6617825156152476692">"mobilskanning"</item>
+    <item msgid="8865260890611559753">"ringa samtal"</item>
+    <item msgid="3254999273961542982">"läsa SMS"</item>
+    <item msgid="7711446453028825171">"skriva SMS"</item>
+    <item msgid="6123238544099198034">"ta emot SMS"</item>
+    <item msgid="838342167431596036">"ta emot nöd-SMS"</item>
+    <item msgid="8554432731560956686">"ta emot MMS"</item>
+    <item msgid="7464863464299515059">"ta emot WAP-push"</item>
+    <item msgid="310463075729606765">"skicka SMS"</item>
+    <item msgid="7338021933527689514">"läsa ICC-SMS"</item>
+    <item msgid="6130369335466613036">"skriva ICC-SMS"</item>
+    <item msgid="6536865581421670942">"ändra inställningar"</item>
+    <item msgid="4547203129183558973">"Rita högst upp"</item>
+    <item msgid="9080347512916542840">"få åtkomst till meddelanden"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"spela in ljud"</item>
+    <item msgid="9182794235292595296">"spela upp ljud"</item>
+    <item msgid="8760743229597702019">"läs Urklipp"</item>
+    <item msgid="2266923698240538544">"ändra Urklipp"</item>
+    <item msgid="1801619438618539275">"medieknappar"</item>
+    <item msgid="31588119965784465">"ljudinställning"</item>
+    <item msgid="7565226799008076833">"mastervolym"</item>
+    <item msgid="5420704980305018295">"röstvolym"</item>
+    <item msgid="5797363115508970204">"ringvolym"</item>
+    <item msgid="8233154098550715999">"medievolym"</item>
+    <item msgid="5196715605078153950">"alarmvolym"</item>
+    <item msgid="394030698764284577">"meddelandevolym"</item>
+    <item msgid="8952898972491680178">"bluetooth-volym"</item>
+    <item msgid="8506227454543690851">"behåll aktiv"</item>
+    <item msgid="1108160036049727420">"övervaka plats"</item>
+    <item msgid="1496205959751719491">"övervaka batterikrävande plats"</item>
+    <item msgid="3776296279910987380">"få användningsstatistik"</item>
+    <item msgid="8827100324471975602">"stäng av/slå på mikrofonen"</item>
+    <item msgid="6880736730520126864">"visa popup"</item>
+    <item msgid="4933375960222609935">"projicera media"</item>
+    <item msgid="8357907018938895462">"aktivera VPN"</item>
+    <item msgid="8143812849911310973">"skriva bakgrund"</item>
+    <item msgid="6266277260961066535">"assistentstruktur"</item>
+    <item msgid="7715498149883482300">"assistentskärmdump"</item>
+    <item msgid="4046679376726313293">"läsa telefonstatus"</item>
+    <item msgid="6329507266039719587">"lägga till röstbrevlåda"</item>
+    <item msgid="7692440726415391408">"använda SIP"</item>
+    <item msgid="8572453398128326267">"behandla utgående samtal"</item>
+    <item msgid="7775674394089376306">"fingeravtryck"</item>
+    <item msgid="3182815133441738779">"kroppssensorer"</item>
+    <item msgid="2793100005496829513">"läsa cellsändningar"</item>
+    <item msgid="2633626056029384366">"skenplatser"</item>
+    <item msgid="8356842191824684631">"läsa lagringsutrymme"</item>
+    <item msgid="5671906070163291500">"skriva lagringsutrymme"</item>
+    <item msgid="2791955098549340418">"aktivera skärmen"</item>
+    <item msgid="5599435119609178367">"hämta konton"</item>
+    <item msgid="1165623660533024666">"köra i bakgrunden"</item>
+    <item msgid="6423861043647911030">"volym på tillgänglighetsfunktionerna"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Plats"</item>
+    <item msgid="6656077694190491067">"Plats"</item>
+    <item msgid="8790228218278477369">"Plats"</item>
+    <item msgid="7836406246005211990">"Vibration"</item>
+    <item msgid="3951439024549922598">"Läsa kontakter"</item>
+    <item msgid="8802152411647068">"Ändra kontakter"</item>
+    <item msgid="229544934599698735">"Läsa samtalslogg"</item>
+    <item msgid="7396102294405899613">"Ändra samtalslogg"</item>
+    <item msgid="3597797992398484655">"Läsa kalender"</item>
+    <item msgid="2705975774250907343">"Ändra kalender"</item>
+    <item msgid="4668747371441932697">"Plats"</item>
+    <item msgid="1487578921720243646">"Lägga upp meddelande"</item>
+    <item msgid="4636080349724146638">"Plats"</item>
+    <item msgid="673510900286463926">"Ringa samtal"</item>
+    <item msgid="542083422784609790">"Läs sms/mms"</item>
+    <item msgid="1033780373029588436">"Skriv sms/mms"</item>
+    <item msgid="5647111115517787488">"Ta emot SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Ta emot SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Ta emot SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Ta emot SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Skicka SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Läs sms/mms"</item>
+    <item msgid="6555678522277865572">"Skriv sms/mms"</item>
+    <item msgid="6981734935578130884">"Ändra inställningar"</item>
+    <item msgid="8705854389991425629">"Rita högst upp"</item>
+    <item msgid="5861356020344153651">"Få åtkomst till meddelanden"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Spela in ljud"</item>
+    <item msgid="4516840825756409490">"Spela upp ljud"</item>
+    <item msgid="6811712502798183957">"Läs Urklipp"</item>
+    <item msgid="2780369012602289114">"Ändra Urklipp"</item>
+    <item msgid="2331359440170850868">"Medieknappar"</item>
+    <item msgid="6133599737122751231">"Ljudinställning"</item>
+    <item msgid="6844485713404805301">"Huvudvolym"</item>
+    <item msgid="1600379420669104929">"Röstvolym"</item>
+    <item msgid="6296768210470214866">"Ringvolym"</item>
+    <item msgid="510690696071629241">"Medievolym"</item>
+    <item msgid="406861638631430109">"Alarmvolym"</item>
+    <item msgid="4715864795872233884">"Aviseringsvolym"</item>
+    <item msgid="2311478519251301183">"Bluetooth-volym"</item>
+    <item msgid="5133991377896747027">"Behåll aktiv"</item>
+    <item msgid="2464189519136248621">"Plats"</item>
+    <item msgid="2062677934050803037">"Plats"</item>
+    <item msgid="1735171933192715957">"Få användningsstatistik"</item>
+    <item msgid="1014093788778383554">"Stäng av/slå på mikrofonen"</item>
+    <item msgid="4199297950608622850">"Visa popup"</item>
+    <item msgid="2527962435313398821">"Projicera media"</item>
+    <item msgid="5117506254221861929">"Aktivera VPN"</item>
+    <item msgid="8291198322681891160">"Skriv bakgrund"</item>
+    <item msgid="7106921284621230961">"Assistentstruktur"</item>
+    <item msgid="4496533640894624799">"Assistentskärmdump"</item>
+    <item msgid="2598847264853993611">"Läsa telefonstatus"</item>
+    <item msgid="9215610846802973353">"Lägga till röstbrevlåda"</item>
+    <item msgid="9186411956086478261">"Använda SIP"</item>
+    <item msgid="6884763100104539558">"Behandla utgående samtal"</item>
+    <item msgid="125513972170580692">"Fingeravtryck"</item>
+    <item msgid="2556071024281275619">"Kroppssensorer"</item>
+    <item msgid="617168514928339387">"Läsa cellsändningar"</item>
+    <item msgid="7134693570516523585">"Skenplatser"</item>
+    <item msgid="7224489175375229399">"Läsa lagringsutrymme"</item>
+    <item msgid="8472735063903258202">"Skriva lagringsutrymme"</item>
+    <item msgid="4069276819909595110">"Aktivera skärmen"</item>
+    <item msgid="1228338896751121025">"Hämta konton"</item>
+    <item msgid="3181581793459233672">"Kör i bakgrunden"</item>
+    <item msgid="2340936043025374076">"Volym på tillgänglighetsfunktionerna"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kort"</item>
+    <item msgid="4816511817309094890">"Medelhög"</item>
+    <item msgid="8305084671259331134">"Lång"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Standard"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif Condensed"</item>
+    <item msgid="6529379119163117545">"Jämnbreda typsnitt – sanserif"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Jämnbreda typsnitt – seriff"</item>
+    <item msgid="4448481989108928248">"Informell"</item>
+    <item msgid="4627069151979553527">"Kursiv"</item>
+    <item msgid="6896773537705206194">"Kapitäler"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Mycket liten"</item>
+    <item msgid="5091603983404027034">"Liten"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Stor"</item>
+    <item msgid="218913203203160606">"Mycket stor"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Standard"</item>
+    <item msgid="6488643537808152001">"Inget"</item>
+    <item msgid="552332815156010137">"Disposition"</item>
+    <item msgid="7187891159463789272">"Bakgrundsskugga"</item>
+    <item msgid="8019330250538856521">"Upphöjd"</item>
+    <item msgid="8987385315647049787">"Nedsänkt"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25 %"</item>
+    <item msgid="4665048002584838262">"50 %"</item>
+    <item msgid="1874668269931014581">"75 %"</item>
+    <item msgid="6462911487571123954">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Använd appstandarder"</item>
+    <item msgid="8611890312638868524">"Vitt på svart"</item>
+    <item msgid="5891360837786277638">"Svart på vitt"</item>
+    <item msgid="2798457065945456853">"Gult på svart"</item>
+    <item msgid="5799049811524553967">"Gult på blått"</item>
+    <item msgid="3673930830658169860">"Anpassa"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP-VPN"</item>
+    <item msgid="1349760781118368659">"L2TP-/IPSec-VPN med nycklar som delats i förväg"</item>
+    <item msgid="6128519070545038358">"L2TP-/IPSec-VPN med certifikat"</item>
+    <item msgid="312397853907741968">"IPSec-VPN med nycklar som delats i förväg och Xauth-autentisering"</item>
+    <item msgid="3319427315593649917">"IPSec-VPN med certifikat och Xauth-autentisering"</item>
+    <item msgid="8258927774145391041">"IPSec-VPN med certifikat och dubbel autentisering"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Ingen"</item>
+    <item msgid="1157046369795346308">"Handbok"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Frånkopplad"</item>
+    <item msgid="8754480102834556765">"Initierar..."</item>
+    <item msgid="3351334355574270250">"Ansluter ..."</item>
+    <item msgid="8303882153995748352">"Ansluten"</item>
+    <item msgid="9135049670787351881">"Tidsgräns"</item>
+    <item msgid="2124868417182583926">"Misslyckades"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Fråga"</item>
+    <item msgid="7718817231348607934">"Tillåt aldrig"</item>
+    <item msgid="8184570120217958741">"Tillåt alltid"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Ihållande"</item>
+    <item msgid="167418068739176448">"Toppaktivitet"</item>
+    <item msgid="4760813290195199773">"Viktig (förgrund)"</item>
+    <item msgid="2328684826817647595">"Viktig (bakgrund)"</item>
+    <item msgid="7746406490652867365">"Säkerhetskopiering"</item>
+    <item msgid="5597404364389196754">"Tungvikt"</item>
+    <item msgid="1290888779300174556">"Service (pågående)"</item>
+    <item msgid="7241098542073939046">"Service (startar om)"</item>
+    <item msgid="6610439017684111046">"Mottagare"</item>
+    <item msgid="7367606086319921117">"Hem"</item>
+    <item msgid="3344660712396741826">"Senaste aktivitet"</item>
+    <item msgid="5006559348883303865">"Cachelagrad (aktivitet)"</item>
+    <item msgid="8633480732468137525">"Cachelagrad (aktivitetsklient)"</item>
+    <item msgid="6248998242443333892">"Cachelagrad (tom)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Blågrön"</item>
+    <item msgid="3228505970082457852">"Blå"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Lila"</item>
+    <item msgid="5932337981182999919">"Rosa"</item>
+    <item msgid="5642914536624000094">"Röd"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Äldre än 30 dagar"</item>
+    <item msgid="8699273238891265610">"Äldre än 60 dagar"</item>
+    <item msgid="8346279419423837266">"Äldre än 90 dagar"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Identifiera automatiskt"</item>
+    <item msgid="773943026484148895">"Behandla som nätverk med datapriser"</item>
+    <item msgid="1008268820118852416">"Behandla som nätverk utan datapriser"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Använd slumpgenererad MAC-adress (standard)"</item>
+    <item msgid="214234417308375326">"Använd enhetens MAC-adress"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Nej"</item>
+    <item msgid="1930581185557754880">"Ja"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Mörkt"</item>
+    <item msgid="5079453644557603349">"Ljust"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Inaktiverat"</item>
+    <item msgid="4072198137051566919">"Felsökning"</item>
+    <item msgid="2473005316958868509">"Utförlig"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Endast hemma"</item>
+    <item msgid="1161026694891024702">"Automatisk"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Föredrar GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Endast GSM"</item>
+    <item msgid="8579197487913425819">"Endast WCDMA"</item>
+    <item msgid="8465243227505412498">"Automatiskt GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Automatiskt CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA utan EvDo"</item>
+    <item msgid="7278975240951052041">"Endast EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Globalt"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Endast TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Globalt"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sv/strings.xml b/tests/CarDeveloperOptions/res/values-sv/strings.xml
index b3aac76..df5d7ac 100644
--- a/tests/CarDeveloperOptions/res/values-sv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sv/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Skydda surfplattan med ett skärmlåsalternativ så att den inte går att använda om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktsautentisering. Tryck på Avbryt och ställ sedan in en pinkod eller ett annat skärmlåsalternativ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Skydda enheten med ett skärmlåsalternativ så att den inte går att använda om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktsautentisering. Tryck på Avbryt och ställ sedan in en pinkod eller ett annat skärmlåsalternativ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Skydda mobilen med ett skärmlåsalternativ så att den inte går att använda om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktsautentisering. Tryck på Avbryt och ställ sedan in en pinkod eller ett annat skärmlåsalternativ."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Vill du hoppa över lösenord?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Vill du hoppa över lösenord?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Hoppa över grafiskt lösenord?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ställ in skärmlåset"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil enhet"</item>
+    <item msgid="6007360612667098926">"Endast Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2902,7 +2904,7 @@
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"Samtalshistoriken delas med den här användaren."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"Vill du aktivera telefonsamtal och sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"Samtals- och sms-historiken delas med den här användaren."</string>
-    <string name="emergency_info_title" msgid="1522609271881425375">"Krisinformation"</string>
+    <string name="emergency_info_title" msgid="1522609271881425375">"Nödinformation"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"Information och kontakter för <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="8656739605673756176">"Appar med begränsningar"</string>
@@ -3754,7 +3756,7 @@
     <string name="assist_access_context_title" msgid="2274614501747710439">"Använda text från skärmen"</string>
     <string name="assist_access_context_summary" msgid="5867997494395842785">"Tillåt att assistentappen får åtkomst till innehåll på skärmen, till exempel text"</string>
     <string name="assist_access_screenshot_title" msgid="1991014038776117688">"Använda skärmdump"</string>
-    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Tillåt att assistenappen får åtkomst till en bild på skärmen"</string>
+    <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"Tillåt att assistentappen får åtkomst till en bild på skärmen"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"Lys upp skärmen"</string>
     <string name="assist_flash_summary" msgid="6697095786317559129">"Lys upp skärmens kanter när assistentappen har tillgång till text på skärmen eller på en skärmdump"</string>
     <string name="assist_footer" msgid="7030121180457472165">"Med assistentappar kan du få hjälp som baseras på den information som visas på den aktuella skärmen. Vissa appar har stöd för både översikts- och röstinmatningstjänster som hjälper dig."</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Funktionen gör att den här mobilen fungerar långsammare"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Framtvinga fullständiga GNSS-mätningar"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Spåra alla konstellationer och frekvenser för GNSS utan arbetscykel"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Felsök byte av användare"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Visa ingående information vid byte av användare"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Tillåt att aktiviteter startas i bakgrunden"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Tillåter att aktiviteter startas i bakgrunden"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Visa alltid en dialogruta vid krascher"</string>
diff --git a/tests/CarDeveloperOptions/res/values-sw-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-sw-nokeys/strings.xml
new file mode 100644
index 0000000..0b314c9
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sw-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Simamia programu za kompyuta"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sw/arrays.xml b/tests/CarDeveloperOptions/res/values-sw/arrays.xml
new file mode 100644
index 0000000..1d26443
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-sw/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Marekani"</item>
+    <item msgid="4791956477275129121">"Ulaya"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pasifiki"</item>
+    <item msgid="7044520255415007865">"Zote"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"Sekunde 15"</item>
+    <item msgid="772029947136115322">"Sekunde 30"</item>
+    <item msgid="8743663928349474087">"Dakika 1"</item>
+    <item msgid="1506508631223164814">"Dakika 2"</item>
+    <item msgid="8664703938127907662">"Dakika 5"</item>
+    <item msgid="5827960506924849753">"Dakika 10"</item>
+    <item msgid="6677424950124253938">"Dakika 30"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Isiwahi"</item>
+    <item msgid="2517785806387977252">"Sekunde 15"</item>
+    <item msgid="6347954399441173672">"Sekunde 30"</item>
+    <item msgid="4858305253279921789">"Dakika 1"</item>
+    <item msgid="8109273437140044073">"Dakika 2"</item>
+    <item msgid="2788593551142462622">"Dakika 5"</item>
+    <item msgid="8012672183888404961">"Dakika 10"</item>
+    <item msgid="8271452751594598661">"Dakika 30"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Mara moja"</item>
+    <item msgid="2038544972632026612">"Sekunde 5"</item>
+    <item msgid="5558060663472279597">"Sekunde 15"</item>
+    <item msgid="45341168505452037">"Sekunde 30"</item>
+    <item msgid="227647485917789272">"Dakika 1"</item>
+    <item msgid="3367011891231217504">"Dakika 2"</item>
+    <item msgid="4376575879222393045">"Dakika 5"</item>
+    <item msgid="811192536981678974">"Dakika 10"</item>
+    <item msgid="7258394417241706272">"Dakika 30"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Ndogo"</item>
+    <item msgid="591935967183159581">"Chaguomsingi"</item>
+    <item msgid="1714184661981538355">"Kubwa"</item>
+    <item msgid="6195563047686707484">"Kubwa zaidi"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Inasafisha..."</item>
+    <item msgid="5597394826455877834">"Inaunganisha…"</item>
+    <item msgid="5848277343965362748">"Inahalalisha..."</item>
+    <item msgid="3391238031431440676">"Inapata anwani ya Ip..."</item>
+    <item msgid="5257597310494000224">"Imeunganisha"</item>
+    <item msgid="8472497592913050396">"Imetanguliwa"</item>
+    <item msgid="1228072488815999109">"Inatenganisha..."</item>
+    <item msgid="7253087004422991731">"Haijaunganishwa"</item>
+    <item msgid="4169850917304751227">"Haijafanikiwa"</item>
+    <item msgid="6266658166690831131">"Imezuiwa"</item>
+    <item msgid="4517230805854909775">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Inachuja..."</item>
+    <item msgid="8058143476674427024">"Inaunganisha kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Uhalalishaji kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Kupata anwani ya IP kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">" Umeunganishwa kwa<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Imetanguliwa"</item>
+    <item msgid="4133290864821295785">"inakatisha muunganisho kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Haijaunganishwa"</item>
+    <item msgid="2847316776634969068">"Haijafanikiwa"</item>
+    <item msgid="4390990424746035383">"Imezuiwa"</item>
+    <item msgid="3618248791367063949">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Kichupo cha kusukuma"</item>
+    <item msgid="7401896200768713930">"PIN kutoka kwa kifaa cha rika"</item>
+    <item msgid="4526848028011846710">"Pin kutoka kwa kifaa hiki"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Imeunganisha"</item>
+    <item msgid="983792611851499732">"Umealikwa"</item>
+    <item msgid="5438273405428201793">"Haijafanikiwa"</item>
+    <item msgid="4646663015449312554">"Inapatikana"</item>
+    <item msgid="3230556734162006146">"Nje-ya-eneo"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"Dakika 2"</item>
+    <item msgid="2759776603549270587">"Dakika 5"</item>
+    <item msgid="167772676068860015">"Saa 1"</item>
+    <item msgid="5985477119043628504">"Kamwe muda usiishe"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Tumia Mfumo Chaguomsingi: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Dhaifu"</item>
+    <item msgid="7882129634982603782">"Mbaya"</item>
+    <item msgid="6457357501905996224">"Wastani"</item>
+    <item msgid="405271628162918841">"Thabiti"</item>
+    <item msgid="999948812884919584">"Bora zaidi"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Siku 30 zilizopita"</item>
+    <item msgid="3211287705232736964">"Weka mzunguko wa matumizi..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Muda wa utumiaji"</item>
+    <item msgid="2784401352592276015">"Mara ya mwisho ilipotumika"</item>
+    <item msgid="249854287216326349">"Jina la Programu"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Hakuna"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Hamna"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Hakuna"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Takwimu"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Hakuna"</item>
+    <item msgid="1464741437353223198">"Mwongozo"</item>
+    <item msgid="5793600062487886090">"Uwekaji Seva Mbadala Kiotomatiki"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Hakuna"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP au CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"(haijabainishwa)"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Hamna"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Kifaa cha hifadhi ya ndani"</item>
+    <item msgid="3186681694079967527">"Kadi ya SD inayoondolewa"</item>
+    <item msgid="6902033473986647035">"Wacha mfumo uamue"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Eneo"</item>
+    <item msgid="6842381562497597649">"Ya Kibinafsi"</item>
+    <item msgid="3966700236695683444">"Kutuma ujumbe"</item>
+    <item msgid="8563996233342430477">"media"</item>
+    <item msgid="5323851085993963783">"Kifaa"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"eneo lisilo laini"</item>
+    <item msgid="1830619568689922920">"Eneo bora"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"tetema"</item>
+    <item msgid="8632513128515114092">"soma anwani"</item>
+    <item msgid="3741042113569620272">"rekebisha anwani"</item>
+    <item msgid="4204420969709009931">"soma rajisi ya simu"</item>
+    <item msgid="2260380357119423209">"rekebisha rajisi ya simu"</item>
+    <item msgid="6550710385014530934">"soma kalenda"</item>
+    <item msgid="3575906174264853951">"rekebisha kalenda"</item>
+    <item msgid="4319843242568057174">"uchanganuzi wa wi-fi"</item>
+    <item msgid="2981791890467303819">"arifa"</item>
+    <item msgid="6617825156152476692">"uchanganuzi wa seli"</item>
+    <item msgid="8865260890611559753">"piga simu"</item>
+    <item msgid="3254999273961542982">"soma SMS"</item>
+    <item msgid="7711446453028825171">"andika SMS"</item>
+    <item msgid="6123238544099198034">"pokea SMS"</item>
+    <item msgid="838342167431596036">"pokea SMS za dharura"</item>
+    <item msgid="8554432731560956686">"pokea MMS"</item>
+    <item msgid="7464863464299515059">"pokea msukumo wa WAP"</item>
+    <item msgid="310463075729606765">"tuma SMS"</item>
+    <item msgid="7338021933527689514">"soma SMS za ICC"</item>
+    <item msgid="6130369335466613036">"andika SMS za ICC"</item>
+    <item msgid="6536865581421670942">"rekebisha mipangilio"</item>
+    <item msgid="4547203129183558973">"chora juu"</item>
+    <item msgid="9080347512916542840">"fikia arifa"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"rekodi sauti"</item>
+    <item msgid="9182794235292595296">"cheza sauti"</item>
+    <item msgid="8760743229597702019">"soma ubao wa kunakili"</item>
+    <item msgid="2266923698240538544">"badilisha ubao wa kunakili"</item>
+    <item msgid="1801619438618539275">"vitufe vya vyombo vya habari"</item>
+    <item msgid="31588119965784465">"mkazo wa sauti"</item>
+    <item msgid="7565226799008076833">"sauti kuu"</item>
+    <item msgid="5420704980305018295">"kiwango cha sauti"</item>
+    <item msgid="5797363115508970204">"sauti ya mlio"</item>
+    <item msgid="8233154098550715999">"sauti ya maudhui"</item>
+    <item msgid="5196715605078153950">"sauti ya kengele"</item>
+    <item msgid="394030698764284577">"sauti ya arifa"</item>
+    <item msgid="8952898972491680178">"sauti ya bluetooth"</item>
+    <item msgid="8506227454543690851">"kaa chonjo"</item>
+    <item msgid="1108160036049727420">"fuatilia eneo"</item>
+    <item msgid="1496205959751719491">"fuatilia eneo kuu"</item>
+    <item msgid="3776296279910987380">"pata takwimu za matumizi"</item>
+    <item msgid="8827100324471975602">"zima au uwashe maikrofoni"</item>
+    <item msgid="6880736730520126864">"onyesha utangulizi"</item>
+    <item msgid="4933375960222609935">"maudhui ya mradi"</item>
+    <item msgid="8357907018938895462">"anzisha VPN"</item>
+    <item msgid="8143812849911310973">"mandhari ya kuandikwa"</item>
+    <item msgid="6266277260961066535">"muundo wa mapendekezo"</item>
+    <item msgid="7715498149883482300">"picha ya skrini ya mapendekezo"</item>
+    <item msgid="4046679376726313293">"soma hali ya simu"</item>
+    <item msgid="6329507266039719587">"ongeza ujumbe wa sauti"</item>
+    <item msgid="7692440726415391408">"tumia sip"</item>
+    <item msgid="8572453398128326267">"chakata simu uliyopiga"</item>
+    <item msgid="7775674394089376306">"alama ya kidole"</item>
+    <item msgid="3182815133441738779">"vihisi vya mwili"</item>
+    <item msgid="2793100005496829513">"soma matangazo ya simu"</item>
+    <item msgid="2633626056029384366">"eneo la jaribio"</item>
+    <item msgid="8356842191824684631">"soma hifadhi"</item>
+    <item msgid="5671906070163291500">"andika hifadhi"</item>
+    <item msgid="2791955098549340418">"washa skrini"</item>
+    <item msgid="5599435119609178367">"pata akaunti"</item>
+    <item msgid="1165623660533024666">"tekeleza chini chini"</item>
+    <item msgid="6423861043647911030">"sauti za zana za walio na matatizo ya kuona na kusikia"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Eneo"</item>
+    <item msgid="6656077694190491067">"Eneo"</item>
+    <item msgid="8790228218278477369">"Eneo"</item>
+    <item msgid="7836406246005211990">"Tetema"</item>
+    <item msgid="3951439024549922598">"Soma anwani"</item>
+    <item msgid="8802152411647068">"Rekebisha anwani"</item>
+    <item msgid="229544934599698735">"soma rajisi ya simu"</item>
+    <item msgid="7396102294405899613">"Rekebisha rajisi ya simu"</item>
+    <item msgid="3597797992398484655">"Soma kalenda"</item>
+    <item msgid="2705975774250907343">"Rekebisha kalenda"</item>
+    <item msgid="4668747371441932697">"Eneo"</item>
+    <item msgid="1487578921720243646">"Chapisha arifa"</item>
+    <item msgid="4636080349724146638">"Eneo"</item>
+    <item msgid="673510900286463926">"Piga simu"</item>
+    <item msgid="542083422784609790">"Soma SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Andika SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Pokea SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Pokea SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Pokea SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Pokea SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Tuma SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Soma SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Andika SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Rekebisha mipangilio"</item>
+    <item msgid="8705854389991425629">"Chora juu"</item>
+    <item msgid="5861356020344153651">"Fikia arifa"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Rekodi sauti"</item>
+    <item msgid="4516840825756409490">"Cheza sauti"</item>
+    <item msgid="6811712502798183957">"Soma ubao wa kunakili"</item>
+    <item msgid="2780369012602289114">"Rekebisha ubao wa kunakili"</item>
+    <item msgid="2331359440170850868">"Vitufe vya media"</item>
+    <item msgid="6133599737122751231">"Kotovu cha sauti"</item>
+    <item msgid="6844485713404805301">"Sauti kuu"</item>
+    <item msgid="1600379420669104929">"Kiwango cha sauti"</item>
+    <item msgid="6296768210470214866">"Sauti ya mlio"</item>
+    <item msgid="510690696071629241">"Sauti ya maudhui"</item>
+    <item msgid="406861638631430109">"Sauti ya kengele"</item>
+    <item msgid="4715864795872233884">"Sauti ya arifa"</item>
+    <item msgid="2311478519251301183">"Sauti ya Bluetooth"</item>
+    <item msgid="5133991377896747027">"Weka chonjo"</item>
+    <item msgid="2464189519136248621">"Mahali"</item>
+    <item msgid="2062677934050803037">"Eneo"</item>
+    <item msgid="1735171933192715957">"Pata takwimu za matumizi"</item>
+    <item msgid="1014093788778383554">"Zima ama uwashe maikrofoni"</item>
+    <item msgid="4199297950608622850">"Onyesha utangulizi"</item>
+    <item msgid="2527962435313398821">"Maudhui ya mradi"</item>
+    <item msgid="5117506254221861929">"Anzisha VPN"</item>
+    <item msgid="8291198322681891160">"Mandhari ya kuandikwa"</item>
+    <item msgid="7106921284621230961">"Muundo wa mapendekezo"</item>
+    <item msgid="4496533640894624799">"Picha ya skrini ya mapendekezo"</item>
+    <item msgid="2598847264853993611">"Soma hali ya simu"</item>
+    <item msgid="9215610846802973353">"Ongeza ujumbe wa sauti"</item>
+    <item msgid="9186411956086478261">"Tumia sip"</item>
+    <item msgid="6884763100104539558">"Chakata simu uliyopiga"</item>
+    <item msgid="125513972170580692">"Alama ya kidole"</item>
+    <item msgid="2556071024281275619">"Vihisi vya mwili"</item>
+    <item msgid="617168514928339387">"Soma matangazo ya simu"</item>
+    <item msgid="7134693570516523585">"Eneo la jaribio"</item>
+    <item msgid="7224489175375229399">"Soma hifadhi"</item>
+    <item msgid="8472735063903258202">"Andika hifadhi"</item>
+    <item msgid="4069276819909595110">"Washa skrini"</item>
+    <item msgid="1228338896751121025">"Pata akaunti"</item>
+    <item msgid="3181581793459233672">"Tekeleza chini chini"</item>
+    <item msgid="2340936043025374076">"Sauti ya zana za walio na matatizo ya kuona na kusikia"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Muda mfupi"</item>
+    <item msgid="4816511817309094890">"Wastani"</item>
+    <item msgid="8305084671259331134">"Muda mrefu"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Chaguomsingi"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif iliyofupishwa"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Ya kawaida"</item>
+    <item msgid="4627069151979553527">"Mwandiko ulioviringwa na kuunganishwa"</item>
+    <item msgid="6896773537705206194">"Herufi kubwa zenye umbo ndogo"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Madogo sana"</item>
+    <item msgid="5091603983404027034">"Madogo"</item>
+    <item msgid="176844712416932112">"Kawaida"</item>
+    <item msgid="2784236342175159295">"Kubwa"</item>
+    <item msgid="218913203203160606">"Makubwa sana"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Chaguomsingi"</item>
+    <item msgid="6488643537808152001">"Hakuna"</item>
+    <item msgid="552332815156010137">"Mistari"</item>
+    <item msgid="7187891159463789272">"Angusha kivuli"</item>
+    <item msgid="8019330250538856521">"Iliyoinuliwa"</item>
+    <item msgid="8987385315647049787">"Imepunguzwa"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Tumia programu chaguomsingi"</item>
+    <item msgid="8611890312638868524">"Nyeupe kwenye nyeusi"</item>
+    <item msgid="5891360837786277638">"Nyeusi kwenye nyeupe"</item>
+    <item msgid="2798457065945456853">"Manjano kwenye nyeusi"</item>
+    <item msgid="5799049811524553967">"Manjano kwenye samawati"</item>
+    <item msgid="3673930830658169860">"Maalum"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN na vitufe vilivyoshirikishwa kabla"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN na vyeti"</item>
+    <item msgid="312397853907741968">"IPSec VPN  na vitue vilivyoshirikishwa kabla na uthibitishaji wa Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN  na vieti na uthibitishaji wa Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN  na vieti na uthibitishaji wa hybridi"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Hamna"</item>
+    <item msgid="1157046369795346308">"Mwongozo"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Haijaunganishwa"</item>
+    <item msgid="8754480102834556765">"Inaanza…"</item>
+    <item msgid="3351334355574270250">"Inaunganisha…"</item>
+    <item msgid="8303882153995748352">"Imeunganisha"</item>
+    <item msgid="9135049670787351881">"Muda wa umeisha"</item>
+    <item msgid="2124868417182583926">"Haijafanikiwa"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Uliza"</item>
+    <item msgid="7718817231348607934">"Usiruhusu kamwe"</item>
+    <item msgid="8184570120217958741">"Ruhusu kila wakati"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Endelevu"</item>
+    <item msgid="167418068739176448">"Shughuli maarufu"</item>
+    <item msgid="4760813290195199773">"Muhimu (inatumika sasa)"</item>
+    <item msgid="2328684826817647595">"Muhimu (chinichini)"</item>
+    <item msgid="7746406490652867365">"Hifadhi nakala"</item>
+    <item msgid="5597404364389196754">"Uzito mkubwa"</item>
+    <item msgid="1290888779300174556">"Huduma (inaendesha)"</item>
+    <item msgid="7241098542073939046">"Huduma (inaanzisha tena)"</item>
+    <item msgid="6610439017684111046">"Kipokezi"</item>
+    <item msgid="7367606086319921117">"Mwanzo"</item>
+    <item msgid="3344660712396741826">"Shughuli ya mwisho"</item>
+    <item msgid="5006559348883303865">"Imewekwa akiba (shughuli)"</item>
+    <item msgid="8633480732468137525">"Imewekwa akiba (kiteja cha shughuli)"</item>
+    <item msgid="6248998242443333892">"Imewekwa akiba (tupu)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Kijani"</item>
+    <item msgid="3228505970082457852">"Samawati"</item>
+    <item msgid="6590260735734795647">"Bluu"</item>
+    <item msgid="3521763377357218577">"Zambarau"</item>
+    <item msgid="5932337981182999919">"Waridi"</item>
+    <item msgid="5642914536624000094">"Nyekundu"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Zilizokaa zaidi ya siku 30"</item>
+    <item msgid="8699273238891265610">"Zilizokaa zaidi ya siku 60"</item>
+    <item msgid="8346279419423837266">"Zilizokaa zaidi ya siku 90"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Tambua kiotomatiki"</item>
+    <item msgid="773943026484148895">"Tumia kama mtandao unaopima data"</item>
+    <item msgid="1008268820118852416">"Tumia kama mtandao usiopima data"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Anwani ya MAC bila utaratibu wowote (chaguomsingi)"</item>
+    <item msgid="214234417308375326">"Tumia anwani ya MAC ya kifaa"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Hapana"</item>
+    <item msgid="1930581185557754880">"Ndiyo"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Meusi"</item>
+    <item msgid="5079453644557603349">"Meupe"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Kimezimwa"</item>
+    <item msgid="4072198137051566919">"Tatua"</item>
+    <item msgid="2473005316958868509">"Maneno mengi"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Nyumbani tu"</item>
+    <item msgid="1161026694891024702">"Otomatiki"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"inapendelea GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"GSM pekee"</item>
+    <item msgid="8579197487913425819">"WCDMA pekee"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA otomatiki"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo otomatiki"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo pekee"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Jumla"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA pekee"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Jumla"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-sw/strings.xml b/tests/CarDeveloperOptions/res/values-sw/strings.xml
index b9ac01b..4eceb54 100644
--- a/tests/CarDeveloperOptions/res/values-sw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sw/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Linda kompyuta yako kibao kwa kutumia chaguo la kufunga skrini ili mtu yeyote asiweze kuitumia ikiwa itapotea au kuibiwa. Unahitaji pia chaguo la kufunga skrini ili kuweka mipangilio ya utambuzi wa uso. Gusa Ghairi, kisha weka PIN au uchague mbinu nyingine ya kufunga skrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Linda kifaa chako kwa kutumia chaguo la kufunga skrini ili mtu yeyote asiweze kuitumia ikiwa itapotea au kuibiwa. Unahitaji pia chaguo la kufunga skrini ili kuweka mipangilio ya utambuzi wa uso. Gusa Ghairi, kisha weka PIN au uchague mbinu nyingine ya kufunga skrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Linda simu yako kwa kutumia chaguo la kufunga skrini ili mtu yeyote asiweze kuitumia ikiwa itapotea au kuibiwa. Unahitaji pia chaguo la kufunga skrini ili kuweka mipangilio ya utambuzi wa uso. Gusa Ghairi, kisha weka PIN au uchague mbinu nyingine ya kufunga skrini."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Ungependa kuruka Kuweka PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Ungependa kuruka Kuweka Nenosiri?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Ungependa kuruka Kuweka Mchoro?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Weka mbinu ya kufunga skrini"</string>
@@ -575,7 +574,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="8076921768675948228">"Wastani hadi usalama wa juu"</string>
     <string name="unlock_set_unlock_password_title" msgid="2092949379238466560">"Nenosiri"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7042787631866059147">"Usalama wa juu"</string>
-    <string name="unlock_set_do_later_title" msgid="2939110070503695956">"Siyo sasa"</string>
+    <string name="unlock_set_do_later_title" msgid="2939110070503695956">"Si sasa"</string>
     <string name="current_screen_lock" msgid="398328543694154510">"Mbinu inayotumika kufunga skrini"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="132337696546315927">"Alama ya kidole + Mchoro"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="886426673328906002">"Alama ya kidole + PIN"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mtandao wa simu"</item>
+    <item msgid="6007360612667098926">"Wi-Fi pekee"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1403,9 +1405,9 @@
     <string name="storage_menu_rename" msgid="3731682449294417745">"Badilisha jina"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"Pachika"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"Ondoa"</string>
-    <string name="storage_menu_format" msgid="4285487419855632896">"Umbiza"</string>
-    <string name="storage_menu_format_public" msgid="5361388353980722971">"Umbiza kama hifadhi inayohamishika"</string>
-    <string name="storage_menu_format_private" msgid="5288599205435858720">"Umbiza kama hifadhi ya ndani"</string>
+    <string name="storage_menu_format" msgid="4285487419855632896">"Rekebisha muundo"</string>
+    <string name="storage_menu_format_public" msgid="5361388353980722971">"Weka muundo uwe inahamishika"</string>
+    <string name="storage_menu_format_private" msgid="5288599205435858720">"Weka muundo wa hifadhi ya ndani"</string>
     <string name="storage_menu_migrate" msgid="1885806122515759703">"Hamisha data"</string>
     <string name="storage_menu_forget" msgid="4345021250834642640">"Sahau"</string>
     <string name="storage_menu_set_up" msgid="2849170579745958513">"Weka mipangilio"</string>
@@ -1498,7 +1500,7 @@
     <string name="storage_wizard_init_v2_later" msgid="2605006907172213466">"Weka mipangilio baadaye"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="1884699177320256159">"Ungependa kuumbiza <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_wizard_format_confirm_v2_body" msgid="977657376082074305">"Unatakiwa uratibu <xliff:g id="NAME_0">^1</xliff:g> ili ihifadhi programu, faili na maudhui. \n\nHatua ya kuratibu itafuta maudhui yote yaliyo katika <xliff:g id="NAME_1">^2</xliff:g>. Ili usipoteze maudhui, hifadhi nakala kwenye <xliff:g id="NAME_2">^3</xliff:g> au kifaa kingine."</string>
-    <string name="storage_wizard_format_confirm_v2_action" msgid="5576917958786300415">"Umbiza <xliff:g id="NAME">^1</xliff:g>"</string>
+    <string name="storage_wizard_format_confirm_v2_action" msgid="5576917958786300415">"Rekebisha muundo: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="6728034411587320249">"Utahamishia maudhu kwenye <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="6943007011251294950">"Unaweza kuhamishia faili, maudhui na baadhi ya programu kwenye <xliff:g id="NAME">^1</xliff:g>. \n\nHatua hii itafuta vipengee ili upate nafasi ya <xliff:g id="SIZE">^2</xliff:g> kwenye hifadhi ya kompyuta yako kibao na inaweza kuchukua takribani <xliff:g id="DURATION">^3</xliff:g>."</string>
     <string name="storage_wizard_migrate_v2_body" product="default" msgid="3211214309775524554">"Unaweza kuhamishia faili, maudhui na baadhi ya programu kwenye <xliff:g id="NAME">^1</xliff:g>. \n\nHatua hii itafuta vipengee ili upate nafasi ya <xliff:g id="SIZE">^2</xliff:g> kwenye hifadhi ya simu yako na inaweza kuchukua takribani <xliff:g id="DURATION">^3</xliff:g>."</string>
@@ -2057,7 +2059,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Mkato wa kitufe cha sauti"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Huduma ya njia ya mkato"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Ruhusu kwenye skrini iliyofungwa"</string>
-    <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Ukiwasha njia ya mkato, unaweza kubonyeza vitufe vyote viwili vya sauti kwa sekunde 3 ili uanze kutumia kipengele cha zana za walio na matatizo ya kuona au kusikia."</string>
+    <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Ukiwasha njia ya mkato, unaweza kubonyeza vitufe vyote viwili vya sauti kwa sekunde 3 ili uanze kutumia kipengele cha ufikivu."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Maandishi yenye utofautishaji bora"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Sasisha otomatiki ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"Sasisha ukuzaji wa skrini kwenye mipito ya  programu"</string>
@@ -2154,7 +2156,7 @@
     <string name="captioning_foreground_opacity" msgid="7635639017810117478">"Hali ya kuonekana kwa maandishi"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"Rangi ya ukingo"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"Aina ya kingo"</string>
-    <string name="captioning_typeface" msgid="7893208796949341767">"Jamii ya Fonti"</string>
+    <string name="captioning_typeface" msgid="7893208796949341767">"Makundi ya fonti"</string>
     <string name="captioning_preview_text" msgid="4877753964772618049">"Manukuu yataonekana hivi"</string>
     <string name="captioning_preview_characters" msgid="6469599599352973561">"Aa"</string>
     <string name="locale_default" msgid="910074908458214054">"Chaguomsingi"</string>
@@ -2622,20 +2624,20 @@
     <string name="remove_account_label" msgid="5885425720323823387">"Ondoa akaunti"</string>
     <string name="header_add_an_account" msgid="8482614556580804956">"Ongeza akaunti"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Je, ungependa kuondoa akaunti?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Kuondoa hii akaunti kutafuta mazungumzo yako yote, anwani, na data zingine kutoka kwa kompyuta kibao!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Kuondoa hii akaunti hii kutafuta mazungumzo yako yote, anwani, na data zingine kutoka kwa simu!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data zingine kwenye kompyuta kibao!"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Kuondoa akaunti hii kutafuta mazungumzo yako yote, anwani na data nyingine kwenye simu!"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Kuondoa akaunti hii kutasabibisha kufutwa kwa ujumbe, anwani na data nyingine kwenye kifaa!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Mabadiliko haya hayaruhusiwi na msimamizi wako"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="3467126947262857534">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
-    <string name="enter_password" msgid="2963496904625715235">"Ili uanzishe Android, weka nenosiri lako"</string>
-    <string name="enter_pin" msgid="7140938268709546890">"Ili uanzishe Android, weka PIN yako"</string>
-    <string name="enter_pattern" msgid="1653841963422825336">"Ili uanzishe Android, chora mchoro wako"</string>
+    <string name="enter_password" msgid="2963496904625715235">"Ili uwashe Android, weka nenosiri lako"</string>
+    <string name="enter_pin" msgid="7140938268709546890">"Ili uwashe Android, weka PIN yako"</string>
+    <string name="enter_pattern" msgid="1653841963422825336">"Ili uwashe Android, chora mchoro wako"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="4580105105385125467">"Mchoro huo si sahihi"</string>
     <string name="cryptkeeper_wrong_password" msgid="1709534330303983166">"Nenosiri Lisilo sahihi"</string>
     <string name="cryptkeeper_wrong_pin" msgid="857757190077859245">"Nambari ya PIN si sahihi"</string>
     <string name="checking_decryption" msgid="5927759912073053101">"Inakagua..."</string>
-    <string name="starting_android" msgid="4774187626261253089">"Inaanzisha Android..."</string>
+    <string name="starting_android" msgid="4774187626261253089">"Inawasha Android..."</string>
     <string name="delete" msgid="2325292565700865366">"Futa"</string>
     <string name="misc_files" msgid="1012397035001764693">"Faili Nyinginezo"</string>
     <string name="misc_files_selected_count" msgid="1434146080729502726">"Imechaguliwa <xliff:g id="NUMBER">%1$d</xliff:g> juu ya <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
@@ -2869,7 +2871,7 @@
     <string name="user_setup_dialog_message" msgid="2988559933258353919">"Hakikisha kuwa mtu huyu anaweza kuchukua kifaa na kuweka mapendeleo yake"</string>
     <string name="user_setup_profile_dialog_message" msgid="7611900802824048526">"Ungependa kuweka wasifu sasa?"</string>
     <string name="user_setup_button_setup_now" msgid="4941459406266856176">"Mwongeze sasa"</string>
-    <string name="user_setup_button_setup_later" msgid="6596031428556518752">"Siyo sasa"</string>
+    <string name="user_setup_button_setup_later" msgid="6596031428556518752">"Si sasa"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7108992906553210763">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="915260531390608092">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_add_accounts_message" msgid="5993561303748749097">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
@@ -3095,7 +3097,7 @@
     <string name="keywords_imei_info" msgid="4325847870422053408">"imei, meid, min, toleo la prl, imei sv"</string>
     <string name="keywords_sim_status" msgid="3852088576719874387">"mtandao, hali ya mtandao wa simu, hali ya huduma, uthabiti wa mtandao, aina ya mtandao wa simu, matumizi ya mitandao mingine, iccid"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"nambari ya ufuatiliaji, toleo la maunzi"</string>
-    <string name="keywords_android_version" msgid="4842749998088987740">"kiwango cha rekebisho la usalama wa android, toleo la mitambo ya redio, toleo la kiini"</string>
+    <string name="keywords_android_version" msgid="4842749998088987740">"Usasishaji wa rekebisho la usalama la android, toleo la mitambo ya redio, toleo la kiini"</string>
     <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"mandhari, muepe, meusi, hali"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"programu ya fedha, sms, ruhusa"</string>
     <string name="keywords_systemui_theme" msgid="9150908170417305866">"mandhari meusi"</string>
@@ -3796,7 +3798,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Kuonyeshwa juu ya programu zingine"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Programu"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Onyesha juu ya programu zingine"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Ruhusu programu ionekane juu ya zingine"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Programu ionekane juu ya zingine"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Ruhusu programu hii ionekane juu ya programu zingine unazotumia. Huenda hali hii ikaathiri jinsi unavyotumia programu hizo au kubadilisha jinsi zinavyoonekana au kufanya kazi."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr uhalisia pepe kisikilizaji stereo kisaidizi huduma"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"kidirisha cha arifa ya mfumo huonekana kwenye programu zingine"</string>
@@ -4273,6 +4275,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Kitapunguza kasi ya simu yako"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Lazimisha vipimo vya GNSS kamili"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Fuatilia mikusanyiko na mawimbi yote yasiyo na utendakazi wa GNSS"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Tatua ubadilishaji wa mtumiaji"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Onyesha maelezo ya kina wakati wa kubadilisha mtumiaji"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Iruhusu kuanza shughuli chinichini"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Huruhusu kuanza shughuli zote chinichini"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Onyesha kidirisha cha programu kuacha kufanya kazi kila wakati"</string>
@@ -4315,7 +4319,7 @@
     <string name="battery_suggestion_title" product="device" msgid="765005476863631528">"Boresha muda wa matumizi ya betri ya kifaa"</string>
     <string name="battery_suggestion_title" product="default" msgid="3295786171830183688">"Boresha muda wa matumizi ya betri ya simu yako"</string>
     <string name="battery_suggestion_summary" msgid="2669070349482656490"></string>
-    <string name="gesture_prevent_ringing_screen_title" msgid="4173494225145223638">"Zuia mlio wa simu"</string>
+    <string name="gesture_prevent_ringing_screen_title" msgid="4173494225145223638">"Zuia simu isilie"</string>
     <string name="gesture_prevent_ringing_title" msgid="8827963588425673557">"Bonyeza vitufe vya Kuwasha na Kuongeza Sauti kwa pamoja ili"</string>
     <string name="gesture_prevent_ringing_sound_title" msgid="8642330448721033641">"Njia ya mkato ya kuzuia mlio"</string>
     <string name="prevent_ringing_option_vibrate" msgid="6456505293904544108">"Tetema"</string>
@@ -4498,7 +4502,7 @@
     <string name="media_output_panel_summary_of_playing_device" msgid="7425231720911606911">"Inacheza sasa kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="wfc_disclaimer_title_text" msgid="3245793509743182243">"Maelezo muhimu"</string>
     <string name="wfc_disclaimer_agree_button_text" msgid="4706101805260434404">"ENDELEA"</string>
-    <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"HAPANA, ASANTE"</string>
+    <string name="wfc_disclaimer_disagree_text" msgid="908289420390194127">"HAPANA"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="5696194250838686019">"Eneo"</string>
     <string name="wfc_disclaimer_location_desc_text" msgid="3879710366995108723">"Mtoa huduma wako huenda atachukua eneo lako ili atoe huduma hii.\n\n Tafadhali kagua sera ya faragha ya mtoa huduma wako."</string>
     <string name="forget_passpoint_dialog_message" msgid="3337626966248310367">"Huenda ukapoteza idhini ya kutumia muda au data inayosalia. Wasiliana na mtoa huduma wako kabla hujaondoa."</string>
diff --git a/tests/CarDeveloperOptions/res/values-ta-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ta-nokeys/strings.xml
new file mode 100644
index 0000000..4324c05
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ta-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ஆப்ஸை நிர்வகித்தல்"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ta/arrays.xml b/tests/CarDeveloperOptions/res/values-ta/arrays.xml
new file mode 100644
index 0000000..291f762
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ta/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"அமெரிக்கா"</item>
+    <item msgid="4791956477275129121">"ஐரோப்பா"</item>
+    <item msgid="3812126832016254559">"ஆஃப்ரிக்கா"</item>
+    <item msgid="2765816300353408280">"ஆசியா"</item>
+    <item msgid="6683489385344409742">"ஆஸ்திரேலியா"</item>
+    <item msgid="5194868215515664953">"பசிபிக்"</item>
+    <item msgid="7044520255415007865">"எல்லாம்"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 வினாடிகள்"</item>
+    <item msgid="772029947136115322">"30 விநாடிகள்"</item>
+    <item msgid="8743663928349474087">"1 நிமிடம்"</item>
+    <item msgid="1506508631223164814">"2 நிமிடங்கள்"</item>
+    <item msgid="8664703938127907662">"5 நிமிடங்கள்"</item>
+    <item msgid="5827960506924849753">"10 நிமிடங்கள்"</item>
+    <item msgid="6677424950124253938">"30 நிமிடங்கள்"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"உடனடியாக"</item>
+    <item msgid="2038544972632026612">"5 வினாடிகள்"</item>
+    <item msgid="5558060663472279597">"15 வினாடிகள்"</item>
+    <item msgid="45341168505452037">"30 விநாடிகள்"</item>
+    <item msgid="227647485917789272">"1 நிமிடம்"</item>
+    <item msgid="3367011891231217504">"2 நிமிடங்கள்"</item>
+    <item msgid="4376575879222393045">"5 நிமிடங்கள்"</item>
+    <item msgid="811192536981678974">"10 நிமிடங்கள்"</item>
+    <item msgid="7258394417241706272">"30 நிமிடங்கள்"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"இணைக்கப்பட்டது"</item>
+    <item msgid="983792611851499732">"அழைக்கப்பட்டது"</item>
+    <item msgid="5438273405428201793">"தோல்வி"</item>
+    <item msgid="4646663015449312554">"பயன்படுத்துவதற்குத் தயாராக உள்ளது"</item>
+    <item msgid="3230556734162006146">"எல்லைக்கு வெளியே உள்ளது"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 நிமிடங்கள்"</item>
+    <item msgid="2759776603549270587">"5 நிமிடங்கள்"</item>
+    <item msgid="167772676068860015">"1 மணிநேரம்"</item>
+    <item msgid="5985477119043628504">"காலநேரம் முடிய வேண்டாம்"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"சிஸ்டத்தின் இயல்புநிலையைப் பயன்படுத்து: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"கடந்த 30 நாட்கள்"</item>
+    <item msgid="3211287705232736964">"பயன்பாட்டு சுழற்சியை அமை..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"பயன்படுத்திய நேரம்"</item>
+    <item msgid="2784401352592276015">"கடைசியாகப் பயன்படுத்தியது"</item>
+    <item msgid="249854287216326349">"ஆப்ஸின் பெயர்"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ஏதுமில்லை"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ஏதுமில்லை"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"சிம்"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ஏதுமில்லை"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ஏதுமில்லை"</item>
+    <item msgid="1464741437353223198">"கைமுறை"</item>
+    <item msgid="5793600062487886090">"ப்ராக்ஸி தானியங்கு-உள்ளமைவு"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ஏதுமில்லை"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP அல்லது CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"குறிப்பிடப்படாதது"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ஏதுமில்லை"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"சாதன அகச் சேமிப்பு"</item>
+    <item msgid="3186681694079967527">"அகற்றப்படக்கூடிய SD கார்டு"</item>
+    <item msgid="6902033473986647035">"அமைப்பு தீர்மானிக்கட்டும்"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"இருப்பிடம்"</item>
+    <item msgid="6842381562497597649">"தனிப்பட்டவை"</item>
+    <item msgid="3966700236695683444">"மெசேஜ்"</item>
+    <item msgid="8563996233342430477">"மீடியா"</item>
+    <item msgid="5323851085993963783">"சாதனம்"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"சீரற்ற இருப்பிடம்"</item>
+    <item msgid="1830619568689922920">"சிறந்த இருப்பிடம்"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"அதிர்வு"</item>
+    <item msgid="8632513128515114092">"தொடர்புகளைப் படி"</item>
+    <item msgid="3741042113569620272">"தொடர்புகளை மாற்று"</item>
+    <item msgid="4204420969709009931">"அழைப்புப் பதிவைப் படி"</item>
+    <item msgid="2260380357119423209">"அழைப்புப் பதிவை மாற்று"</item>
+    <item msgid="6550710385014530934">"கேலெண்டரைப் படி"</item>
+    <item msgid="3575906174264853951">"கேலெண்டரை மாற்று"</item>
+    <item msgid="4319843242568057174">"வைஃபை ஸ்கேன்"</item>
+    <item msgid="2981791890467303819">"அறிவிப்பு"</item>
+    <item msgid="6617825156152476692">"கைபேசியை ஸ்கேன் செய்"</item>
+    <item msgid="8865260890611559753">"தொலைபேசியை அழை"</item>
+    <item msgid="3254999273961542982">"SMS படி"</item>
+    <item msgid="7711446453028825171">"SMS எழுது"</item>
+    <item msgid="6123238544099198034">"SMS பெறு"</item>
+    <item msgid="838342167431596036">"அவசரநிலை SMS ஐப் பெறு"</item>
+    <item msgid="8554432731560956686">"MMS பெறு"</item>
+    <item msgid="7464863464299515059">"WAP அறிவிப்பைப் பெறு"</item>
+    <item msgid="310463075729606765">"SMS அனுப்பு"</item>
+    <item msgid="7338021933527689514">"ICC SMS ஐப் படி"</item>
+    <item msgid="6130369335466613036">"ICC SMS எழுது"</item>
+    <item msgid="6536865581421670942">"அமைப்புகளை மாற்று"</item>
+    <item msgid="4547203129183558973">"மேலே வரை"</item>
+    <item msgid="9080347512916542840">"அறிவிப்புகளை அணுகு"</item>
+    <item msgid="5332718516635907742">"கேமரா"</item>
+    <item msgid="6098422447246167852">"ஆடியோவைப் பதிவுசெய்"</item>
+    <item msgid="9182794235292595296">"ஆடியோவை இயக்கு"</item>
+    <item msgid="8760743229597702019">"கிளிப்போர்டைப் படி"</item>
+    <item msgid="2266923698240538544">"கிளிப்போர்ட்டை மாற்று"</item>
+    <item msgid="1801619438618539275">"மீடியா பொத்தான்கள்"</item>
+    <item msgid="31588119965784465">"ஆடியோவை மையப்படுத்து"</item>
+    <item msgid="7565226799008076833">"முதன்மை ஒலியளவு"</item>
+    <item msgid="5420704980305018295">"குரல் ஒலியளவு"</item>
+    <item msgid="5797363115508970204">"அழைப்பு - ஒலியளவு"</item>
+    <item msgid="8233154098550715999">"மீடியாவின் ஒலியளவு"</item>
+    <item msgid="5196715605078153950">"அலாரத்தின் ஒலியளவு"</item>
+    <item msgid="394030698764284577">"அறிவிப்பின் ஒலியளவு"</item>
+    <item msgid="8952898972491680178">"புளூடூத் ஒலியளவு"</item>
+    <item msgid="8506227454543690851">"செயலில்"</item>
+    <item msgid="1108160036049727420">"இருப்பிடத்தைக் கண்காணி"</item>
+    <item msgid="1496205959751719491">"அதிக ஆற்றல் இடத்தைக் கண்காணி"</item>
+    <item msgid="3776296279910987380">"பயன்பாட்டு புள்ளிவிவரத்தைப் பெறுக"</item>
+    <item msgid="8827100324471975602">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
+    <item msgid="6880736730520126864">"டோஸ்ட்டைக் காட்டு"</item>
+    <item msgid="4933375960222609935">"புராஜக்ட் மீடியா"</item>
+    <item msgid="8357907018938895462">"VPNஐ இயக்கு"</item>
+    <item msgid="8143812849911310973">"வால்பேப்பரை எழுது"</item>
+    <item msgid="6266277260961066535">"கட்டமைப்புக்கு உதவு"</item>
+    <item msgid="7715498149883482300">"ஸ்கிரீன்ஷாட்டுக்கு உதவு"</item>
+    <item msgid="4046679376726313293">"ஃபோன் நிலையைப் படி"</item>
+    <item msgid="6329507266039719587">"குரலஞ்சலைச் சேர்"</item>
+    <item msgid="7692440726415391408">"sipஐப் பயன்படுத்து"</item>
+    <item msgid="8572453398128326267">"வெளிச்செல்லும் அழைப்பைச் செயலாக்கு"</item>
+    <item msgid="7775674394089376306">"கைரேகை"</item>
+    <item msgid="3182815133441738779">"உடல் சென்சார்கள்"</item>
+    <item msgid="2793100005496829513">"செல் பிராட்காஸ்ட்களைப் படி"</item>
+    <item msgid="2633626056029384366">"போலியான இருப்பிடம்"</item>
+    <item msgid="8356842191824684631">"சேமிப்பகத்தைப் படி"</item>
+    <item msgid="5671906070163291500">"சேமிப்பகத்தில் எழுது"</item>
+    <item msgid="2791955098549340418">"திரையை இயக்கு"</item>
+    <item msgid="5599435119609178367">"கணக்குகளைப் பெறு"</item>
+    <item msgid="1165623660533024666">"பின்புலத்தில் இயங்கு"</item>
+    <item msgid="6423861043647911030">"அணுகல்தன்மைக்கான ஒலியளவு"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"குறுகியது"</item>
+    <item msgid="4816511817309094890">"நடுத்தர முக்கியத்துவம்"</item>
+    <item msgid="8305084671259331134">"நீளமானது"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"இயல்பு"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif குறுகியது"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"கேஷ்வல்"</item>
+    <item msgid="4627069151979553527">"இணைவெழுத்து முறை"</item>
+    <item msgid="6896773537705206194">"சிறிய எழுத்துகள்"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"இயல்பு"</item>
+    <item msgid="6488643537808152001">"ஏதுமில்லை"</item>
+    <item msgid="552332815156010137">"வெளிக்கோடு"</item>
+    <item msgid="7187891159463789272">"நிழலிடு"</item>
+    <item msgid="8019330250538856521">"மேலெழும்பியது"</item>
+    <item msgid="8987385315647049787">"அழுத்தப்பட்டது"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"பாதுகாப்பு விசைகளுடன் கூடிய L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"சான்றிதழ்களுடன் கூடிய L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"பாதுகாப்பு விசைகள் மற்றும் Xauth அங்கீகாரத்துடனான IPSec VPN"</item>
+    <item msgid="3319427315593649917">"சான்றிதழ்கள் மற்றும் Xauth அங்கீகாரத்துடனான IPSec VPN"</item>
+    <item msgid="8258927774145391041">"சான்றிதழ்கள் மற்றும் கலப்பு அங்கீகாரத்துடனான IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ஏதுமில்லை"</item>
+    <item msgid="1157046369795346308">"கைமுறை"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"கேள்"</item>
+    <item msgid="7718817231348607934">"ஒருபோதும் அனுமதிக்காதே"</item>
+    <item msgid="8184570120217958741">"எப்போதும் அனுமதி"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"தொடர்நிலை"</item>
+    <item msgid="167418068739176448">"அதிக செயல்பாடு"</item>
+    <item msgid="4760813290195199773">"முக்கியம் (முன்புலம்)"</item>
+    <item msgid="2328684826817647595">"முக்கியம் (பின்புலம்)"</item>
+    <item msgid="7746406490652867365">"காப்புப்பிரதி"</item>
+    <item msgid="5597404364389196754">"அதீத பயன்பாடு"</item>
+    <item msgid="1290888779300174556">"சேவை (இயக்கத்தில்)"</item>
+    <item msgid="7241098542073939046">"சேவை (மறுதொடக்கத்தில்)"</item>
+    <item msgid="6610439017684111046">"ரிசீவர்"</item>
+    <item msgid="7367606086319921117">"முகப்பு"</item>
+    <item msgid="3344660712396741826">"குறைந்த செயல்பாடு"</item>
+    <item msgid="5006559348883303865">"தற்காலிகச் சேமிப்பு (செயல்பாடு)"</item>
+    <item msgid="8633480732468137525">"தற்காலிகச் சேமிப்பு (செயல்பாட்டு கிளையண்ட்)"</item>
+    <item msgid="6248998242443333892">"தற்காலிகச் சேமிப்பு (காலி)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"பசும் நீலம்"</item>
+    <item msgid="3228505970082457852">"நீலம்"</item>
+    <item msgid="6590260735734795647">"அடர் நீலம்"</item>
+    <item msgid="3521763377357218577">"ஊதா"</item>
+    <item msgid="5932337981182999919">"பிங்க்"</item>
+    <item msgid="5642914536624000094">"சிவப்பு"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 நாட்களுக்கு மேல்"</item>
+    <item msgid="8699273238891265610">"60 நாட்களுக்கு மேல்"</item>
+    <item msgid="8346279419423837266">"90 நாட்களுக்கு மேல்"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"தானாகக் கண்டறி"</item>
+    <item msgid="773943026484148895">"டேட்டா அளவிடப்பட்டது"</item>
+    <item msgid="1008268820118852416">"டேட்டா அளவிடப்படாதது"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ரேண்டம் MACகைப் பயன்படுத்து (இயல்புநிலை)"</item>
+    <item msgid="214234417308375326">"சாதன MACகைப் பயன்படுத்து"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"வேண்டாம்"</item>
+    <item msgid="1930581185557754880">"ஆம்"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"டார்க்"</item>
+    <item msgid="5079453644557603349">"லைட்"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ஆஃப்"</item>
+    <item msgid="4072198137051566919">"பிழைத்திருத்து"</item>
+    <item msgid="2473005316958868509">"அதிகச் சொற்கள்"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"வீட்டிற்கு மட்டும்"</item>
+    <item msgid="1161026694891024702">"தானியங்கு"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMAக்கு முன்னுரிமை"</item>
+    <item msgid="7581481130337402578">"GSM மட்டும்"</item>
+    <item msgid="8579197487913425819">"WCDMA மட்டும்"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA தானியங்கு"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo தானியங்கு"</item>
+    <item msgid="4219607161971472471">"EvDo இல்லாமல் CDMA"</item>
+    <item msgid="7278975240951052041">"EvDo மட்டும்"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"குளோபல்"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA மட்டும்"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"குளோபல்"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ta/strings.xml b/tests/CarDeveloperOptions/res/values-ta/strings.xml
index 28fbe26..4393875 100644
--- a/tests/CarDeveloperOptions/res/values-ta/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ta/strings.xml
@@ -31,8 +31,8 @@
     <string name="dev_settings_disabled_warning" msgid="3198732189395396721">"முதலில் டெவெலப்பர் விருப்பங்களை இயக்கவும்."</string>
     <string name="header_category_wireless_networks" msgid="8968405993937795898">"வயர்லெஸ் &amp; நெட்வொர்க்குகள்"</string>
     <string name="header_category_system" msgid="4045988717359334410">"சிஸ்டம்"</string>
-    <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"தரவு இணைப்பை இயக்கு"</string>
-    <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"தரவு இணைப்பை முடக்கு"</string>
+    <string name="radio_info_data_connection_enable" msgid="2554249462719717119">"டேட்டா இணைப்பை இயக்கு"</string>
+    <string name="radio_info_data_connection_disable" msgid="2430609627397999371">"டேட்டா இணைப்பை முடக்கு"</string>
     <string name="volte_provisioned_switch_string" msgid="6326756678226686704">"VoLTE ஒதுக்கீட்டுக் கொடி இயக்கத்தில்"</string>
     <string name="vt_provisioned_switch_string" msgid="7458479879009293613">"வீடியோ அழைப்பு அமைக்கப்பட்டது"</string>
     <string name="wfc_provisioned_switch_string" msgid="5446697646596639516">"வைஃபை அழைப்பு அமைக்கப்பட்டது"</string>
@@ -162,7 +162,7 @@
     <string name="bluetooth_map_request" msgid="34345631620551756">"செய்திக்கான அணுகல் கோரிக்கை"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="736507842082640410">"உங்கள் செய்திகளை %1$s அணுக விரும்புகிறது. %2$s க்கு அணுகலை வழங்கவா?"</string>
     <string name="bluetooth_sap_request" msgid="6318039677671263261">"SIM அணுகல் கோரிக்கை"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="1909352413109340355">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் டேட்டா இணைப்பை முடக்கும். <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>க்கு அணுகல் வழங்கவும்"</string>
     <string name="bluetooth_device_name_summary" msgid="8661066392056595005">"பிற சாதனங்களில் “<xliff:g id="DEVICE_NAME">^1</xliff:g>” எனத் தெரியும்"</string>
     <string name="bluetooth_off_footer" msgid="7658444560543730571">"பிற சாதனங்களுடன் இணைக்க, புளூடூத்தை ஆன் செய்யவும்."</string>
     <string name="bluetooth_paired_device_title" msgid="8361860197780425286">"உங்கள் சாதனங்கள்"</string>
@@ -208,11 +208,11 @@
     <string name="proxy_error_empty_port" msgid="8034561724923076215">"நீங்கள் போர்ட் புலத்தை நிரப்ப வேண்டும்."</string>
     <string name="proxy_error_empty_host_set_port" msgid="8471455809508588255">"ஹோஸ்ட் புலம் வெறுமையாக இருந்தால் போர்ட்டின் புலம் வெறுமையாக இருக்க வேண்டும்."</string>
     <string name="proxy_error_invalid_port" msgid="4046559920586100637">"நீங்கள் உள்ளிட்ட போர்ட் தவறானது."</string>
-    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP ப்ராக்ஸியை உலாவி பயன்படுத்தும் ஆனால் பிற பயன்பாடுகள் பயன்படுத்தாமல் போகலாம்."</string>
+    <string name="proxy_warning_limited_support" msgid="9026539134219095768">"HTTP ப்ராக்ஸியை உலாவி பயன்படுத்தும் ஆனால் பிற ஆப்ஸ் பயன்படுத்தாமல் போகலாம்."</string>
     <string name="proxy_url_title" msgid="882042361706435904">"PAC URL: "</string>
     <string name="radio_info_dl_kbps" msgid="2903778264453410272">"DL இணைய வேகம் (kbps):"</string>
     <string name="radio_info_ul_kbps" msgid="3802245899811732716">"UL இணைய வேகம் (kbps):"</string>
-    <string name="radio_info_signal_location_label" msgid="6788144906873498013">"மொபைலின் இருப்பிடத் தகவல் (தடுக்கப்பட்டது):"</string>
+    <string name="radio_info_signal_location_label" msgid="6788144906873498013">"மொபைலின் இருப்பிடத் தகவல் (நிறுத்தப்பட்டது):"</string>
     <string name="radio_info_phy_chan_config" msgid="1184401689381480522">"LTE ஃபிசிக்கல் சேனல் உள்ளமைவு:"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="3557422342215875913">"மொபைல் தகவலின் புதுப்பிப்பு விகிதம்:"</string>
     <string name="radio_info_cellinfo_label" msgid="632796561627452215">"அனைத்து மொபைல் அளவீட்டுத் தகவல்:"</string>
@@ -312,7 +312,7 @@
     <string name="roaming" msgid="8860308342135146004">"ரோமிங்"</string>
     <string name="roaming_enable" msgid="2108142024297441116">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
     <string name="roaming_disable" msgid="1915440242079953809">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
-    <string name="roaming_reenable_message" msgid="8388505868655113258">"உங்களுடைய உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கியுள்ளதால் உங்கள் தரவு இணைப்பை இழந்துவிட்டீர்கள்."</string>
+    <string name="roaming_reenable_message" msgid="8388505868655113258">"உங்களுடைய உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கியுள்ளதால் உங்கள் டேட்டா இணைப்பை இழந்துவிட்டீர்கள்."</string>
     <string name="roaming_turn_it_on_button" msgid="4370846458830537578">"இதை இயக்கவும்"</string>
     <string name="roaming_warning" msgid="5488050911277592868">"கட்டணம் விதிக்கப்படலாம்."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="7090388691615686893">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் பேமெண்ட்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் டேப்லெட் தொலைந்து போனாலோ திருடு போனாலோ வேறுயாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். முக அங்கீகாரத்தை அமைப்பதற்கும் இது தேவைப்படும். வேண்டாம் என்பதைத் தட்டிய பிறகு பின்னை அமைக்கவும் அல்லது வேறொரு திரைப் பூட்டு விருப்பத்தைத் தேர்வுசெய்யவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ வேறுயாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். முக அங்கீகாரத்தை அமைப்பதற்கும் இது தேவைப்படும். வேண்டாம் என்பதைத் தட்டிய பிறகு பின்னை அமைக்கவும் அல்லது வேறொரு திரைப் பூட்டு விருப்பத்தைத் தேர்வுசெய்யவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் மொபைல் தொலைந்து போனாலோ திருடு போனாலோ வேறுயாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். முக அங்கீகாரத்தை அமைப்பதற்கும் இது தேவைப்படும். வேண்டாம் என்பதைத் தட்டிய பிறகு பின்னை அமைக்கவும் அல்லது வேறொரு திரைப் பூட்டு விருப்பத்தைத் தேர்வுசெய்யவும்."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"பின் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"கடவுச்சொல் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"பேட்டர்ன் அமைவைத் தவிர்க்கவா?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"திரைப் பூட்டை அமை"</string>
@@ -510,8 +509,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="2292129135369853167">"டேப்லெட்டை என்க்ரிப்ட் செய்"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="3110852053238357832">"மொபைலை என்க்ரிப்ட் செய்"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="2438498691741626642">"என்க்ரிப்ட் செய்யப்பட்டது"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் டேப்லெட்டை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் டேப்லெட்டை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் மொபைலை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் மொபைலை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="9142792050252407734">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய ஆப்ஸ் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் டேப்லெட்டை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் டேப்லெட்டை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="1996334685607444282">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய ஆப்ஸ் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் மொபைலை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் மொபைலை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="7918671468758813824">"டேப்லெட்டை என்க்ரிப்ட் செய்"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="8737394386627318489">"மொபைலை என்க்ரிப்ட் செய்"</string>
     <string name="crypt_keeper_low_charge_text" msgid="1422879728632636311">"உங்கள் பேட்டரியை சார்ஜ் செய்து மீண்டும் முயற்சிக்கவும்."</string>
@@ -1067,7 +1066,7 @@
     <string name="wifi_hotspot_password_title" msgid="4289338152595154889">"ஹாட்ஸ்பாட் கடவுச்சொல்"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="3485744480410441949">"AP அலைவரிசை"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"மற்ற சாதனங்களுக்கு வைஃபை நெட்வொர்க்கை உருவாக்க, ஹாட்ஸ்பாட்டைப் பயன்படுத்தவும். ஹாட்ஸ்பாட்டானது, மொபைல் டேட்டா இணைப்பைப் பயன்படுத்தி இண்டர்நெட்டை வழங்குகிறது. கூடுதல் மொபைல் டேட்டா பேமெண்ட்கள் விதிக்கப்படலாம்."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, பயன்பாடுகள் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, ஆப்ஸ் ஹாட்ஸ்பாட்டையும் உருவாக்கலாம்."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"ஹாட்ஸ்பாட்டைத் தானாக ஆஃப் செய்"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"சாதனங்கள் எதுவும் இணைக்கப்படவில்லை எனில், வைஃபை ஹாட்ஸ்பாட் ஆஃப் செய்யப்படும்"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"வைஃபை"</item>
+    <item msgid="4421333712484542489">"மொபைல்"</item>
+    <item msgid="6007360612667098926">"வைஃபை மட்டும்"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1234,9 +1236,9 @@
     <string name="wallpaper_settings_title" msgid="347390905813529607">"வால்பேப்பர்"</string>
     <string name="style_and_wallpaper_settings_title" msgid="8898539141152705754">"ஸ்டைல்கள் &amp; வால்பேப்பர்கள்"</string>
     <string name="wallpaper_settings_summary_default" msgid="2626880032742784599">"இயல்பு"</string>
-    <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"தனிப்பயன்"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"பிரத்தியேகம்"</string>
     <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"வால்பேப்பரை மாற்று"</string>
-    <string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"திரையைத் தனிப்பயனாக்கு"</string>
+    <string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"திரையைப் பிரத்தியேகமாக்கு"</string>
     <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"வால்பேப்பர் தேர்வு"</string>
     <string name="screensaver_settings_title" msgid="7720091234133721021">"ஸ்கிரீன் சேவர்"</string>
     <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"சார்ஜ் ஆகும் போது அல்லது சாதனத்தில் இணைந்திருக்கும்போது"</string>
@@ -1257,7 +1259,7 @@
     <string name="doze_title" msgid="235269029233857546">"புதிய அறிவிப்புகள்"</string>
     <string name="doze_summary" msgid="6762274282827831706">"அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
     <string name="doze_always_on_title" msgid="8555184965031789941">"எப்போதும் இயக்கத்தில் வை"</string>
-    <string name="doze_always_on_summary" msgid="7654436900436328950">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைக் காட்டு. அதே நேரத்தில் பேட்டரியை அதிகமாகப் பயன்படுத்தும்."</string>
+    <string name="doze_always_on_summary" msgid="7654436900436328950">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவல்களைக் காட்டும். பேட்டரியை அதிகமாகப் பயன்படுத்தும்."</string>
     <string name="title_font_size" msgid="5021464556860010851">"எழுத்துரு அளவு"</string>
     <string name="short_summary_font_size" msgid="4141077908728522946">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="sim_lock_settings" msgid="1986924650622642189">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -1338,7 +1340,7 @@
     <string name="scanning_status_text_wifi_on_ble_on" msgid="6370507836346838473">"வைஃபைக்கும் புளூடூத்துக்குமான ஸ்கேனிங் ஆன் செய்யப்பட்டுள்ளது"</string>
     <string name="scanning_status_text_wifi_on_ble_off" msgid="8205014713732412608">"வைஃபை ஸ்கேனிங் ஆன் செய்யப்பட்டுள்ளது, புளூடூத் ஸ்கேனிங் ஆஃப் செய்யப்பட்டுள்ளது"</string>
     <string name="scanning_status_text_wifi_off_ble_on" msgid="7400522456303307057">"புளூடூத் ஸ்கேனிங் ஆன் செய்யப்பட்டுள்ளது, வைஃபை ஸ்கேனிங் ஆஃப் செய்யப்பட்டுள்ளது"</string>
-    <string name="scanning_status_text_wifi_off_ble_off" msgid="8575026386237481457">"வைஃபைக்கும் புளூடூத்துக்கமான ஸ்கேனிங் ஆஃப் செய்யப்பட்டுள்ளது"</string>
+    <string name="scanning_status_text_wifi_off_ble_off" msgid="8575026386237481457">"வைஃபைக்கும் புளூடூத்துக்குமான ஸ்கேனிங் ஆஃப் செய்யப்பட்டுள்ளது"</string>
     <string name="status_meid_number" msgid="8756271256760479835">"MEID"</string>
     <string name="status_icc_id" msgid="9191847562997702709">"ICCID"</string>
     <string name="status_data_network_type" msgid="2344720457353394909">"மொபைல் டேட்டா நெட்வொர்க்கின் வகை"</string>
@@ -1384,12 +1386,12 @@
     <string name="sd_format_summary" product="nosdcard" msgid="1179857727779521920">"இசை மற்றும் படங்கள் போன்ற அக USB சேமிப்பிடத்தில் உள்ள எல்லா தரவையும் அழிக்கும்"</string>
     <string name="sd_format_summary" product="default" msgid="4284028411908176234">"இசை மற்றும் படங்கள் போன்ற SD கார்டில் உள்ள எல்லா தரவையும் அழிக்கிறது"</string>
     <string name="memory_clear_cache_title" msgid="4306793268129306684">"தற்காலிகத் தரவை அழிக்கவா?"</string>
-    <string name="memory_clear_cache_message" msgid="6723120398411410031">"இது, எல்லா பயன்பாடுகளின் தற்காலிகச் சேமிப்பு தரவை அழிக்கும்."</string>
+    <string name="memory_clear_cache_message" msgid="6723120398411410031">"இது, எல்லா ஆப்ஸின் தற்காலிகச் சேமிப்பு தரவை அழிக்கும்."</string>
     <string name="mtp_ptp_mode_summary" msgid="6074099855478444183">"MTP அல்லது PTP செயல்பாடு இயக்கத்தில் உள்ளது"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3843209947310774105">"USB சேமிப்பிடத்தை அகற்றவா?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="4400426555375434431">"SD கார்டை அகற்றவா?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"USB சேமிப்பிடத்தை அகற்றிவிட்டால், நீங்கள் பயன்படுத்துகின்ற சில பயன்பாடுகள் நின்றுவிடும், மேலும் நீங்கள் USB சேமிப்பிடத்தை மீண்டும் செருகும்வரை அவை கிடைக்காமல் இருக்கலாம்."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"SD கார்டை அகற்றினால், நீங்கள் பயன்படுத்தும் சில பயன்பாடுகள் நின்றுவிடும், மேலும் SD கார்டை மீண்டும் செருகும் வரை அவை பயன்படுத்த கிடைக்காமல் இருக்கலாம்."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1423648405874813948">"USB சேமிப்பிடத்தை அகற்றிவிட்டால், நீங்கள் பயன்படுத்துகின்ற சில ஆப்ஸ் நின்றுவிடும், மேலும் நீங்கள் USB சேமிப்பிடத்தை மீண்டும் செருகும்வரை அவை கிடைக்காமல் இருக்கலாம்."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="4099391737780732622">"SD கார்டை அகற்றினால், நீங்கள் பயன்படுத்தும் சில ஆப்ஸ் நின்றுவிடும், மேலும் SD கார்டை மீண்டும் செருகும் வரை அவை பயன்படுத்த கிடைக்காமல் இருக்கலாம்."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="3132640848329117857"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4710773826053117136">"USB கார்டை அகற்ற முடியவில்லை. பிறகு முயற்சிக்கவும்."</string>
@@ -1399,7 +1401,7 @@
     <string name="sd_ejecting_title" msgid="595074246815112145">"அகற்றுகிறது"</string>
     <string name="sd_ejecting_summary" msgid="5708943172014003213">"அகற்றுதல் செயலில் உள்ளது"</string>
     <string name="storage_low_title" msgid="6957178208426099592">"சேமிப்பிடம் குறைகிறது"</string>
-    <string name="storage_low_summary" msgid="4475275204869514141">"ஒத்திசைத்தல் போன்ற அமைப்பின் சில செயல்பாடுகள் வேலைசெய்யாமல் போகலாம். பயன்பாடுகள் அல்லது மீடியா உள்ளடக்கம் போன்ற உருப்படிகளை நீக்குதல் அல்லது அகற்றுவதன் மூலம் சேமிப்பிடத்தை காலியாக்க முயற்சிக்கவும்."</string>
+    <string name="storage_low_summary" msgid="4475275204869514141">"ஒத்திசைத்தல் போன்ற அமைப்பின் சில செயல்பாடுகள் வேலைசெய்யாமல் போகலாம். ஆப்ஸ் அல்லது மீடியா உள்ளடக்கம் போன்ற உருப்படிகளை நீக்குதல் அல்லது அகற்றுவதன் மூலம் சேமிப்பிடத்தை காலியாக்க முயற்சிக்கவும்."</string>
     <string name="storage_menu_rename" msgid="3731682449294417745">"மறுபெயரிடு"</string>
     <string name="storage_menu_mount" msgid="6395893560780365473">"பொருத்து"</string>
     <string name="storage_menu_unmount" msgid="5041360076873514189">"வெளியேற்று"</string>
@@ -1419,7 +1421,7 @@
     <string name="usb_ptp_title" msgid="6629335976394685361">"கேமரா (PTP)"</string>
     <string name="usb_ptp_summary" msgid="460425275251168189">"கேமரா மென்பொருளைப் பயன்படுத்தி நீங்கள் படங்களை அனுப்பவும், மேலும் MTP ஆதரிக்காத கணினிகளில் எந்தக் கோப்புகளையும் பரிமாற்றவும் உதவுகிறது."</string>
     <string name="usb_midi_title" msgid="8626512517313340943">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI இயக்கப்பட்ட பயன்பாடுகள், USB மூலம் MIDI மென்பொருளைப் பயன்படுத்தி கணினியில் செயல்பட அனுமதிக்கும்."</string>
+    <string name="usb_midi_summary" msgid="3607444815743771712">"MIDI இயக்கப்பட்ட ஆப்ஸ், USB மூலம் MIDI மென்பொருளைப் பயன்படுத்தி கணினியில் செயல்பட அனுமதிக்கும்."</string>
     <string name="storage_other_users" msgid="1055693465220962928">"பிற பயனர்கள்"</string>
     <string name="storage_internal_title" msgid="7969898703086593200">"சாதனச் சேமிப்பகம்"</string>
     <string name="storage_external_title" msgid="3308178326521953306">"கையடக்கச் சேமிப்பகம்"</string>
@@ -1437,11 +1439,11 @@
     <string name="storage_dialog_unmounted" msgid="515810851912430933">"<xliff:g id="NAME_0">^1</xliff:g> பாதுகாப்பாக வெளியேற்றப்பட்டது, ஆனால் இன்னும் கிடைக்கிறது. \n\n<xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்த, முதலில் அதைச் செருக வேண்டும்."</string>
     <string name="storage_dialog_unmountable" msgid="7082856306456936054">"<xliff:g id="NAME_0">^1</xliff:g> சிதைந்துள்ளது. \n\n<xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்த, முதலில் அதை அமைக்க வேண்டும்."</string>
     <string name="storage_dialog_unsupported" msgid="8274023677580782553">"சாதனம் <xliff:g id="NAME_0">^1</xliff:g>ஐ ஆதரிக்காது. \n\nசாதனத்தில் <xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்த, முதலில் அதை அமைக்க வேண்டும்."</string>
-    <string name="storage_internal_format_details" msgid="2780806013122012384">"மீட்டமைவுக்குப் பிறகு, <xliff:g id="NAME_0">^1</xliff:g>ஐ மற்ற சாதனங்களில் பயன்படுத்தலாம். \n\n<xliff:g id="NAME_1">^1</xliff:g> இல் உள்ள எல்லா தரவும் அழிக்கப்படும். அதனால் முதலில் காப்புப் பிரதி எடுத்துக்கொள்ளவும். \n\n"<b>"படங்கள் &amp; மற்ற மீடியாவைக் காப்புப் பிரதி எடுத்தல்"</b>" \nமீடியா கோப்புகளை சாதனத்தின் மாற்று சேமிப்பகத்திற்கு நகர்த்தவும் அல்லது USB கேபிளைப் பயன்படுத்தி கணினிக்கு மாற்றவும். \n\n"<b>"பயன்பாடுகளின் காப்புப் பிரதி"</b>" \n<xliff:g id="NAME_6">^1</xliff:g> இல் சேமிக்கப்பட்ட எல்லா பயன்பாடுகளும் நிறுவல்நீக்கப்பட்டு அவற்றின் தரவு அழிக்கப்படும். இந்தப் பயன்பாடுகளை வைத்திருக்க, சாதனத்தின் மாற்று சேமிப்பகத்திற்கு அவற்றை நகர்த்தவும்."</string>
-    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"<xliff:g id="NAME_0">^1</xliff:g>ஐ வெளியேற்றும்போது, அதில் சேமித்த பயன்பாடுகள் வேலை செய்யாததுடன், அதில் சேமித்திருந்த மீடியா கோப்புகள் மீண்டும் அதைச் செருகும் வரை கிடைக்காது."</b>" \n\nஇந்தச் சாதனத்தில் மட்டும் வேலை செய்யுமாறு <xliff:g id="NAME_1">^1</xliff:g> மீட்டமைக்கப்பட்டதால் பிற சாதனங்களில் அது வேலை செய்யாது."</string>
-    <string name="storage_internal_forget_details" msgid="5655856574682184453">"<xliff:g id="NAME">^1</xliff:g> இல் உள்ள பயன்பாடுகள், படங்கள் அல்லது தரவைப் பயன்படுத்த, அதை மீண்டும் செருகவும். \n\nசாதனம் இல்லையெனில், இந்தச் சேமிப்பகத்தை அகற்றிவிடவும். \n\nஅவ்வாறு அகற்றினால், அதிலுள்ள தரவு இனி கிடைக்காது. \n\nபயன்பாடுகளை மீண்டும் நிறுவிக்கொள்ளலாம், எனினும் அவற்றின் தரவு மீண்டும் கிடைக்காது."</string>
+    <string name="storage_internal_format_details" msgid="2780806013122012384">"மீட்டமைவுக்குப் பிறகு, <xliff:g id="NAME_0">^1</xliff:g>ஐ மற்ற சாதனங்களில் பயன்படுத்தலாம். \n\n<xliff:g id="NAME_1">^1</xliff:g> இல் உள்ள எல்லா தரவும் அழிக்கப்படும். அதனால் முதலில் காப்புப் பிரதி எடுத்துக்கொள்ளவும். \n\n"<b>"படங்கள் &amp; மற்ற மீடியாவைக் காப்புப் பிரதி எடுத்தல்"</b>" \nமீடியா கோப்புகளை சாதனத்தின் மாற்று சேமிப்பகத்திற்கு நகர்த்தவும் அல்லது USB கேபிளைப் பயன்படுத்தி கணினிக்கு மாற்றவும். \n\n"<b>"ஆப்ஸின் காப்புப் பிரதி"</b>" \n<xliff:g id="NAME_6">^1</xliff:g> இல் சேமிக்கப்பட்ட எல்லா பயன்பாடுகளும் நிறுவல்நீக்கப்பட்டு அவற்றின் தரவு அழிக்கப்படும். இந்த ஆப்ஸை வைத்திருக்க, சாதனத்தின் மாற்று சேமிப்பகத்திற்கு அவற்றை நகர்த்தவும்."</string>
+    <string name="storage_internal_unmount_details" msgid="4667435317528624039"><b>"<xliff:g id="NAME_0">^1</xliff:g>ஐ வெளியேற்றும்போது, அதில் சேமித்த ஆப்ஸ் வேலை செய்யாததுடன், அதில் சேமித்திருந்த மீடியா கோப்புகள் மீண்டும் அதைச் செருகும் வரை கிடைக்காது."</b>" \n\nஇந்தச் சாதனத்தில் மட்டும் வேலை செய்யுமாறு <xliff:g id="NAME_1">^1</xliff:g> மீட்டமைக்கப்பட்டதால் பிற சாதனங்களில் அது வேலை செய்யாது."</string>
+    <string name="storage_internal_forget_details" msgid="5655856574682184453">"<xliff:g id="NAME">^1</xliff:g> இல் உள்ள ஆப்ஸ், படங்கள் அல்லது தரவைப் பயன்படுத்த, அதை மீண்டும் செருகவும். \n\nசாதனம் இல்லையெனில், இந்தச் சேமிப்பகத்தை அகற்றிவிடவும். \n\nஅவ்வாறு அகற்றினால், அதிலுள்ள தரவு இனி கிடைக்காது. \n\nஆப்ஸை மீண்டும் நிறுவிக்கொள்ளலாம், எனினும் அவற்றின் தரவு மீண்டும் கிடைக்காது."</string>
     <string name="storage_internal_forget_confirm_title" msgid="331032276130605241">"<xliff:g id="NAME">^1</xliff:g>ஐ அகற்றவா?"</string>
-    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து பயன்பாடுகள், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
+    <string name="storage_internal_forget_confirm" msgid="3052483375203727176">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து ஆப்ஸ், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
     <string name="storage_detail_apps" msgid="8154648512504196820">"ஆப்ஸ்"</string>
     <string name="storage_detail_images" msgid="6996202225684468964">"படங்கள்"</string>
     <string name="storage_detail_videos" msgid="6030983354721080849">"வீடியோக்கள்"</string>
@@ -1452,7 +1454,7 @@
     <string name="storage_detail_explore" msgid="8206900269596580264">"<xliff:g id="NAME">^1</xliff:g> இல் உலாவு"</string>
     <string name="storage_detail_dialog_other" msgid="5073511663616043370">"ஆப்ஸ் சேமித்துள்ள பகிர்ந்த ஃபைல்கள், இண்டர்நெட் அல்லது புளூடூத் மூலம் பதிவிறக்கிய ஃபைல்கள், Android ஃபைல்கள் போன்றவை மற்ற ஃபைல்களில் அடங்கும். \n\n<xliff:g id="NAME">^1</xliff:g> இல் தெரியக்கூடிய உள்ளடக்கத்தைப் பார்க்க, ’உலாவு’ என்பதைத் தட்டவும்."</string>
     <string name="storage_detail_dialog_system" msgid="1472572861360014226">"Android <xliff:g id="VERSION">%s</xliff:g> பதிப்பை இயக்குவதற்குப் பயன்படுத்தப்படும் ஃபைல்களும் இயங்குதளத்தில் அடங்கும்"</string>
-    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> சேமிப்பகத்தின் <xliff:g id="SIZE">^2</xliff:g> அளவைப் பயன்படுத்தி, படங்கள், இசை, பயன்பாடுகள் அல்லது பிற தரவைச் சேமித்திருக்கலாம். \n\nவிவரங்களைப் பார்க்க, <xliff:g id="USER_1">^1</xliff:g>க்கு மாறவும்."</string>
+    <string name="storage_detail_dialog_user" msgid="1663117417635010371">"<xliff:g id="USER_0">^1</xliff:g> சேமிப்பகத்தின் <xliff:g id="SIZE">^2</xliff:g> அளவைப் பயன்படுத்தி, படங்கள், இசை, ஆப்ஸ் அல்லது பிற தரவைச் சேமித்திருக்கலாம். \n\nவிவரங்களைப் பார்க்க, <xliff:g id="USER_1">^1</xliff:g>க்கு மாறவும்."</string>
     <string name="storage_wizard_init_title" msgid="3407283236421089014">"<xliff:g id="NAME">^1</xliff:g>ஐ அமைக்கவும்"</string>
     <string name="storage_wizard_init_external_title" msgid="6853250619674645478">"கையடக்க சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
     <string name="storage_wizard_init_external_summary" msgid="6993815290050489327">"சாதனங்களுக்கிடையே படங்களையும் பிற மீடியாவையும் நகர்த்தலாம்."</string>
@@ -1466,14 +1468,14 @@
     <string name="storage_wizard_format_progress_title" msgid="6905902731208646436">"<xliff:g id="NAME">^1</xliff:g> வடிவமைக்கப்படுகிறது"</string>
     <string name="storage_wizard_format_progress_body" msgid="5346709539457190419">"<xliff:g id="NAME">^1</xliff:g> ஃபார்மேட் செய்யப்படும்போது அகற்ற வேண்டாம்."</string>
     <string name="storage_wizard_migrate_title" msgid="7440473364104826496">"புதிய சேமிப்பகத்திற்கு நகர்த்துக"</string>
-    <string name="storage_wizard_migrate_body" msgid="4959356431201831339">"படங்கள், கோப்புகள் மற்றும் சில பயன்பாடுகளை புதிய <xliff:g id="NAME">^1</xliff:g>க்கு நகர்த்தலாம். \n\nநகர்த்துவதற்கு <xliff:g id="TIME">^2</xliff:g> ஆகும், மேலும் அகச் சேமிப்பகத்தில் <xliff:g id="SIZE">^3</xliff:g> இடத்தைக் காலிசெய்யும். இந்தச் செயல்பாட்டின் போது, சில பயன்பாடுகள் இயங்காது."</string>
+    <string name="storage_wizard_migrate_body" msgid="4959356431201831339">"படங்கள், கோப்புகள் மற்றும் சில ஆப்ஸை புதிய <xliff:g id="NAME">^1</xliff:g>க்கு நகர்த்தலாம். \n\nநகர்த்துவதற்கு <xliff:g id="TIME">^2</xliff:g> ஆகும், மேலும் அகச் சேமிப்பகத்தில் <xliff:g id="SIZE">^3</xliff:g> இடத்தைக் காலிசெய்யும். இந்தச் செயல்பாட்டின் போது, சில ஆப்ஸ் இயங்காது."</string>
     <string name="storage_wizard_migrate_now" msgid="9004605853000689024">"இப்போதே நகர்த்தவும்"</string>
     <string name="storage_wizard_migrate_later" msgid="5303070653970922924">"பிறகு நகர்த்தவும்"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="5768497751644935313">"தரவை நகர்த்தவும்"</string>
     <string name="storage_wizard_migrate_confirm_body" msgid="7297723787416643076"><b>"நகர்த்துவதற்கு <xliff:g id="TIME">^1</xliff:g> ஆகலாம். இதனால் <xliff:g id="NAME">^3</xliff:g> இல் <xliff:g id="SIZE">^2</xliff:g> அளவு சேமிப்பகம் கிடைக்கும்."</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="6539804689462991087">"நகர்த்து"</string>
     <string name="storage_wizard_migrate_progress_title" msgid="7542196688665109833">"தரவு நகர்த்தப்படுகிறது…"</string>
-    <string name="storage_wizard_migrate_details" msgid="4269509141637554985">"நகர்த்தும்போது: \n• <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n• சில பயன்பாடுகள் சரியாக வேலை செய்யாது. \n• சாதனம் சார்ஜ் செய்யப்பட்டிருக்க வேண்டும்."</string>
+    <string name="storage_wizard_migrate_details" msgid="4269509141637554985">"நகர்த்தும்போது: \n• <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n• சில ஆப்ஸ் சரியாக வேலை செய்யாது. \n• சாதனம் சார்ஜ் செய்யப்பட்டிருக்க வேண்டும்."</string>
     <string name="storage_wizard_ready_title" msgid="4905921139763520341">"<xliff:g id="NAME">^1</xliff:g> பயன்படுத்துவதற்குத் தயார்"</string>
     <string name="storage_wizard_ready_external_body" msgid="8785407468656286236">"<xliff:g id="NAME">^1</xliff:g> படங்களையும் பிற மீடியாவையும் பயன்படுத்த, தயாராக உள்ளது."</string>
     <string name="storage_wizard_ready_internal_body" msgid="2258287496678469217">"புதிய <xliff:g id="NAME">^1</xliff:g> வேலை செய்கிறது. \n\nசாதனத்திற்கு படங்கள், கோப்புகள், ஆப்ஸ் டேட்டாவை நகர்த்த, அமைப்புகள் &gt; சேமிப்பகம் என்பதற்குச் செல்லவும்."</string>
@@ -1483,7 +1485,7 @@
     <string name="storage_wizard_move_progress_title" msgid="5250929161803336592">"<xliff:g id="APP">^1</xliff:g> நகர்த்தப்படுகிறது…"</string>
     <string name="storage_wizard_move_progress_body" msgid="1713792142250410169">"நகர்த்தும்போது <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n\nநகர்த்தி முடிக்கும்வரை, சாதனத்தில் <xliff:g id="APP">^2</xliff:g> ஆப்ஸ் கிடைக்காது."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="9047521329704060401">"நகர்த்துவதை ரத்துசெய்"</string>
-    <string name="storage_wizard_slow_body" msgid="2307974936036261069">"இந்த <xliff:g id="NAME_0">^1</xliff:g> வேகம் குறைவானது போல் தெரிகிறது. \n\nநீங்கள் தொடரலாம், இந்த இடத்திற்கு நகர்த்தப்பட்ட பயன்பாடுகள் தடங்கல்களுடன் இயங்கலாம் மற்றும் தரவைப் பரிமாற்றுவதற்கு அதிக நேரம் எடுக்கலாம். \n\nசிறந்த செயல்திறனுக்கு, வேகமான <xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்தவும்."</string>
+    <string name="storage_wizard_slow_body" msgid="2307974936036261069">"இந்த <xliff:g id="NAME_0">^1</xliff:g> வேகம் குறைவானது போல் தெரிகிறது. \n\nநீங்கள் தொடரலாம், இந்த இடத்திற்கு நகர்த்தப்பட்ட ஆப்ஸ் தடங்கல்களுடன் இயங்கலாம் மற்றும் தரவைப் பரிமாற்றுவதற்கு அதிக நேரம் எடுக்கலாம். \n\nசிறந்த செயல்திறனுக்கு, வேகமான <xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்தவும்."</string>
     <string name="storage_wizard_init_v2_title" msgid="7408910177547901960">"<xliff:g id="NAME">^1</xliff:g>ஐ எப்படிப் பயன்படுத்துவீர்கள்?"</string>
     <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="7948795312504302810">"கூடுதல் டேப்லெட் சேமிப்பகம் உபயோகி"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6237770506398410172">"இந்த டேப்லெட்டில் உள்ள ஆப்ஸ், ஃபைல்கள் &amp; மீடியாவிற்கு மட்டும்"</string>
@@ -1660,18 +1662,18 @@
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"பணிக் கணக்கிற்கான இருப்பிடச் சேவைகள்"</string>
     <string name="location_network_based" msgid="1535812159327454835">"வைஃபை &amp; மொபைல் நெட்வொர்க்கின் இருப்பிடம்"</string>
-    <string name="location_neighborhood_level" msgid="8459352741296587916">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் பயன்பாடுகள், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
+    <string name="location_neighborhood_level" msgid="8459352741296587916">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் ஆப்ஸ், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
     <string name="location_neighborhood_level_wifi" msgid="6120133551482003840">"வைஃபை மூலம் இருப்பிடம் கண்டறியப்பட்டது"</string>
     <string name="location_gps" msgid="688049341158297763">"GPS சாட்டிலைட்டுகள்"</string>
-    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"உங்கள் இருப்பிடத்தைக் குறிப்பதற்காக, பயன்பாடுகள் உங்கள் டேப்லெட்டில் GPS ஐப் பயன்படுத்தும்"</string>
-    <string name="location_street_level" product="default" msgid="7407688345675450051">"உங்கள் இருப்பிடத்தைக் குறிப்பதற்காக, பயன்பாடுகள் உங்கள் தொலைபேசியில் GPS ஐப் பயன்படுத்தும்"</string>
+    <string name="location_street_level" product="tablet" msgid="4459804798444296650">"உங்கள் இருப்பிடத்தைக் குறிப்பதற்காக, ஆப்ஸ் உங்கள் டேப்லெட்டில் GPS ஐப் பயன்படுத்தும்"</string>
+    <string name="location_street_level" product="default" msgid="7407688345675450051">"உங்கள் இருப்பிடத்தைக் குறிப்பதற்காக, ஆப்ஸ் உங்கள் தொலைபேசியில் GPS ஐப் பயன்படுத்தும்"</string>
     <string name="assisted_gps" msgid="5411780261117055175">"துணை GPS ஐப் பயன்படுத்து"</string>
     <string name="assisted_gps_enabled" msgid="2561022181775725369">"GPS க்கு உதவ, சேவையகத்தைப் பயன்படுத்து (நெட்வொர்க் பயன்பாட்டைக் குறைக்க, தேர்வுநீக்கு)"</string>
     <string name="assisted_gps_disabled" msgid="6448758788217415937">"GPS க்கு உதவ, சேவையகத்தைப் பயன்படுத்து (GPS செயல்திறனை மேம்படுத்த தேர்வுநீக்கு)"</string>
     <string name="use_location_title" msgid="7724788634359496634">"இருப்பிடம் &amp; Google தேடல்"</string>
     <string name="use_location_summary" msgid="7396716606067400283">"தேடல் முடிவுகள் மற்றும் பிற சேவைகளை மேம்படுத்துவதற்காக Google உங்கள் இருப்பிடத்தைப் பயன்படுத்தும்"</string>
     <string name="location_access_title" msgid="8587974819606800029">"எனது இருப்பிடத்திற்கான அணுகல்"</string>
-    <string name="location_access_summary" msgid="6919495149026354355">"உங்கள் அனுமதியைக் கேட்ட பயன்பாடுகள் உங்களின் இருப்பிடத் தகவலைப் பயன்படுத்தும்"</string>
+    <string name="location_access_summary" msgid="6919495149026354355">"உங்கள் அனுமதியைக் கேட்ட ஆப்ஸ் உங்களின் இருப்பிடத் தகவலைப் பயன்படுத்தும்"</string>
     <string name="location_sources_heading" msgid="8526658357120282741">"இருப்பிட ஆதாரங்கள்"</string>
     <string name="about_settings" product="tablet" msgid="4869626690708456341">"டேப்லெட் அறிமுகம்"</string>
     <string name="about_settings" product="default" msgid="6019547763377294261">"மொபைல் விவரம்"</string>
@@ -1777,17 +1779,17 @@
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="888942752619181804">"ஒரே பூட்டைப் பயன்படுத்து"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8046452284593057185">"ஒரே பூட்டைப் பயன்படுத்து"</string>
     <string name="lock_settings_profile_unified_summary" msgid="5347244550751740962">"சாதனத் திரைப் பூட்டைப் போன்றது"</string>
-    <string name="manageapplications_settings_title" msgid="6876782217962262376">"பயன்பாடுகளை நிர்வகி"</string>
-    <string name="manageapplications_settings_summary" msgid="5092964799412478962">"நிறுவப்பட்ட பயன்பாடுகளை நிர்வகி மற்றும் அகற்று"</string>
+    <string name="manageapplications_settings_title" msgid="6876782217962262376">"ஆப்ஸை நிர்வகி"</string>
+    <string name="manageapplications_settings_summary" msgid="5092964799412478962">"நிறுவப்பட்ட ஆப்ஸை நிர்வகி மற்றும் அகற்று"</string>
     <string name="applications_settings" msgid="368331725658793179">"ஆப்ஸ் தகவல்"</string>
     <string name="applications_settings_summary" msgid="8888258399577123906">"அமைப்புகளை நிர்வகிக்கும், விரைவு துவக்கத்திற்கான குறுக்குவழிகளை அமைக்கும்"</string>
     <string name="applications_settings_header" msgid="3766501606045211098">"ஆப்ஸ் அமைப்பு"</string>
     <string name="install_applications" msgid="7745902974984889179">"அறியப்படாத மூலங்கள்"</string>
-    <string name="install_applications_title" msgid="8164828577588659496">"எல்லா பயன்பாட்டு ஆதாரங்களையும் அனுமதி"</string>
+    <string name="install_applications_title" msgid="8164828577588659496">"எல்லா ஆப்ஸ் ஆதாரங்களையும் அனுமதி"</string>
     <string name="recent_app_category_title" msgid="7688788038277126727">"சமீபத்தில் திறந்தவை"</string>
     <string name="see_all_apps_title" msgid="6435061912110347474">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகளையும் காட்டு"</string>
-    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"அறியப்படாத பயன்பாடுகளால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
-    <string name="install_all_warning" product="default" msgid="7445839116997296358">"அறியப்படாத பயன்பாடுககளால் உங்கள் மொபைலும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து பயன்பாடுகளை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் மொபைலுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
+    <string name="install_all_warning" product="tablet" msgid="4580699862358542727">"அறியப்படாத ஆப்ஸால் உங்கள் டேப்லெட்டும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் டேப்லெட்டுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
+    <string name="install_all_warning" product="default" msgid="7445839116997296358">"அறியப்படாத பயன்பாடுககளால் உங்கள் மொபைலும் தனிப்பட்ட தரவும் அதிகம் பாதிப்பிற்கு உள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவுவதால், அவற்றைப் பயன்படுத்தும் போது உங்கள் மொபைலுக்கு ஏதேனும் சேதம் ஏற்பட்டாலோ அல்லது தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="install_all_warning" product="device" msgid="9141585291103603515">"அறியப்படாத ஆப்ஸால் உங்கள் சாதனம் மற்றும் தனிப்பட்ட தரவு மிக எளிதாகப் பாதிப்புக்குள்ளாகும். இந்த மூலத்திலிருந்து ஆப்ஸை நிறுவி, பயன்படுத்தும்போது, உங்கள் சாதனத்திற்கு ஏதேனும் சேதம் ஏற்பட்டாலோ தரவை இழந்தாலோ, அதற்கு நீங்கள்தான் பொறுப்பாவீர்கள் என்பதை ஏற்கிறீர்கள்."</string>
     <string name="advanced_settings" msgid="6282069364060968122">"மேம்பட்ட அமைப்பு"</string>
     <string name="advanced_settings_summary" msgid="5912237062506771716">"மேலும் அமைப்பு விருப்பங்களை இயக்கு"</string>
@@ -1843,7 +1845,7 @@
     <string name="filter" msgid="2426943916212457962">"வடிகட்டு"</string>
     <string name="filter_dlg_title" msgid="115313222190512670">"வடிப்பான் விருப்பங்களைத் தேர்வுசெய்யவும்"</string>
     <string name="filter_apps_all" msgid="3938077534861382701">"எல்லாப் பயன்பாடுகளும்"</string>
-    <string name="filter_apps_disabled" msgid="5394488790555678117">"முடக்கிய பயன்பாடுகள்"</string>
+    <string name="filter_apps_disabled" msgid="5394488790555678117">"முடக்கிய ஆப்ஸ்"</string>
     <string name="filter_apps_third_party" msgid="3985794876813232322">"பதிவிறக்கப்பட்டது"</string>
     <string name="filter_apps_running" msgid="6852975378502426359">"இயங்குகிறது"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="3501701148760911442">"USB சேமிப்பகம்"</string>
@@ -1889,13 +1891,13 @@
     <string name="instant_app_details_summary" msgid="6384264315914966114">"<xliff:g id="APP_STORE">%1$s</xliff:g> பற்றிய கூடுதல் தகவல்"</string>
     <string name="app_ops_running" msgid="6378418969742957805">"இயங்குகிறது"</string>
     <string name="app_ops_never_used" msgid="8305262378162525813">"(ஒருபோதும் பயன்படுத்தவில்லை)"</string>
-    <string name="no_default_apps" msgid="4519038578011412532">"இயல்பு பயன்பாடுகள் இல்லை."</string>
+    <string name="no_default_apps" msgid="4519038578011412532">"இயல்பு ஆப்ஸ் இல்லை."</string>
     <string name="storageuse_settings_title" msgid="3390798597982116048">"சேமிப்பிடத்தின் பயன்பாடு"</string>
-    <string name="storageuse_settings_summary" msgid="3013328092465903687">"பயன்பாடுகள் பயன்படுத்திய சேமிப்பிடத்தைக் காட்டு"</string>
+    <string name="storageuse_settings_summary" msgid="3013328092465903687">"ஆப்ஸ் பயன்படுத்திய சேமிப்பிடத்தைக் காட்டு"</string>
     <string name="service_restarting" msgid="1190995225643385568">"மீண்டும் தொடங்குகிறது"</string>
     <string name="cached" msgid="4019482949725020855">"தற்காலிகச் சேமிப்பின் பின்புலச் செயல்முறை"</string>
     <string name="no_running_services" msgid="618823924559385173">"எதுவும் இயக்கத்தில் இல்லை."</string>
-    <string name="service_started_by_app" msgid="6906027340122215035">"பயன்பாட்டால் தொடங்கப்பட்டது."</string>
+    <string name="service_started_by_app" msgid="6906027340122215035">"ஆப்ஸால் தொடங்கப்பட்டது."</string>
     <!-- no translation found for service_client_name (7083258170099389413) -->
     <skip />
     <string name="service_background_processes" msgid="2678557055039755445">"<xliff:g id="MEMORY">%1$s</xliff:g> மீதமுள்ளது"</string>
@@ -1923,9 +1925,9 @@
     <string name="runningservicedetails_processes_title" msgid="5496507383850423763">"செயல்கள்"</string>
     <string name="service_stop" msgid="8812777462903125191">"நிறுத்து"</string>
     <string name="service_manage" msgid="7045214643721276662">"அமைப்பு"</string>
-    <string name="service_stop_description" msgid="4184180745938573707">"இந்த ஆப்ஸ் ஏற்கனவே இதன் பயன்பாட்டால் தொடங்கப்பட்டது. இதை நிறுத்துவதால் ஆப்ஸ் தோல்வியடையலாம்."</string>
+    <string name="service_stop_description" msgid="4184180745938573707">"இந்த ஆப்ஸ் ஏற்கனவே இதன் ஆப்ஸால் தொடங்கப்பட்டது. இதை நிறுத்துவதால் ஆப்ஸ் தோல்வியடையலாம்."</string>
     <string name="heavy_weight_stop_description" msgid="7444148811046611463">"பயன்பாட்டைப் பாதுகாப்பாக நிறுத்த முடியாது. இதை நிறுத்தினால், நீங்கள் நடப்பு செயல்கள் சிலவற்றை இழக்க நேரிடலாம்."</string>
-    <string name="background_process_stop_description" msgid="8971810208873038109">"இது பழைய பயன்பாட்டு செயல்முறையாகும், மீண்டும் தேவைப்பட்டால் வழங்குவதற்காக இன்னமும் தொடர்ந்து செயல்படுத்தப்படுகிறது. பொதுவாக அதை நிறுத்துவதற்கு எந்தக் காரணமும் இல்லை."</string>
+    <string name="background_process_stop_description" msgid="8971810208873038109">"இது பழைய ஆப்ஸ் செயல்முறையாகும், மீண்டும் தேவைப்பட்டால் வழங்குவதற்காக இன்னமும் தொடர்ந்து செயல்படுத்தப்படுகிறது. பொதுவாக அதை நிறுத்துவதற்கு எந்தக் காரணமும் இல்லை."</string>
     <string name="service_manage_description" msgid="8058123524402833082">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: தற்போது பயன்பாட்டில் உள்ளது. அதைக் கட்டுப்படுத்த, அமைப்புகளைத் தட்டவும்."</string>
     <string name="main_running_process_description" msgid="7733268956566861797">"முக்கிய செயல்முறை பயன்பாட்டில் உள்ளது."</string>
     <string name="process_service_in_use_description" msgid="2253782391122637651">"<xliff:g id="COMP_NAME">%1$s</xliff:g> இன் சேவை பயன்பாட்டில் உள்ளது."</string>
@@ -2038,7 +2040,7 @@
     <string name="display_category_title" msgid="545168481672250195">"திரை அமைப்பு"</string>
     <string name="interaction_control_category_title" msgid="8775039211811947683">"ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="user_installed_services_category_title" msgid="4288689493753221319">"பதிவிறக்கிய சேவைகள்"</string>
-    <string name="experimental_category_title" msgid="3797000069740110717">"சோதனை முயற்சி"</string>
+    <string name="experimental_category_title" msgid="3797000069740110717">"பரிசோதனை முயற்சி"</string>
     <string name="feature_flags_dashboard_title" msgid="3153034144122754381">"அம்சங்களை மாற்றுதல்"</string>
     <string name="talkback_title" msgid="3717960404234260050">"Talkback"</string>
     <string name="talkback_summary" msgid="6602857105831641574">"திரைப் படிப்பான் முக்கியமாக பார்வையற்றோர் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக வடிவமைக்கப்பட்டது"</string>
@@ -2060,7 +2062,7 @@
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"ஷார்ட்கட் இயக்கப்பட்டிருக்கும் போது, அணுகல்தன்மை அம்சத்தைத் தொடங்க, 3 வினாடிகளுக்கு இரண்டு ஒலியளவு விசைகளையும் அழுத்தவும்."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"உரையின் உயர் மாறுபாடு"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"திரை உருப்பெருக்கத்தைத் தானாகப் புதுப்பி"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"பயன்பாட்டு மாற்றங்களில் திரை உருப்பெருக்கத்தைப் புதுப்பிக்கவும்"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"ஆப்ஸ் மாற்றங்களில் திரை உருப்பெருக்கத்தைப் புதுப்பிக்கவும்"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"பவர் பட்டன் அழைப்பை நிறுத்தும்"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"பெரிய மவுஸ் பாயிண்டர்"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"அனிமேஷன்களை அகற்று"</string>
@@ -2075,7 +2077,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 நிமிடம்"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 நிமிடங்கள்"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"மெசேஜ்களைப் படிக்க ஆகும் நேரம்"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"மெசேஜ்களின்படி செயல்பட ஆகும் நேரம்"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"நடவடிக்கை எடுக்க வேண்டிய நேரம்"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"நீங்கள் வாசிக்க விரும்பும், தற்காலிகமாகத் தெரியும் மெசேஜ்கள் எவ்வளவு நேரம் காட்டப்பட வேண்டும் என்பதைத் தேர்வுசெய்யலாம்.\n\nஇந்த அமைப்பு அனைத்து ஆப்ஸிலும் ஆதரிக்கப்படாது."</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"உங்களைச் செயல்படும்படி கூறும் மெசேஜ்களை எவ்வளவு நேரம் காட்டலாம் என்பதைத் தேர்வுசெய்யவும். இவை சற்று நேரத்திற்கு மட்டுமே காட்டப்படும்.\n\nஇந்த அமைப்பு அனைத்து ஆப்ஸாலும் ஆதரிக்கப்படாது."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"தொட்டுப் பிடித்தல் தாமதம்"</string>
@@ -2145,7 +2147,7 @@
     <string name="captioning_locale" msgid="4734464353806207943">"மொழி"</string>
     <string name="captioning_text_size" msgid="1707122517246408084">"உரையின் அளவு"</string>
     <string name="captioning_preset" msgid="7429888317480872337">"தலைப்பின் நடை"</string>
-    <string name="captioning_custom_options_title" msgid="4530479671071326732">"தனிப்பயன் விருப்பங்கள்"</string>
+    <string name="captioning_custom_options_title" msgid="4530479671071326732">"பிரத்தியேக விருப்பங்கள்"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"பின்புல வண்ணம்"</string>
     <string name="captioning_background_opacity" msgid="8178926599201811936">"பின்னணி ஒளிபுகாத்தன்மை"</string>
     <string name="captioning_window_color" msgid="8696903405657599896">"தலைப்பு சாளரத்தின் வண்ணம்"</string>
@@ -2405,7 +2407,7 @@
     <string name="battery_desc_bluetooth" msgid="3468061900485447679">"புளூடூத்தால் பயன்படுத்தப்பட்ட பேட்டரி அளவு"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="6353294067057749310">"புளூடூத் ஐப் பயன்படுத்தாதபோது அதை முடக்கவும்"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="2421931037149315202">"வேறு புளூடூத் சாதனத்துடன் இணைக்க முயற்சிக்கவும்"</string>
-    <string name="battery_desc_apps" msgid="6826726880149226823">"பயன்பாட்டால் பயன்படுத்தப்பட்ட பேட்டரியின் அளவு"</string>
+    <string name="battery_desc_apps" msgid="6826726880149226823">"ஆப்ஸால் பயன்படுத்தப்பட்ட பேட்டரியின் அளவு"</string>
     <string name="battery_sugg_apps_info" msgid="9175761965559743977">"ஆப்ஸை நிறுத்தவும் அல்லது நிறுவல் நீக்கவும்"</string>
     <string name="battery_sugg_apps_gps" msgid="489694612870772770">"பேட்டரி சேமிப்பு முறையைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="battery_sugg_apps_settings" msgid="20465932930350295">"பேட்டரி அளவின் பயன்பாட்டைக் குறைப்பதற்கான அமைப்புகளை ஆப்ஸ் வழங்கலாம்"</string>
@@ -2563,7 +2565,7 @@
     <string name="uninstall_device_admin" msgid="9017499299961719830">"ஆப்ஸை நிறுவல் நீக்கு"</string>
     <string name="remove_and_uninstall_device_admin" msgid="5607703579731496253">"செயலற்றதாக்கி, நிறுவல் நீக்கு"</string>
     <string name="select_device_admin_msg" msgid="4173769638399075387">"சாதனநிர்வாகி ஆப்ஸ்"</string>
-    <string name="no_device_admins" msgid="4129231900385977460">"சாதன நிர்வாகிப் பயன்பாடுகள் எதுவுமில்லை"</string>
+    <string name="no_device_admins" msgid="4129231900385977460">"சாதன நிர்வாகிப் ஆப்ஸ் எதுவுமில்லை"</string>
     <string name="personal_device_admin_title" msgid="759440849188565661">"தனிப்பட்டவை"</string>
     <string name="managed_device_admin_title" msgid="8021522755492551726">"பணியிடம்"</string>
     <string name="sms_access_restriction_enabled" msgid="3006320256764718303">"மெசேஜ், அழைப்புப் பதிவு அணுகலைக் கட்டுப்படுத்துதல்"</string>
@@ -2575,7 +2577,7 @@
     <string name="device_admin_warning" msgid="4421817419326480449">"இந்த நிர்வாகி ஆப்ஸைச் செயல்படுத்தினால், பின்வரும் செயல்பாடுகளைச் செய்ய <xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸ் அனுமதிக்கப்படும்:"</string>
     <string name="device_admin_status" msgid="5424944611789040723">"இந்த நிர்வாகி ஆப்ஸ் செயலில் உள்ளது, அத்துடன் பின்வரும் செயல்பாடுகளைச் செய்ய <xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸ் அனுமதிக்கும்:"</string>
     <string name="profile_owner_add_title" msgid="735805919754362791">"சுயவிவர நிர்வாகியை இயக்கவா?"</string>
-    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"தொடர்வதன் மூலம், நிர்வாகி (உங்கள் தனிப்பட்ட தரவுடன் சேர்த்து, தொடர்புடைய தரவையும் சேமிக்கக்கூடும்) உங்கள் பயனரை நிர்வகிக்கும்.\n\nஉங்கள் நிர்வாகியால் அமைப்புகள், அணுகல், பயன்பாடுகள் மற்றும் நெட்வொர்க் செயல்பாடு, உங்கள் சாதனத்தின் இருப்பிடத் தகவல் உட்பட இந்தப் பயனருடன் தொடர்புடைய தரவு ஆகியவற்றை நிர்வகிக்க முடியும்."</string>
+    <string name="adding_profile_owner_warning" msgid="1284541194547382194">"தொடர்வதன் மூலம், நிர்வாகி (உங்கள் தனிப்பட்ட தரவுடன் சேர்த்து, தொடர்புடைய தரவையும் சேமிக்கக்கூடும்) உங்கள் பயனரை நிர்வகிக்கும்.\n\nஉங்கள் நிர்வாகியால் அமைப்புகள், அணுகல், ஆப்ஸ் மற்றும் நெட்வொர்க் செயல்பாடு, உங்கள் சாதனத்தின் இருப்பிடத் தகவல் உட்பட இந்தப் பயனருடன் தொடர்புடைய தரவு ஆகியவற்றை நிர்வகிக்க முடியும்."</string>
     <string name="admin_disabled_other_options" msgid="8097063307730025707">"உங்கள் நிர்வாகி பிற விருப்பங்களை முடக்கியுள்ளார்"</string>
     <string name="admin_more_details" msgid="1719819589822345585">"மேலும் விவரங்கள்"</string>
     <string name="notification_log_title" msgid="4200467765474474753">"அறிவிப்பு பதிவு"</string>
@@ -2596,9 +2598,9 @@
     <string name="work_mode_off_summary" msgid="1688885392211178315">"ஆப்ஸ் மற்றும் அறிவிப்புகள் ஆஃப் செய்யப்பட்டுள்ளன"</string>
     <string name="remove_managed_profile_label" msgid="4625542553784793536">"பணிக் கணக்கை அகற்று"</string>
     <string name="background_data" msgid="8275750862371471171">"பின்புல டேட்டா உபயோகம்"</string>
-    <string name="background_data_summary" msgid="799640633948841990">"பயன்பாடுகளால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
+    <string name="background_data_summary" msgid="799640633948841990">"ஆப்ஸால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
     <string name="background_data_dialog_title" msgid="8306650658158895976">"பின்புல டேட்டா உபயோகத்தை முடக்கவா?"</string>
-    <string name="background_data_dialog_message" msgid="8126774244911656527">"பின்புல டேட்டா உபயோகத்தை முடக்குவது பேட்டரியின் ஆயுளை நீட்டிக்கிறது மற்றும் தரவு பயன்பாட்டைக் குறைக்கிறது. சில பயன்பாடுகள் தொடர்ந்து பின்புல டேட்டா உபயோகம் இணைப்பைப் பயன்படுத்தலாம்."</string>
+    <string name="background_data_dialog_message" msgid="8126774244911656527">"பின்புல டேட்டா உபயோகத்தை முடக்குவது பேட்டரியின் ஆயுளை நீட்டிக்கிறது மற்றும் தரவு பயன்பாட்டைக் குறைக்கிறது. சில ஆப்ஸ் தொடர்ந்து பின்புல டேட்டா உபயோகம் இணைப்பைப் பயன்படுத்தலாம்."</string>
     <string name="sync_automatically" msgid="5746117156896468099">"ஆப்ஸின் டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="sync_enabled" msgid="535172627223336983">"ஒத்திசைவு முடக்கத்தில்"</string>
     <string name="sync_disabled" msgid="713721807204805062">"ஒத்திசைவு முடக்கத்தில்"</string>
@@ -2612,10 +2614,10 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"இப்போது ஒத்திசைக்க, தட்டவும்<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"கேலெண்டர்"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"தொடர்புகள்"</string>
-    <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ஒத்திசைவுக்கு வரவேற்கிறோம்!"</font>" \nநீங்கள் எங்கிருந்தாலும் உங்கள் தொடர்புகள், சந்திப்புகள் மற்றும் பலவற்றுக்கான அணுகலை அனுமதிப்பதற்காக Google தரவை ஒத்திசைக்கிறது."</string>
-    <string name="header_application_sync_settings" msgid="4581847153669774489">"பயன்பாட்டு ஒத்திசைவு அமைப்பு"</string>
+    <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google ஒத்திசைவுக்கு வரவேற்கிறோம்!"</font>" \nநீங்கள் எங்கிருந்தாலும் உங்கள் தொடர்புகள், அப்பாயிண்ட்மெண்ட்டுகள் மற்றும் பலவற்றுக்கான அணுகலை அனுமதிப்பதற்காக Google தரவை ஒத்திசைக்கிறது."</string>
+    <string name="header_application_sync_settings" msgid="4581847153669774489">"ஆப்ஸ் ஒத்திசைவு அமைப்பு"</string>
     <string name="header_data_and_synchronization" msgid="400831816068697286">"தரவு &amp; ஒத்திசைத்தல்"</string>
     <string name="preference_change_password_title" msgid="7243527448378789274">"கடவுச்சொல்லை மாற்று"</string>
     <string name="header_account_settings" msgid="8586173964125512219">"கணக்கு அமைப்பு"</string>
@@ -2715,8 +2717,8 @@
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="6846901756455789858">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த மொபைலைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
     <string name="data_usage_sweep_warning" msgid="4646401408698778092"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"எச்சரிக்கை"</font></string>
     <string name="data_usage_sweep_limit" msgid="6101105504557548269"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"வரம்பு"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"அகற்றப்பட்ட பயன்பாடுகள்"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"அகற்றப்பட்ட பயன்பாடுகள் மற்றும் பயனர்கள்"</string>
+    <string name="data_usage_uninstalled_apps" msgid="4152786786140875769">"அகற்றப்பட்ட ஆப்ஸ்"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="61092462416505112">"அகற்றப்பட்ட ஆப்ஸ் மற்றும் பயனர்கள்"</string>
     <string name="data_usage_received_sent" msgid="5532467049487334656">"<xliff:g id="RECEIVED">%1$s</xliff:g> பெறப்பட்டது, <xliff:g id="SENT">%2$s</xliff:g> அனுப்பப்பட்டது"</string>
     <string name="data_usage_total_during_range" msgid="7307562900020512747">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> பயன்படுத்தப்பட்டது."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="366118962920532455">"<xliff:g id="RANGE">%2$s</xliff:g>: உங்கள் டேப்லெட் அளவீட்டின் படி <xliff:g id="TOTAL">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது. உங்கள் மொபைல் நிறுவனத்தின் டேட்டா உபயோகத்தின் கணக்கு மாறுபடலாம்."</string>
@@ -2828,14 +2830,14 @@
       <item quantity="one">சான்றிதழை நம்பு அல்லது அகற்று</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="9046046586061880100">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> உங்கள் சாதனத்தில் சான்றிதழ் அங்கீகாரங்களை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், பயன்பாடுகள், பாதுகாப்பான இணையதளங்கள் உட்பட சாதன நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அவற்றை அனுமதிக்கக்கூடும்.\n\nசான்றிதழ்களைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> உங்கள் சாதனத்தில் சான்றிதழ் அங்கீகாரத்தை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், பயன்பாடுகள், பாதுகாப்பான இணையதளங்கள் உட்பட சாதன நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அதை அனுமதிக்கக்கூடும்.\n\nசான்றிதழைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> உங்கள் சாதனத்தில் சான்றிதழ் அங்கீகாரங்களை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், ஆப்ஸ், பாதுகாப்பான இணையதளங்கள் உட்பட சாதன நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அவற்றை அனுமதிக்கக்கூடும்.\n\nசான்றிதழ்களைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> உங்கள் சாதனத்தில் சான்றிதழ் அங்கீகாரத்தை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், ஆப்ஸ், பாதுகாப்பான இணையதளங்கள் உட்பட சாதன நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அதை அனுமதிக்கக்கூடும்.\n\nசான்றிதழைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="8271858091418779584">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> உங்கள் பணிச் சுயவிவரத்திற்குச் சான்றிதழ் அங்கீகாரங்களை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், பயன்பாடுகள், பாதுகாப்பான இணையதளங்கள் உட்பட பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அவற்றை அனுமதிக்கக்கூடும்.\n\nசான்றிதழ்களைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> உங்கள் பணிச் சுயவிவரத்திற்குச் சான்றிதழ் அங்கீகாரத்தை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், பயன்பாடுகள், பாதுகாப்பான இணையதளங்கள் உட்பட பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அதை அனுமதிக்கக்கூடும்.\n\nசான்றிதழைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> உங்கள் பணிச் சுயவிவரத்திற்குச் சான்றிதழ் அங்கீகாரங்களை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், ஆப்ஸ், பாதுகாப்பான இணையதளங்கள் உட்பட பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அவற்றை அனுமதிக்கக்கூடும்.\n\nசான்றிதழ்களைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> உங்கள் பணிச் சுயவிவரத்திற்குச் சான்றிதழ் அங்கீகாரத்தை நிறுவியுள்ளது. இது மின்னஞ்சல்கள், ஆப்ஸ், பாதுகாப்பான இணையதளங்கள் உட்பட பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிப்பதற்கு அதை அனுமதிக்கக்கூடும்.\n\nசான்றிதழைப் பற்றிய கூடுதல் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"மின்னஞ்சல்கள், பயன்பாடுகள் மற்றும் பாதுகாப்பான இணையதளங்கள் உள்ளிட்ட உங்களின் நெட்வொர்க் செயல்பாட்டை மூன்றாம் தரப்பினர் கண்காணிக்க முடியும்.\n\nஉங்கள் சாதனத்தில் நிறுவப்பட்ட நம்பிக்கையான சான்று இதைச் சாத்தியமாக்கும்."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8692156828262606685">"மின்னஞ்சல்கள், ஆப்ஸ் மற்றும் பாதுகாப்பான இணையதளங்கள் உள்ளிட்ட உங்களின் நெட்வொர்க் செயல்பாட்டை மூன்றாம் தரப்பினர் கண்காணிக்க முடியும்.\n\nஉங்கள் சாதனத்தில் நிறுவப்பட்ட நம்பிக்கையான சான்று இதைச் சாத்தியமாக்கும்."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="3227175122066058245">
       <item quantity="other">சான்றிதழ்களைச் சரிபார்</item>
       <item quantity="one">சான்றிதழைச் சரிபார்</item>
@@ -2848,7 +2850,7 @@
     <string name="user_add_user_or_profile_menu" msgid="4220679989900149336">"பயனர் அல்லது சுயவிவரத்தைச் சேர்"</string>
     <string name="user_add_user_menu" msgid="9006572936456324794">"பயனரைச் சேர்"</string>
     <string name="user_summary_restricted_profile" msgid="5214838615043574917">"கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
-    <string name="user_need_lock_message" msgid="3421243467724322311">"நீங்கள் வரையறுக்கப்பட்டச் சுயவிவரத்தை உருவாக்குவதற்கு முன்பு, உங்கள் பயன்பாடுகள் மற்றும் தனிப்பட்ட தரவைப் பாதுகாக்கும் வகையில் நீங்கள் திரைப் பூட்டை அமைக்க வேண்டும்."</string>
+    <string name="user_need_lock_message" msgid="3421243467724322311">"நீங்கள் வரையறுக்கப்பட்டச் சுயவிவரத்தை உருவாக்குவதற்கு முன்பு, உங்கள் ஆப்ஸ் மற்றும் தனிப்பட்ட தரவைப் பாதுகாக்கும் வகையில் நீங்கள் திரைப் பூட்டை அமைக்க வேண்டும்."</string>
     <string name="user_set_lock_button" msgid="4660971133148866612">"பூட்டை அமை"</string>
     <string name="user_summary_not_set_up" msgid="6436691939044332679">"அமைக்கவில்லை"</string>
     <string name="user_summary_restricted_not_set_up" msgid="896552290436689508">"அமைக்கவில்லை - கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
@@ -2858,8 +2860,8 @@
     <string name="user_nickname" msgid="1088216221559125529">"செல்லப்பெயர்"</string>
     <string name="user_add_user_type_title" msgid="8672326434351387845">"சேர்"</string>
     <string name="user_add_max_count" msgid="4524573950126500416">"<xliff:g id="USER_COUNT">%1$d</xliff:g> பயனர்கள் வரை சேர்க்கலாம்"</string>
-    <string name="user_add_user_item_summary" msgid="6114355152711455716">"பயனர்கள் தங்களுக்குச் சொந்தமான பயன்பாடுகள் மற்றும் உள்ளடக்கத்தை வைத்திருக்க வேண்டும்"</string>
-    <string name="user_add_profile_item_summary" msgid="6386283837789573755">"உங்கள் கணக்கிலிருந்து பயன்பாடுகள் மற்றும் உள்ளடக்கத்திற்கான அணுகலை நீங்கள் வரையறுக்கலாம்"</string>
+    <string name="user_add_user_item_summary" msgid="6114355152711455716">"பயனர்கள் தங்களுக்குச் சொந்தமான ஆப்ஸ் மற்றும் உள்ளடக்கத்தை வைத்திருக்க வேண்டும்"</string>
+    <string name="user_add_profile_item_summary" msgid="6386283837789573755">"உங்கள் கணக்கிலிருந்து ஆப்ஸ் மற்றும் உள்ளடக்கத்திற்கான அணுகலை நீங்கள் வரையறுக்கலாம்"</string>
     <string name="user_add_user_item_title" msgid="6835385073795492410">"பயனர்"</string>
     <string name="user_add_profile_item_title" msgid="4932743891449790664">"கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
     <string name="user_add_user_title" msgid="2320897397066676472">"புதியவரைச் சேர்க்கவா?"</string>
@@ -2890,9 +2892,9 @@
     <string name="user_adding_new_user" msgid="381717945749193417">"புதிய பயனரைச் சேர்க்கிறது…"</string>
     <string name="user_delete_user_description" msgid="3627684990761268859">"பயனரை நீக்கு"</string>
     <string name="user_delete_button" msgid="6747802570634772774">"நீக்கு"</string>
-    <string name="user_guest" msgid="6226240869459683235">"வேறொருவர்"</string>
-    <string name="user_exit_guest_title" msgid="7279886200373071797">"அழைக்கப்பட்டவரை அகற்று"</string>
-    <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"அழைக்கப்பட்டவரை அகற்றவா?"</string>
+    <string name="user_guest" msgid="6226240869459683235">"கெஸ்ட்"</string>
+    <string name="user_exit_guest_title" msgid="7279886200373071797">"கெஸ்ட்டை அகற்று"</string>
+    <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"கெஸ்ட்டை அகற்றவா?"</string>
     <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"இந்த அமர்வின் எல்லா பயன்பாடுகளும், தரவும் நீக்கப்படும்."</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"அகற்று"</string>
     <string name="user_enable_calling" msgid="864760054792249503">"ஃபோன் அழைப்புகளை இயக்கு"</string>
@@ -2905,7 +2907,7 @@
     <string name="emergency_info_title" msgid="1522609271881425375">"அவசரத் தகவல்"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"<xliff:g id="USER_NAME">%1$s</xliff:g> தகவலும் தொடர்புகளும்"</string>
     <string name="application_restrictions" msgid="6871981013736536763">"பயன்பாடுகளையும் உள்ளடக்கத்தையும் அனுமதி"</string>
-    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"வரையறைகளுடனான பயன்பாடுகள்"</string>
+    <string name="apps_with_restrictions_header" msgid="8656739605673756176">"வரையறைகளுடனான ஆப்ஸ்"</string>
     <string name="apps_with_restrictions_settings_button" msgid="5065896213467171744">"பயன்பாட்டிற்கான அமைப்புகளை விரிவுபடுத்து"</string>
     <string name="nfc_payment_settings_title" msgid="5070077706735415291">"தட்டி, கட்டணம் செலுத்துதல்"</string>
     <string name="nfc_payment_how_it_works" msgid="7607901964687787177">"இது எவ்வாறு இயங்குகிறது"</string>
@@ -2960,7 +2962,7 @@
     <string name="app_restrictions_custom_label" msgid="8791627858467265176">"ஆப்ஸின் வரையறைகளை அமை"</string>
     <string name="user_restrictions_controlled_by" msgid="3442508299902131033">"<xliff:g id="APP">%1$s</xliff:g> ஆல் கட்டுப்படுத்தப்படுகிறது"</string>
     <string name="app_sees_restricted_accounts" msgid="2210750497683265281">"இந்த ஆப்ஸ் உங்கள் கணக்குகளை அணுகலாம்"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="5028333644657350816">"இந்தப் பயன்பாட்டால் உங்கள் கணக்குகளை அணுக முடியும். கட்டுப்படுத்தும் ஆப்ஸ்: <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="5028333644657350816">"இந்த ஆப்ஸால் உங்கள் கணக்குகளை அணுக முடியும். கட்டுப்படுத்தும் ஆப்ஸ்: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="1689176998451296068">"வைஃபை மற்றும் மொபைல்"</string>
     <string name="restriction_wifi_config_summary" msgid="2450206736438594690">"வைஃபை மற்றும் மொபைல் அமைப்புகளின் மாற்றத்தை அனுமதிக்கவும்"</string>
     <string name="restriction_bluetooth_config_title" msgid="34551118506640221">"புளூடூத்"</string>
@@ -2970,7 +2972,7 @@
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3292205836938064931">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="226439584043333608">"வேறொரு சாதனத்தைத் தொடும்போது டேட்டா பரிமாற்றத்தை அனுமதி"</string>
     <string name="restriction_location_enable_title" msgid="358506740636434856">"இருப்பிடம்"</string>
-    <string name="restriction_location_enable_summary" msgid="4159500201124004463">"பயன்பாடுகள் உங்கள் இருப்பிடத் தகவலைப் பயன்படுத்தலாம்"</string>
+    <string name="restriction_location_enable_summary" msgid="4159500201124004463">"ஆப்ஸ் உங்கள் இருப்பிடத் தகவலைப் பயன்படுத்தலாம்"</string>
     <string name="wizard_back" msgid="223654213898117594">"பின் செல்"</string>
     <string name="wizard_next" msgid="5239664512608113542">"அடுத்து"</string>
     <string name="wizard_finish" msgid="3742102879981212094">"முடி"</string>
@@ -3058,7 +3060,7 @@
     <string name="keywords_display" msgid="355147521915213375">"திரை, டச்ஸ்கிரீன்"</string>
     <string name="keywords_display_brightness_level" msgid="7649410848561920512">"ஒளிமங்கல் திரை, டச்ஸ்கிரீன், பேட்டரி, பிரகாசம்"</string>
     <string name="keywords_display_night_display" msgid="3647370193110044967">"ஒளிமங்கல் திரை, இரவு, மென்னிறம், இரவு ஷிஃப்ட், ஒளிர்வு, திரை வண்ணம், நிறம், வண்ணம்"</string>
-    <string name="keywords_display_wallpaper" msgid="1202089324795933197">"பின்னணி, தனிப்படுத்து, தனிப்பயனாக்கு திரை"</string>
+    <string name="keywords_display_wallpaper" msgid="1202089324795933197">"பின்னணி, தனிப்படுத்து, பிரத்தியேகமாக்கு திரை"</string>
     <string name="keywords_display_font_size" msgid="1496431330244040196">"உரை அளவு"</string>
     <string name="keywords_display_cast_screen" msgid="5744566533025100355">"திரையில் காட்டு, அலைபரப்பு, திரையை மிரரிங் செய், திரையைக் காட்டு, திரையைப் பகிர், திரைப் பகிர்தல், மிரரிங், திரையை அலைபரப்பு, திரை அலைபரப்புதல்"</string>
     <string name="keywords_storage" msgid="7704519289838065803">"இடம், டிஸ்க், வட்டு இயக்ககம், சாதனப் பயன்பாடு"</string>
@@ -3078,9 +3080,9 @@
     <string name="keywords_users" msgid="5880705776023155640">"வரம்பிடல், வரம்பு, வரம்பிட்டது"</string>
     <string name="keywords_keyboard_and_ime" msgid="3327265741354129990">"உரை திருத்தம், சரிசெய், ஒலி, அதிர்வு, தானியங்கு, மொழி, சைகை, பரிந்துரை, பரிந்துரைப்பு, தீம், வன்மொழி, சொல், வகை, ஈமோஜி, சர்வதேசம்"</string>
     <string name="keywords_reset_apps" msgid="2645701455052020435">"மீட்டமை, விருப்பத்தேர்வுகள், இயல்பு"</string>
-    <string name="keywords_all_apps" msgid="846444448435698930">"ஆப்ஸ், பதிவிறக்கு, பயன்பாடுகள், முறைமை"</string>
-    <string name="keywords_app_permissions" msgid="8539841019997048500">"பயன்பாடுகள், அனுமதிகள், பாதுகாப்பு"</string>
-    <string name="keywords_default_apps" msgid="7435952699323965532">"பயன்பாடுகள், இயல்பு"</string>
+    <string name="keywords_all_apps" msgid="846444448435698930">"ஆப்ஸ், பதிவிறக்கு, ஆப்ஸ், முறைமை"</string>
+    <string name="keywords_app_permissions" msgid="8539841019997048500">"ஆப்ஸ், அனுமதிகள், பாதுகாப்பு"</string>
+    <string name="keywords_default_apps" msgid="7435952699323965532">"ஆப்ஸ், இயல்பு"</string>
     <string name="keywords_ignore_optimizations" msgid="9127632532176249438">"மேம்படுத்தல்களைத் தவிர்த்தல், பேட்டரியைக் குறைவாகப் பயன்படுத்துதல், ஆப்ஸ் காத்திருப்பு நிலை"</string>
     <string name="keywords_color_mode" msgid="8893345199519181751">"அதிர்வு, RGB, sRGB, வண்ணம், இயற்கை, நிலையானது"</string>
     <string name="keywords_color_temperature" msgid="2255253972992035046">"வண்ணம், வண்ண வெப்பநிலை, D65, D73, வெள்ளை, மஞ்சள், நீலம், அடர், வெளிர்"</string>
@@ -3196,8 +3198,8 @@
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="1449301153755270168">"அறிவிப்புகளைப் பார்க்கவோ கேட்கவோ மாட்டீர்கள்"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="7617688597593946765">"புதிய அல்லது ஏற்கனவே இருக்கும் அறிவிப்புகளை உங்கள் மொபைல் காட்டாது, அதிர்வுறாது அல்லது ஒலி எழுப்பாது. உங்கள் மொபைலின் செயல்பாடு மற்றும் நிலை தொடர்பான முக்கிய அறிவிப்புகள் தொடர்ந்து தோன்றும் என்பதை நினைவில்கொள்ளவும்.\n\nதொந்தரவு செய்ய வேண்டாம் என்பதை நீங்கள் முடக்கும் போது, உங்கள் திரையின் மேலிருந்து கீழாக ஸ்வைப் செய்வதன் மூலம் தவறிய அழைப்புகள் எவை என்பதைப் பார்க்கலாம்."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="3167252482570424133">"பிரத்தியேகமானது"</string>
-    <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"தனிப்பயன் அமைப்பை இயக்கு"</string>
-    <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"தனிப்பயன் அமைப்பை அகற்று"</string>
+    <string name="zen_mode_restrict_notifications_enable_custom" msgid="6376983315529894440">"பிரத்தியேக அமைப்பை இயக்கு"</string>
+    <string name="zen_mode_restrict_notifications_disable_custom" msgid="8004212081465043044">"பிரத்தியேக அமைப்பை அகற்று"</string>
     <string name="zen_mode_restrict_notifications_summary_muted" msgid="1075196788469381282">"அறிவிப்புகள் வரும்போது ஒலியெழுப்ப வேண்டாம்"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="4982187708274505748">"பகுதியளவு மறைக்கப்பட்டவை"</string>
     <string name="zen_mode_restrict_notifications_summary_hidden" msgid="7637206880685474111">"அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்"</string>
@@ -3207,7 +3209,7 @@
     <string name="zen_mode_block_effect_sound" msgid="1499243540186357631">"ஒலியையும் அதிர்வையும் முடக்கு"</string>
     <string name="zen_mode_block_effect_intent" msgid="5666951244667422668">"திரையை ஆன் செய்யாதே"</string>
     <string name="zen_mode_block_effect_light" msgid="8679333758037487644">"ஒளியை மிளிரச் செய்யாதே"</string>
-    <string name="zen_mode_block_effect_peek" msgid="6075662813575910221">"திரையில் அறிவிப்புகளைப் பாப் அப் செய்யாதே"</string>
+    <string name="zen_mode_block_effect_peek" msgid="6075662813575910221">"திரையில் அறிவிப்புகளைப் பாப்-அப் செய்யாதே"</string>
     <string name="zen_mode_block_effect_status" msgid="6516614225115681068">"திரையின் மேற்பகுதியில் \'நிலைப் பட்டி\' ஐகான்களை மறை"</string>
     <string name="zen_mode_block_effect_badge" msgid="3891743027347075136">"ஆப்ஸ் ஐகான்களில் அறிவிப்புப் புள்ளிகளை மறை"</string>
     <string name="zen_mode_block_effect_ambient" msgid="6382013125863616197">"அறிவிப்புகள் வரும்போது சாதனத்தை எழுப்ப வேண்டாம்"</string>
@@ -3230,7 +3232,7 @@
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="2843297614114625408">"திட்ட அட்டவணையின் (<xliff:g id="RULE_NAME">%s</xliff:g>) மூலம் ‘தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது"</string>
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"(<xliff:g id="APP_NAME">%s</xliff:g>) ஆப்ஸின் மூலம், ‘தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"பிரத்தியேக அமைப்புகளுடன் <xliff:g id="RULE_NAMES">%s</xliff:g> என்பதற்குத் \'தொந்தரவு செய்ய வேண்டாம்’ ஆன் நிலையில் உள்ளது."</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" தனிப்பயன் அமைப்புகளைக் காட்டு"</annotation></string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" பிரத்தியேக அமைப்புகளைக் காட்டு"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="9178419297408319234">"முக்கியமானவை மட்டும்"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"ஆன் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3259,7 +3261,7 @@
     <string name="zen_sound_one_allowed" msgid="2417988417080579980">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE">%1$s</xliff:g> அனுமதிக்கப்பட்டுள்ளது"</string>
     <string name="zen_sound_two_allowed" msgid="299344481401823614">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> மற்றும் <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="zen_sound_three_allowed" msgid="8374564453060696012">"ஒலியடக்கப்பட்டது, ஆனால் <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> மற்றும் <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> அனுமதிக்கப்பட்டுள்ளன"</string>
-    <string name="zen_custom_settings_dialog_title" msgid="908049494676219236">"தனிப்பயன் அமைப்புகள்"</string>
+    <string name="zen_custom_settings_dialog_title" msgid="908049494676219236">"பிரத்தியேக அமைப்புகள்"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="2247761749333893513">"திட்ட அட்டவணையைச் சரிபார்"</string>
     <string name="zen_custom_settings_dialog_ok" msgid="3572754922025853427">"புரிந்தது"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7469592764589354302">"அறிவிப்புகள்"</string>
@@ -3283,7 +3285,7 @@
     <string name="work_sync_dialog_title" msgid="4799120971202956837">"ஒலிகளை மாற்றியமைக்கவா?"</string>
     <string name="work_sync_dialog_yes" msgid="2110726233746476066">"மாற்று"</string>
     <string name="work_sync_dialog_message" msgid="944233463059129156">"உங்கள் தனிப்பட்ட சுயவிவர ஒலிகள், உங்கள் பணி விவரத்திற்குப் பயன்படுத்தப்படும்"</string>
-    <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"தனிப்பயன் ஒலியைச் சேர்க்கவா?"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="210551218424553671">"பிரத்தியேக ஒலியைச் சேர்க்கவா?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="6683649115132255452">"இந்தக் கோப்பு, <xliff:g id="FOLDER_NAME">%s</xliff:g> கோப்புறைக்கு நகலெடுக்கப்படும்"</string>
     <string name="ringtones_category_preference_title" msgid="4491932700769815470">"ரிங்டோன்கள்"</string>
     <string name="other_sound_category_preference_title" msgid="2045757472469840859">"பிற ஒலிகள் மற்றும் அதிர்வுகள்"</string>
@@ -3334,7 +3336,7 @@
     <string name="notification_importance_low" msgid="7609797151662295364">"ஒலிக்காமல் காட்டும்"</string>
     <string name="notification_importance_default" msgid="4091563759103917166">"ஒலியெழுப்பும்"</string>
     <string name="notification_importance_high" msgid="7973764540402436656">"ஒலியெழுப்பி, திரையில் காட்டும்"</string>
-    <string name="notification_importance_high_silent" msgid="3177662759865661155">"திரையில் பாப் அப் செய்யும்"</string>
+    <string name="notification_importance_high_silent" msgid="3177662759865661155">"திரையில் பாப்-அப் செய்யும்"</string>
     <string name="notification_importance_min_title" msgid="705872537330744154">"சிறிதாக்கு"</string>
     <string name="notification_importance_low_title" msgid="2956199021781786232">"நடுத்தர முக்கியத்துவம்"</string>
     <string name="notification_importance_default_title" msgid="7985549807203332482">"அதிக முக்கியத்துவம்"</string>
@@ -3355,23 +3357,23 @@
     <string name="notifications_sent_never" msgid="237997329598144638">"ஒருபோதும் அனுப்பியதில்லை"</string>
     <string name="manage_notification_access_title" msgid="5348743662189787547">"அறிவிப்பு அணுகல்"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8148871282484870576">"பணிக் கணக்கு அறிவிப்புகளுக்கான அணுகல் தடுக்கப்பட்டுள்ளது"</string>
-    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"பயன்பாடுகளால் அறிவிப்புகளைப் படிக்க முடியாது"</string>
+    <string name="manage_notification_access_summary_zero" msgid="236809421271593016">"ஆப்ஸால் அறிவிப்புகளைப் படிக்க முடியாது"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="8496218948429646792">
       <item quantity="other">%d ஆப்ஸ்கள் அறிவிப்புகளைப் படிக்கலாம்</item>
       <item quantity="one">%d ஆப்ஸ் அறிவிப்புகளைப் படிக்கலாம்</item>
     </plurals>
     <string name="notification_assistant_title" msgid="8216604031352764011">"அறிவிப்பு அஸிஸ்டண்ட்"</string>
     <string name="no_notification_assistant" msgid="9140123568386413264">"அறிவிப்பு அசிஸ்டண்ட் இல்லை"</string>
-    <string name="no_notification_listeners" msgid="1366386609506834717">"அறிவிப்பு அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை."</string>
+    <string name="no_notification_listeners" msgid="1366386609506834717">"அறிவிப்பு அணுகலைக் கோரும் ஆப்ஸ் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="notification_assistant_security_warning_title" msgid="4190584438086738496">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவைக்கான அறிவிப்பு அணுகலை அனுமதிக்கவா?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="6924513399671031930">"தொடர்புகளின் பெயர்கள் மற்றும் உங்களுக்கான மெசேஜ்களில் இருக்கும் உரைகள் போன்ற தனிப்பட்ட தகவல்கள் அடங்கிய அனைத்து அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> சேவையால் படிக்க இயலும். அறிவிப்புகளை மாற்றியமைக்கவோ நிராகரிக்கவோ அவற்றிலுள்ள செயல் பட்டன்களைத் தூண்டவோ இதனால் இயலும். \n\n’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தை ஆன் அல்லது ஆஃப் செய்வதற்கு ஆப்ஸை அனுமதிப்பதோடு அது தொடர்பான அமைப்புகளை மாற்றவும் இதனால் இயலும்."</string>
     <string name="notification_listener_security_warning_title" msgid="4902253246428777797">"<xliff:g id="SERVICE">%1$s</xliff:g>க்கான அறிவிப்பு அணுகலை அனுமதிக்கவா?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"தொடர்புப் பெயர்கள், நீங்கள் பெறும் செய்திகள் போன்ற தனிப்பட்ட தகவல் உட்பட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும். இந்தப் பயன்பாட்டினால் அறிவிப்புகளை நிராகரிக்கவோ அல்லது அறிவிப்புகளில் உள்ள செயல் பொத்தான்களைத் தூண்டவோ முடியும். \n\nஇது தொந்தரவு செய்ய வேண்டாம் எனும் விருப்பத்தை இயக்க அல்லது முடக்குவதற்கான அனுமதியையும், தொடர்புடையை அமைப்புகளை மாற்றுவதற்கான அனுமதியையும் பயன்பாட்டிற்கு அளிக்கும்."</string>
+    <string name="notification_listener_security_warning_summary" msgid="4454702907350100288">"தொடர்புப் பெயர்கள், நீங்கள் பெறும் செய்திகள் போன்ற தனிப்பட்ட தகவல் உட்பட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும். இந்த ஆப்ஸால் அறிவிப்புகளை நிராகரிக்கவோ அல்லது அறிவிப்புகளில் உள்ள செயல் பொத்தான்களைத் தூண்டவோ முடியும். \n\nஇது தொந்தரவு செய்ய வேண்டாம் எனும் விருப்பத்தை இயக்க அல்லது முடக்குவதற்கான அனுமதியையும், தொடர்புடையை அமைப்புகளை மாற்றுவதற்கான அனுமதியையும் பயன்பாட்டிற்கு அளிக்கும்."</string>
     <string name="notification_listener_disable_warning_summary" msgid="162165151519082978">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>க்கு அறிவிப்பு அணுகலை முடக்கினால், \'தொந்தரவு செய்யாதே\' அணுகலும் முடக்கப்படலாம்."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="7863495391671154188">"முடக்கு"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="6264631825225298458">"ரத்துசெய்"</string>
     <string name="vr_listeners_title" msgid="511483902408792832">"VR உதவிச் சேவைகள்"</string>
-    <string name="no_vr_listeners" msgid="7675484190394450979">"VR உதவிச் சேவைகளாக இயங்குவதற்காகக் கோரிய பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை."</string>
+    <string name="no_vr_listeners" msgid="7675484190394450979">"VR உதவிச் சேவைகளாக இயங்குவதற்காகக் கோரிய ஆப்ஸ் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="vr_listener_security_warning_title" msgid="7019322246707645361">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ அணுக VR சேவையை அனுமதிக்கவா?"</string>
     <string name="vr_listener_security_warning_summary" msgid="5093225583584522067">"விர்ச்சுவல் ரியாலிட்டி பயன்முறையில் பயன்பாடுகளைப் பயன்படுத்தும்போது, <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> இயங்க முடியும்."</string>
     <string name="display_vr_pref_title" msgid="1088464812293416981">"VRரில் இருக்கும் போது"</string>
@@ -3385,8 +3387,8 @@
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"ஆப்ஸ் திறந்திருக்கும் போது அல்லது அதிலிருந்து நீங்கள் வெளியேறும் போது (எடுத்துக்காட்டாக, வீடியோவைத் தொடர்ந்து பார்க்க), பிக்ச்சர்-இன்-பிக்ச்சர் சாளரத்தை உருவாக்க, இந்த ஆப்ஸை அனுமதிக்கும். இந்தச் சாளரம் நீங்கள் பயன்படுத்தும் பிற ஆப்ஸ்களின் மேல் காட்டப்படும்."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"\'தொந்தரவு செய்யாதே\' அணுகல்"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தை அனுமதி"</string>
-    <string name="zen_access_empty_text" msgid="7667538993781607731">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
-    <string name="loading_notification_apps" msgid="1978345231934072091">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
+    <string name="zen_access_empty_text" msgid="7667538993781607731">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட ஆப்ஸ் எதுவும் கோரவில்லை"</string>
+    <string name="loading_notification_apps" msgid="1978345231934072091">"ஆப்ஸை ஏற்றுகிறது..."</string>
     <string name="app_notifications_off_desc" msgid="3904090905748895146">"உங்கள் கோரிக்கையின் படி, சாதனத்தில் இந்த ஆப்ஸின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_notifications_off_desc" msgid="8005444443218306611">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்த வகை அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_group_notifications_off_desc" msgid="7154205544298672850">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
@@ -3439,9 +3441,9 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="2646596466259025978">"\"<xliff:g id="RULE">%1$s</xliff:g>\" விதியை நீக்கவா?"</string>
     <string name="zen_mode_delete_rule_button" msgid="611058106279881991">"நீக்கு"</string>
     <string name="zen_mode_rule_type_unknown" msgid="2819480113355191421">"தெரியாதது"</string>
-    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. தனிப்பயன் செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் (<xliff:g id="APP_NAME">%1$s</xliff:g>) மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. தனிப்பயன் செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
-    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. தனிப்பயன் செயல்பாட்டின் அடிப்படையில் ’தொந்தரவு செய்ய வேண்டாம்’ கைமுறையாக ஆன் செய்யப்பட்டது."</string>
+    <string name="zen_mode_app_set_behavior" msgid="8597398780262575571">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. பிரத்தியேக செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் (<xliff:g id="APP_NAME">%1$s</xliff:g>) மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. பிரத்தியேக செயல்பாட்டின் அடிப்படையில், ஆப்ஸின் மூலம் ’தொந்தரவு செய்ய வேண்டாம்’ தானாக ஆன் செய்யப்பட்டது."</string>
+    <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"இந்த அமைப்புகளை இப்போது மாற்ற முடியாது. பிரத்தியேக செயல்பாட்டின் அடிப்படையில் ’தொந்தரவு செய்ய வேண்டாம்’ கைமுறையாக ஆன் செய்யப்பட்டது."</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"நேரம்"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"குறிப்பிட்ட நேரங்களில் தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்கும் தானியங்கு விதி"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"நிகழ்வு"</string>
@@ -3501,7 +3503,7 @@
     <string name="zen_mode_reminders" msgid="7560664194610054038">"நினைவூட்டல்களை அனுமதி"</string>
     <string name="zen_mode_reminders_list" msgid="7347061314032326677">"நினைவூட்டல்கள்"</string>
     <string name="zen_mode_events" msgid="5784076928339534984">"நிகழ்வுகளை அனுமதி"</string>
-    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"ஆப்ஸை மேலெழுத அனுமதிக்கின்றன"</string>
+    <string name="zen_mode_bypassing_apps" msgid="3080739479028713449">"ஆப்ஸை மீறிச் செயல்பட அனுமதிக்கின்றன"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="2115024664615538847">"ஆப்ஸ் விதிவிலக்குகள்"</string>
     <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="8723144434730871572">
       <item quantity="other">‘தொந்தரவு செய்ய வேண்டாம்’ அம்சம் ஆன் செய்யப்பட்டிருந்தாலும் <xliff:g id="NUMBER">%1$d</xliff:g> ஆப்ஸில் இருந்து அறிவிப்புகள் வரும்</item>
@@ -3537,7 +3539,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="2462898862757904560">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
     <string name="zen_mode_summary_always" msgid="2703276042913200837">"எப்போதும் குறுக்கிடு என மாற்று"</string>
     <string name="zen_mode_screen_on" msgid="7098470659072167219">"திரை ஆன் செய்யப்பட்டிருக்கும்போது"</string>
-    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\'தொந்தரவு செய்ய வேண்டாம்\' மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையில் பாப் அப் ஆவதுடன், நிலைப்பட்டி ஐகானைக் காட்டும்"</string>
+    <string name="zen_mode_screen_on_summary" msgid="8275416649295357524">"\'தொந்தரவு செய்ய வேண்டாம்\' மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையில் பாப்-அப் ஆவதுடன், நிலைப்பட்டி ஐகானைக் காட்டும்"</string>
     <string name="zen_mode_screen_off" msgid="84211490206459038">"திரை ஆஃப் செய்யப்பட்டிருக்கும்போது"</string>
     <string name="zen_mode_screen_off_summary" msgid="8592179073243001267">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரை ஆன் செய்யப்பட்டு, ஒளியை மிளிரச் செய்யட்டும்"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="7255874108150630145">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தின் மூலம் ஒலியடக்கப்பட்ட அறிவிப்புகள் வரும்போது, திரையை ஆன் செய்யட்டும்."</string>
@@ -3555,7 +3557,7 @@
     <string name="screen_pinning_unlock_none" msgid="9183040569733226911">"திரையை விலக்கும்போது சாதனத்தைப் பூட்டு"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2350380017136403670">"இந்தப் பணிக் கணக்கை நிர்வகிப்பது:"</string>
     <string name="managing_admin" msgid="3212584016377581608">"நிர்வகிப்பது: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
-    <string name="experimental_preference" msgid="5903223408406906322">"(சோதனை முயற்சி)"</string>
+    <string name="experimental_preference" msgid="5903223408406906322">"(பரிசோதனை முயற்சி)"</string>
     <string name="encryption_interstitial_header" msgid="3298397268731647519">"பாதுகாப்பான தொடக்கம்"</string>
     <string name="encryption_continue_button" msgid="2808797091460167842">"தொடர்"</string>
     <string name="encryption_interstitial_message_pin" msgid="6592265582286340307">"இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடப்பட்டாலோ, அதில் உள்ள உங்கள் டேட்டாவைப் பாதுகாக்க இதைக் கடைபிடிக்கலாம். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
@@ -3629,14 +3631,14 @@
     <string name="filter_instant_apps" msgid="8087483282854072366">"இன்ஸ்டண்ட் ஆப்ஸ்"</string>
     <string name="filter_personal_apps" msgid="3473268022652904457">"தனிப்பட்டவை"</string>
     <string name="filter_work_apps" msgid="4202483998339465542">"பணியிடம்"</string>
-    <string name="filter_notif_all_apps" msgid="1862666327228804896">"பயன்பாடுகள்: எல்லாம்"</string>
+    <string name="filter_notif_all_apps" msgid="1862666327228804896">"ஆப்ஸ்: எல்லாம்"</string>
     <string name="filter_notif_blocked_apps" msgid="5694956954776028202">"ஆஃப் செய்யப்பட்டவை"</string>
     <string name="filter_notif_urgent_channels" msgid="5000735867167027148">"வகைகள்: அதிக முக்கியத்துவம்"</string>
     <string name="filter_notif_low_channels" msgid="6859599463135775287">"வகைகள்: குறைந்த முக்கியத்துவம்"</string>
     <string name="filter_notif_blocked_channels" msgid="6110799550327612670">"வகைகள்: முடக்கப்பட்டன"</string>
     <string name="filter_notif_dnd_channels" msgid="3251570137256371092">"வகை: டிஎன்டியை மீறும்"</string>
     <string name="advanced_apps" msgid="6643869089344883537">"மேம்பட்டவை"</string>
-    <string name="configure_apps" msgid="4066683118857400943">"பயன்பாடுகளை உள்ளமை"</string>
+    <string name="configure_apps" msgid="4066683118857400943">"ஆப்ஸை உள்ளமை"</string>
     <string name="unknown_app" msgid="2312052973570376877">"அறியப்படாத ஆப்ஸ்"</string>
     <string name="app_permissions" msgid="3215958256821756086">"அனுமதி நிர்வாகம்"</string>
     <string name="app_permissions_summary" msgid="8785798165776061594">"<xliff:g id="APPS">%1$s</xliff:g> பயன்படுத்தும் ஆப்ஸ்"</string>
@@ -3659,7 +3661,7 @@
     <string name="assist_and_voice_input_title" msgid="324148194703846130">"அசிஸ்ட் &amp; குரல் உள்ளீடு"</string>
     <string name="default_assist_title" msgid="2060846994203235317">"அசிஸ்ட் ஆப்ஸ்"</string>
     <string name="assistant_security_warning_title" msgid="8014460924169723059">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>ஐ அசிஸ்டண்ட் பயன்பாடாக அமைக்கவா?"</string>
-    <string name="assistant_security_warning" msgid="1304057692847069938">"உங்கள் திரையில் தெரியும் தகவல் அல்லது பயன்பாடுகளுக்குள் அணுகத்தக்க தகவல் உள்பட உங்கள் சாதனத்தில் உபயோகத்தில் இருக்கும் பயன்பாடுகள் பற்றிய தகவலை அசிஸ்டண்ட் படிக்க முடியும்."</string>
+    <string name="assistant_security_warning" msgid="1304057692847069938">"உங்கள் திரையில் தெரியும் தகவல் அல்லது பயன்பாடுகளுக்குள் அணுகத்தக்க தகவல் உள்பட உங்கள் சாதனத்தில் உபயோகத்தில் இருக்கும் ஆப்ஸ் பற்றிய தகவலை அசிஸ்டண்ட் படிக்க முடியும்."</string>
     <string name="assistant_security_warning_agree" msgid="5105692801460137289">"ஏற்கிறேன்"</string>
     <string name="assistant_security_warning_disagree" msgid="4217490999193100459">"ஏற்கவில்லை"</string>
     <string name="choose_voice_input_title" msgid="5369311838580756359">"குரல் உள்ளீட்டைத் தேர்வுசெய்க"</string>
@@ -3673,7 +3675,7 @@
     <string name="apps_storage" msgid="5658466038269046038">"ஆப்ஸ் சேமிப்பகம்"</string>
     <string name="usage_access" msgid="2023443456361489516">"உபயோக அணுகல்"</string>
     <string name="permit_usage_access" msgid="3321727608629752758">"உபயோக அணுகல் அனுமதி"</string>
-    <string name="app_usage_preference" msgid="5691545073101551727">"பயன்பாட்டு உபயோக விருப்பத்தேர்வுகள்"</string>
+    <string name="app_usage_preference" msgid="5691545073101551727">"ஆப்ஸ் உபயோக விருப்பத்தேர்வுகள்"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"பயன்படுத்திய நேரம்"</string>
     <string name="usage_access_description" msgid="2178083292760305207">"உபயோக அணுகலானது, நீங்கள் வேறு எந்தெந்த ஆப்ஸை எவ்வளவு அடிக்கடி பயன்படுத்துகிறீர்கள் என்று அறியும் அனுமதியை ஒரு ஆப்ஸுக்கு வழங்குகிறது. உங்கள் மொபைல் நிறுவனம், மொழி அமைப்புகள் மற்றும் பிற விவரங்களையும் அறிந்து கொள்ளும் அனுமதியும் இதில் அடங்கும்."</string>
     <string name="memory_settings_title" msgid="7867148522014070721">"நினைவகம்"</string>
@@ -3692,11 +3694,11 @@
     <string name="show_all_apps" msgid="5442552004569634846">"முழு பயன்பாட்டைக் காட்டு"</string>
     <string name="hide_extra_apps" msgid="6798261081113299441">"ஆப்ஸின் உபயோகத்தை காட்டு"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="4658343710126205199">
-      <item quantity="other">வழக்கத்திற்கு மாறாக <xliff:g id="NUMBER">%2$d</xliff:g> பயன்பாடுகள் செயல்படுகின்றன</item>
+      <item quantity="other">வழக்கத்திற்கு மாறாக <xliff:g id="NUMBER">%2$d</xliff:g> ஆப்ஸ் செயல்படுகின்றன</item>
       <item quantity="one">வழக்கத்திற்கு மாறாக <xliff:g id="APP">%1$s</xliff:g> செயல்படுகிறது</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="63134064262760835">
-      <item quantity="other">பேட்டரியை அதிகமாகப் பயன்படுத்தும் பயன்பாடுகள்</item>
+      <item quantity="other">பேட்டரியை அதிகமாகப் பயன்படுத்தும் ஆப்ஸ்</item>
       <item quantity="one">பேட்டரியை அதிகமாகப் பயன்படுத்தும் <xliff:g id="APP">%1$s</xliff:g> பயன்பாடு</item>
     </plurals>
     <string name="high_power_filter_on" msgid="5294209328473386403">"பவர் சேமிக்காதவை"</string>
@@ -3705,7 +3707,7 @@
     <string name="high_power_system" msgid="739584574711292753">"பேட்டரியைச் சேமிக்காது"</string>
     <string name="high_power_desc" msgid="333756885680362741">"பேட்டரி மேம்படுத்தலைப் பயன்படுத்தவில்லை எனில், உங்கள் பேட்டரி மிக விரைவில் தீர்ந்துவிடக்கூடும்."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"எப்போதும் பின்னணியில் இயங்க, ஆப்ஸை அனுமதிக்கவா?"</string>
-    <string name="high_power_prompt_body" msgid="8067395096053552289">"எப்போதும் பின்னணியில் இயங்க <xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸை அனுமதிப்பதால், பேட்டரியின் ஆயுள் குறையக்கூடும். \n\nஇதை அமைப்புகள் &gt; பயன்பாடுகள் &amp; அறிவிப்புகள் என்பதற்குச் சென்று, மாற்றலாம்."</string>
+    <string name="high_power_prompt_body" msgid="8067395096053552289">"எப்போதும் பின்னணியில் இயங்க <xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸை அனுமதிப்பதால், பேட்டரியின் ஆயுள் குறையக்கூடும். \n\nஇதை அமைப்புகள் &gt; ஆப்ஸ் &amp; அறிவிப்புகள் என்பதற்குச் சென்று, மாற்றலாம்."</string>
     <string name="battery_summary" msgid="4345690800899981339">"முழு சார்ஜ் ஆனதிலிருந்து <xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="battery_power_management" msgid="2853925857548647969">"பேட்டரி திறன் மேலாண்மை"</string>
     <string name="no_battery_summary" msgid="4105932628367471314">"கடைசியாக முழு சார்ஜ் செய்த நேரத்திலிருந்து, பேட்டரி பயன்படுத்தப்படவில்லை"</string>
@@ -3771,7 +3773,7 @@
     <string name="total_memory" msgid="7352192982476976453">"மொத்த நினைவகம்"</string>
     <string name="average_used" msgid="3022736210190754669">"பயன்படுத்தியது (%)"</string>
     <string name="free_memory" msgid="4758919141048544927">"இருப்பது"</string>
-    <string name="memory_usage_apps" msgid="2839241373381152354">"பயன்பாடுகள் உபயோகிக்கும் நினைவகம்"</string>
+    <string name="memory_usage_apps" msgid="2839241373381152354">"ஆப்ஸ் உபயோகிக்கும் நினைவகம்"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1235024908546944704">
       <item quantity="other">கடந்த <xliff:g id="DURATION_1">%2$s</xliff:g> இல் <xliff:g id="COUNT">%1$d</xliff:g> ஆப்ஸ்கள் நினைவகத்தைப் பயன்படுத்தியுள்ளன</item>
       <item quantity="one">கடந்த <xliff:g id="DURATION_0">%2$s</xliff:g> இல் 1 ஆப்ஸ் நினைவகத்தைப் பயன்படுத்தியுள்ளது</item>
@@ -3780,7 +3782,7 @@
     <string name="memory_maximum_usage" msgid="4734981118293469479">"அதிகபட்ச உபயோகம்"</string>
     <string name="no_data_usage" msgid="903383745620135746">"டேட்டா எதுவும் பயன்படுத்தப்படவில்லை"</string>
     <string name="zen_access_warning_dialog_title" msgid="7704910289810337055">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை அனுமதிக்கவா?"</string>
-    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"பயன்பாட்டினால் தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்க/முடக்க முடிவதுடன், தொடர்புடைய அமைப்புகளை மாற்றவும் முடியும்."</string>
+    <string name="zen_access_warning_dialog_summary" msgid="2717755746850874577">"ஆப்ஸால் தொந்தரவு செய்ய வேண்டாம் என்பதை இயக்க/முடக்க முடிவதுடன், தொடர்புடைய அமைப்புகளை மாற்றவும் முடியும்."</string>
     <string name="zen_access_disabled_package_warning" msgid="7086237569177576966">"அறிவிப்பு அணுகல் இயக்கப்பட்டிருப்பதால், இயக்கத்தில் இருப்பது அவசியம்"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="6850994585577513299">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை ரத்துசெய்யவா?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="3487422193181311403">"இந்த ஆப்ஸ் உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>
@@ -3799,18 +3801,18 @@
     <string name="permit_draw_overlay" msgid="9039092257052422344">"பிற ஆப்ஸின் மேலே காட்டுவதை அனுமதி"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்த ஆப்ஸை அனுமதிக்கும். மேலும், அவற்றை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் விதத்தையோ, செயல்படும் விதத்தையோ மாற்றக்கூடும்."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை"</string>
-    <string name="keywords_system_alert_window" msgid="3936658600272194599">"சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற பயன்பாடுகளின் மேல்"</string>
+    <string name="keywords_system_alert_window" msgid="3936658600272194599">"சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற ஆப்ஸின் மேல்"</string>
     <string name="overlay_settings" msgid="3325154759946433666">"பிற ஆப்ஸின் மேலே காட்டு"</string>
-    <string name="system_alert_window_summary" msgid="7703582115861844158">"பிற பயன்பாடுகளின் மேலே காட்டுவதற்கு <xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டுள்ளன"</string>
-    <string name="filter_overlay_apps" msgid="6336897660213304743">"அனுமதி பெற்ற பயன்பாடுகள்"</string>
+    <string name="system_alert_window_summary" msgid="7703582115861844158">"பிற ஆப்ஸின் மேலே காட்டுவதற்கு <xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> ஆப்ஸ் அனுமதிக்கப்பட்டுள்ளன"</string>
+    <string name="filter_overlay_apps" msgid="6336897660213304743">"அனுமதி பெற்ற ஆப்ஸ்"</string>
     <string name="app_permission_summary_allowed" msgid="6458476982015518778">"அனுமதிக்கப்பட்டது"</string>
     <string name="app_permission_summary_not_allowed" msgid="1171642541675462584">"அனுமதிக்கப்படவில்லை"</string>
-    <string name="keywords_install_other_apps" msgid="5383559540695847668">"நிறுவு பயன்பாடுகள் அறியப்படாத மூலங்கள்"</string>
+    <string name="keywords_install_other_apps" msgid="5383559540695847668">"நிறுவு ஆப்ஸ் அறியப்படாத மூலங்கள்"</string>
     <string name="write_settings" msgid="9009040811145552108">"சாதன அமைப்புகளை மாற்று"</string>
     <string name="keywords_write_settings" msgid="3450405263390246293">"முறைமை அமைப்புகளை எழுது மாற்று"</string>
-    <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் முறைமை அமைப்புகளை மாற்ற அனுமதிக்கப்பட்டுள்ளன"</string>
+    <string name="write_settings_summary" msgid="4650251358459404247">"<xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> ஆப்ஸ் முறைமை அமைப்புகளை மாற்ற அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="financial_apps_sms_access_title" msgid="3422655018008259655">"நிதி ஆப்ஸிற்கான மெசேஜ் அணுகல்"</string>
-    <string name="filter_install_sources_apps" msgid="4519839764020866701">"பிற பயன்பாடுகளை நிறுவலாம்"</string>
+    <string name="filter_install_sources_apps" msgid="4519839764020866701">"பிற ஆப்ஸை நிறுவலாம்"</string>
     <string name="filter_write_settings_apps" msgid="6864144615530081121">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
     <string name="write_settings_title" msgid="5852614614193830632">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
     <string name="write_system_settings" msgid="20450765210832463">"சாதன அமைப்புகளை மாற்று"</string>
@@ -3849,7 +3851,7 @@
       <item quantity="one">1 பயன்பாட்டிற்கு முடக்கப்பட்டுள்ளது</item>
     </plurals>
     <string name="notification_summary_none" msgid="5003043219430054784">"அனைத்திற்கும் இயக்கப்பட்டுள்ளது"</string>
-    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டுள்ளன"</string>
+    <string name="apps_summary" msgid="8355759446490212195">"<xliff:g id="COUNT">%1$d</xliff:g> ஆப்ஸ் நிறுவப்பட்டுள்ளன"</string>
     <string name="apps_summary_example" msgid="3011143598675185269">"24 ஆப்ஸ் நிறுவப்பட்டன"</string>
     <string name="storage_summary" msgid="4835916510511133784">"பயன்படுத்தியது: <xliff:g id="PERCENTAGE">%1$s</xliff:g>, காலியிடம்: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="storage_summary_with_sdcard" msgid="8742907204848352697">"சாதனச் சேமிப்பகம்: <xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டது - <xliff:g id="FREE_SPACE">%2$s</xliff:g> பயன்படுத்துவதற்கு உள்ளது"</string>
@@ -3955,7 +3957,7 @@
     <string name="data_limit" msgid="5793521160051596228">"டேட்டா வரம்பு"</string>
     <string name="data_usage_template" msgid="6848274347956096882">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தியது: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="8232696842838580549">"உள்ளமை"</string>
-    <string name="data_usage_other_apps" msgid="7002491980141402084">"தரவு உபயோகத்தில் உள்ளடங்கும் பிற பயன்பாடுகள்"</string>
+    <string name="data_usage_other_apps" msgid="7002491980141402084">"தரவு உபயோகத்தில் உள்ளடங்கும் பிற ஆப்ஸ்"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="6046013861315713697">
       <item quantity="other">டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, பயனரின் எல்லா தகவலையும் பயன்படுத்த <xliff:g id="COUNT">%1$d</xliff:g> ஆப்ஸ் அனுமதிக்கப்பட்டுள்ளன</item>
       <item quantity="one">டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, பயனரின் எல்லா தகவலையும் பயன்படுத்த 1 ஆப்ஸ் அனுமதிக்கப்பட்டுள்ளது</item>
@@ -4023,7 +4025,7 @@
     <string name="notification_log_details_actions" msgid="4096917954653586430">"செயல்கள்"</string>
     <string name="notification_log_details_title" msgid="1673066058045472579">"தலைப்பு"</string>
     <string name="notification_log_details_remoteinput" msgid="739338559646354829">"ரிமோட் இன்புட்கள்"</string>
-    <string name="notification_log_details_content_view" msgid="6690611908715230584">"தனிப்பயன் காட்சி"</string>
+    <string name="notification_log_details_content_view" msgid="6690611908715230584">"பிரத்தியேகக் காட்சி"</string>
     <string name="notification_log_details_extras" msgid="3202948662169885771">"மற்றவை"</string>
     <string name="notification_log_details_icon" msgid="8464763276104577811">"ஐகான்"</string>
     <string name="notification_log_details_parcel" msgid="4024970850647594029">"பார்சல் அளவு"</string>
@@ -4060,7 +4062,7 @@
     <string name="page_tab_title_summary" msgid="4824744863994538006">"எல்லாம்"</string>
     <string name="page_tab_title_support" msgid="5569262185010367870">"உதவிக்குறிப்பு &amp; உதவி"</string>
     <string name="developer_smallest_width" msgid="2603134476228805075">"மிகக் குறைந்த அகலம்"</string>
-    <string name="premium_sms_none" msgid="940723020871007898">"பிரீமிய SMS அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை"</string>
+    <string name="premium_sms_none" msgid="940723020871007898">"பிரீமிய SMS அணுகலைக் கோரும் ஆப்ஸ் எதுவும் நிறுவப்படவில்லை"</string>
     <string name="premium_sms_warning" msgid="7604011651486294515">"பிரீமிய SMSக்குக் கட்டணம் விதிக்கப்படலாம், அது மொபைல் நிறுவன பில்களில் சேர்க்கப்படும். பயன்பாட்டிற்கான அனுமதியை இயக்கினால், அந்தப் பயன்பாட்டைப் பயன்படுத்தி பிரீமிய SMSஐ அனுப்ப முடியும்."</string>
     <string name="premium_sms_access" msgid="4550027460595822851">"பிரீமிய SMS அணுகல்"</string>
     <string name="bluetooth_disabled" msgid="6588102116819268238">"ஆஃப்"</string>
@@ -4166,16 +4168,16 @@
     <string name="enterprise_privacy_exposure_changes_category" msgid="1877045221796512001">"உங்கள் நிறுவனத்தின் நிர்வாகி செய்த மாற்றங்கள்"</string>
     <string name="enterprise_privacy_device_access_category" msgid="2967602674816237833">"இந்தச் சாதனத்திற்கான உங்கள் அணுகல்"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="6551504749971424942">"உங்கள் பணிக் கணக்குடன் தொடர்புடைய மின்னஞ்சல் மற்றும் கேலெண்டர் போன்ற தரவு"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="4376014821459811800">"உங்கள் சாதனத்தில் உள்ள பயன்பாடுகளின் பட்டியல்"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="4376014821459811800">"உங்கள் சாதனத்தில் உள்ள ஆப்ஸின் பட்டியல்"</string>
     <string name="enterprise_privacy_usage_stats" msgid="445762931318731975">"ஒவ்வொரு பயன்பாட்டிலும் செலவழித்த நேரமும் தரவும்"</string>
     <string name="enterprise_privacy_network_logs" msgid="5427398751599441159">"மிகச் சமீபத்திய நெட்வொர்க் ட்ராஃபிக் பதிவு"</string>
     <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"மிகச் சமீபத்திய பிழை அறிக்கை"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"மிகச் சமீபத்திய பாதுகாப்புப் பதிவு"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"ஏதுமில்லை"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"நிறுவிய ஆப்ஸ்"</string>
-    <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"பயன்பாடுகளின் எண்ணிக்கை கணிப்பின் அடிப்படையிலானது. இதில் Play ஸ்டோரிலிருந்து நிறுவப்படாத பயன்பாடுகள் சேர்க்கப்படாமல் இருக்கலாம்."</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="5020730108878608500">"ஆப்ஸின் எண்ணிக்கை கணிப்பின் அடிப்படையிலானது. இதில் Play ஸ்டோரிலிருந்து நிறுவப்படாத ஆப்ஸ் சேர்க்கப்படாமல் இருக்கலாம்."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5161417161943060602">
-      <item quantity="other">குறைந்தபட்சம் <xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகள்</item>
+      <item quantity="other">குறைந்தபட்சம் <xliff:g id="COUNT_1">%d</xliff:g> ஆப்ஸ்</item>
       <item quantity="one">குறைந்தபட்சம் <xliff:g id="COUNT_0">%d</xliff:g> பயன்பாடு</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="110406267468274216">"இருப்பிடத்திற்கான அனுமதிகள்"</string>
@@ -4212,7 +4214,7 @@
     <string name="do_disclosure_learn_more_separator" msgid="702345537118848010">" "</string>
     <string name="learn_more" msgid="6844160787130206258">"மேலும் அறிக"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8762954032197483848">
-      <item quantity="other">கேமரா பயன்பாடுகள்</item>
+      <item quantity="other">கேமரா ஆப்ஸ்</item>
       <item quantity="one">கேமரா பயன்பாடு</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="6484001237347739255">"கேலெண்டர் ஆப்ஸ்"</string>
@@ -4223,7 +4225,7 @@
     </plurals>
     <string name="default_map_app_title" msgid="6919751358166607185">"வரைபட ஆப்ஸ்"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="7593838689002912108">
-      <item quantity="other">ஃபோன் பயன்பாடுகள்</item>
+      <item quantity="other">ஃபோன் ஆப்ஸ்</item>
       <item quantity="one">ஃபோன் பயன்பாடு</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8267577900046506189">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"இது உங்கள் மொபைலைத் தாமதப்படுத்தும்"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"முழுமையான GNSS அளவீடுகளை அமலாக்கு"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"பணி சுழற்சியை முடக்கி, GNSS வழிசெலுத்துதல்கள் மற்றும் அதிர்வெண்கள் அனைத்தையும் கண்காணித்தல்."</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"பயனர் மாற்றத்தைப் பிழைதிருத்துதல்"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"பயனரை மாற்றும்போது விரிவான விவரங்களைக் காட்டும்"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"பின்னணிச் செயல்பாடு தொடங்க அனுமதி"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"அனைத்துப் பின்னணிச் செயல்பாடுகளையும் தொடங்க அனுமதிக்கும்"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"சிதைவு அறிவிப்பை எப்போதும் காட்டு"</string>
@@ -4459,7 +4463,7 @@
     <string name="mobile_data_ap_mode_disabled" msgid="2452716524753472885">"விமானப் பயன்முறையின்போது கிடைக்காது"</string>
     <string name="force_desktop_mode" msgid="6973100177551040740">"கட்டாய டெஸ்க்டாப் பயன்முறை"</string>
     <string name="force_desktop_mode_summary" msgid="8865007610266954719">"இரண்டாம்நிலை திரைகளில் \'கட்டாயப் பரிசோதனை டெஸ்க்டாப்\' பயன்முறை"</string>
-    <string name="hwui_force_dark_title" msgid="3744825212652331461">"force-dark அம்சத்தை மேலெழுதுதல்"</string>
+    <string name="hwui_force_dark_title" msgid="3744825212652331461">"force-dark அம்சத்தை மீறிச் செயல்படுதல்"</string>
     <string name="hwui_force_dark_summary" msgid="2051891908674765817">"எப்போதும் இயக்கத்தில் இருக்குமாறு force-dark அம்சத்தை மேலெழுதுகிறது"</string>
     <string name="privacy_dashboard_title" msgid="8764930992456607513">"தனியுரிமை"</string>
     <string name="privacy_dashboard_summary" msgid="7916431309860824945">"அனுமதிகள், கணக்குச் செயல்பாடு, தனிப்பட்ட தரவு"</string>
diff --git a/tests/CarDeveloperOptions/res/values-te-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-te-nokeys/strings.xml
new file mode 100644
index 0000000..b6410b0
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-te-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"అనువర్తనాలను నిర్వహించండి"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-te/arrays.xml b/tests/CarDeveloperOptions/res/values-te/arrays.xml
new file mode 100644
index 0000000..c616699
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-te/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"అమెరికా"</item>
+    <item msgid="4791956477275129121">"యూరప్"</item>
+    <item msgid="3812126832016254559">"ఆఫ్రికా"</item>
+    <item msgid="2765816300353408280">"ఆసియా"</item>
+    <item msgid="6683489385344409742">"ఆస్ట్రేలియా"</item>
+    <item msgid="5194868215515664953">"పసిఫిక్"</item>
+    <item msgid="7044520255415007865">"అన్నీ"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 సెకన్లు"</item>
+    <item msgid="772029947136115322">"30 సెకన్లు"</item>
+    <item msgid="8743663928349474087">"1 నిమిషం"</item>
+    <item msgid="1506508631223164814">"2 నిమిషాలు"</item>
+    <item msgid="8664703938127907662">"5 నిమిషాలు"</item>
+    <item msgid="5827960506924849753">"10 నిమిషాలు"</item>
+    <item msgid="6677424950124253938">"30 నిమిషాలు"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"తక్షణమే"</item>
+    <item msgid="2038544972632026612">"5 సెకన్లు"</item>
+    <item msgid="5558060663472279597">"15 సెకన్లు"</item>
+    <item msgid="45341168505452037">"30 సెకన్లు"</item>
+    <item msgid="227647485917789272">"1 నిమిషం"</item>
+    <item msgid="3367011891231217504">"2 నిమిషాలు"</item>
+    <item msgid="4376575879222393045">"5 నిమిషాలు"</item>
+    <item msgid="811192536981678974">"10 నిమిషాలు"</item>
+    <item msgid="7258394417241706272">"30 నిమిషాలు"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"కనెక్ట్ అయింది"</item>
+    <item msgid="983792611851499732">"ఆహ్వానించబడింది"</item>
+    <item msgid="5438273405428201793">"విఫలమైంది"</item>
+    <item msgid="4646663015449312554">"అందుబాటులో ఉంది"</item>
+    <item msgid="3230556734162006146">"పరిధి వెలుపల ఉంది"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 నిమిషాలు"</item>
+    <item msgid="2759776603549270587">"5 నిమిషాలు"</item>
+    <item msgid="167772676068860015">"1 గంట"</item>
+    <item msgid="5985477119043628504">"ఎప్పటికీ గడువు ముగియదు"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"సిస్టమ్ డిఫాల్ట్‌ని ఉపయోగించు: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"గత 30 రోజులు"</item>
+    <item msgid="3211287705232736964">"విని. పునరా. సెట్ చేయి..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"వినియోగ సమయం"</item>
+    <item msgid="2784401352592276015">"చివరిగా ఉపయోగించినది"</item>
+    <item msgid="249854287216326349">"యాప్ పేరు"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ఏదీ వద్దు"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ఏమీ లేవు"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ఏదీ వద్దు"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ఏదీ వద్దు"</item>
+    <item msgid="1464741437353223198">"మాన్యువల్"</item>
+    <item msgid="5793600062487886090">"ప్రాక్సీ ఆటో-కాన్ఫిగరేషన్"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ఏదీ వద్దు"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP లేదా CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"పేర్కొనబడలేదు"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ఏదీ వద్దు"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"అంతర్గత పరికర నిల్వ"</item>
+    <item msgid="3186681694079967527">"తీసివేయదగిన SD కార్డు"</item>
+    <item msgid="6902033473986647035">"సిస్టమ్ నిర్ణయించుకునేలా అనుమతించు"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"స్థానం"</item>
+    <item msgid="6842381562497597649">"వ్యక్తిగతం"</item>
+    <item msgid="3966700236695683444">"సందేశం"</item>
+    <item msgid="8563996233342430477">"మీడియా"</item>
+    <item msgid="5323851085993963783">"పరికరం"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"స్థూల స్థానం"</item>
+    <item msgid="1830619568689922920">"ఖచ్చితమైన స్థానం"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"వైబ్రేట్"</item>
+    <item msgid="8632513128515114092">"పరిచయాలను చదవండి"</item>
+    <item msgid="3741042113569620272">"పరిచయాలను సవరించండి"</item>
+    <item msgid="4204420969709009931">"కాల్ లాగ్‌ను చదవండి"</item>
+    <item msgid="2260380357119423209">"కాల్ లాగ్‌ను సవరించండి"</item>
+    <item msgid="6550710385014530934">"క్యాలెండర్‌ను చదవండి"</item>
+    <item msgid="3575906174264853951">"క్యాలెండర్‌ను సవరించండి"</item>
+    <item msgid="4319843242568057174">"wi-fi స్కాన్"</item>
+    <item msgid="2981791890467303819">"నోటిఫికేషన్"</item>
+    <item msgid="6617825156152476692">"సెల్ స్కాన్"</item>
+    <item msgid="8865260890611559753">"ఫోన్‌కు కాల్ చేయండి"</item>
+    <item msgid="3254999273961542982">"SMSను చదవండి"</item>
+    <item msgid="7711446453028825171">"SMSను వ్రాయండి"</item>
+    <item msgid="6123238544099198034">"SMSను స్వీకరించండి"</item>
+    <item msgid="838342167431596036">"అత్యవసర SMSను స్వీకరించండి"</item>
+    <item msgid="8554432731560956686">"MMSను స్వీకరించండి"</item>
+    <item msgid="7464863464299515059">"WAP పుష్‌ను స్వీకరించండి"</item>
+    <item msgid="310463075729606765">"SMSను పంపండి"</item>
+    <item msgid="7338021933527689514">"ICC SMSను చదవండి"</item>
+    <item msgid="6130369335466613036">"ICC SMSను వ్రాయండి"</item>
+    <item msgid="6536865581421670942">"సెట్టింగ్‌లను సవరించండి"</item>
+    <item msgid="4547203129183558973">"పైభాగంలో గీయండి"</item>
+    <item msgid="9080347512916542840">"నోటిఫికేషన్‌లను యాక్సెస్ చేయండి"</item>
+    <item msgid="5332718516635907742">"కెమెరా"</item>
+    <item msgid="6098422447246167852">"ఆడియోను రికార్డ్ చేయండి"</item>
+    <item msgid="9182794235292595296">"ఆడియో ప్లే చేయండి"</item>
+    <item msgid="8760743229597702019">"క్లిప్‌బోర్డ్‌ను చదవండి"</item>
+    <item msgid="2266923698240538544">"క్లిప్‌బోర్డ్‌ను సవరించండి"</item>
+    <item msgid="1801619438618539275">"మీడియా బటన్‌లు"</item>
+    <item msgid="31588119965784465">"ఆడియో కేంద్రీకరణ"</item>
+    <item msgid="7565226799008076833">"మాస్టర్ వాల్యూమ్"</item>
+    <item msgid="5420704980305018295">"వాయిస్ వాల్యూమ్"</item>
+    <item msgid="5797363115508970204">"రింగ్ వాల్యూమ్"</item>
+    <item msgid="8233154098550715999">"మీడియా వాల్యూమ్"</item>
+    <item msgid="5196715605078153950">"అలారం వాల్యూమ్"</item>
+    <item msgid="394030698764284577">"నోటిఫికేషన్ వాల్యూమ్"</item>
+    <item msgid="8952898972491680178">"బ్లూటూత్ వాల్యూమ్"</item>
+    <item msgid="8506227454543690851">"సక్రియంగా ఉంచండి"</item>
+    <item msgid="1108160036049727420">"స్థానాన్ని పర్యవేక్షించండి"</item>
+    <item msgid="1496205959751719491">"అధిక శక్తివంతమైన స్థానాన్ని పర్యవేక్షించండి"</item>
+    <item msgid="3776296279910987380">"వినియోగ గణాంకాలను పొందండి"</item>
+    <item msgid="8827100324471975602">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
+    <item msgid="6880736730520126864">"టోస్ట్‌ను చూపడం"</item>
+    <item msgid="4933375960222609935">"ప్రాజెక్ట్ మీడియా"</item>
+    <item msgid="8357907018938895462">"VPNని సక్రియం చేయడం"</item>
+    <item msgid="8143812849911310973">"వాల్‌పేపర్ వ్రాయడం"</item>
+    <item msgid="6266277260961066535">"నిర్మాణంలో సహాయం"</item>
+    <item msgid="7715498149883482300">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
+    <item msgid="4046679376726313293">"ఫోన్ స్థితిని చదవడం"</item>
+    <item msgid="6329507266039719587">"వాయిస్ మెయిల్‌ను జోడించడం"</item>
+    <item msgid="7692440726415391408">"sipని ఉపయోగించడం"</item>
+    <item msgid="8572453398128326267">"వెళ్లే కాల్‌ను ప్రాసెస్ చేయడం"</item>
+    <item msgid="7775674394089376306">"వేలిముద్ర"</item>
+    <item msgid="3182815133441738779">"శరీర సెన్సార్‌లు"</item>
+    <item msgid="2793100005496829513">"సెల్ ప్రసారాలను చదవడం"</item>
+    <item msgid="2633626056029384366">"స్థానాన్ని నకిలీ చేయడం"</item>
+    <item msgid="8356842191824684631">"నిల్వను చదవడం"</item>
+    <item msgid="5671906070163291500">"నిల్వలో వ్రాయడం"</item>
+    <item msgid="2791955098549340418">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
+    <item msgid="5599435119609178367">"ఖాతాలను పొందడం"</item>
+    <item msgid="1165623660533024666">"నేపథ్యంలో అమలు చేయడం"</item>
+    <item msgid="6423861043647911030">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"తక్కువ సేపు"</item>
+    <item msgid="4816511817309094890">"మధ్యస్థం"</item>
+    <item msgid="8305084671259331134">"ఎక్కువ సేపు"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"డిఫాల్ట్"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif సంక్షిప్తం"</item>
+    <item msgid="6529379119163117545">"Sans-serif మోనోస్పేస్"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif మోనోస్పేస్"</item>
+    <item msgid="4448481989108928248">"సాధారణం"</item>
+    <item msgid="4627069151979553527">"కర్సివ్"</item>
+    <item msgid="6896773537705206194">"చిన్న క్యాపిటల్‌లు"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"డిఫాల్ట్"</item>
+    <item msgid="6488643537808152001">"ఏదీ వద్దు"</item>
+    <item msgid="552332815156010137">"చుట్టుగీత"</item>
+    <item msgid="7187891159463789272">"నీడ ఉంచు"</item>
+    <item msgid="8019330250538856521">"పైకి ఎత్తి ఉంచినట్లుగా"</item>
+    <item msgid="8987385315647049787">"క్రిందికి ఉన్నట్లుగా"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"పూర్వ-భాగస్వామ్య కీలతో L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"ప్రమాణపత్రాలతో L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"పూర్వ-భాగస్వామ్య కీలు మరియు Xauth ప్రామాణీకరణతో IPSec VPN"</item>
+    <item msgid="3319427315593649917">"ప్రమాణపత్రాలు మరియు Xauth ప్రామాణీకరణతో IPSec VPN"</item>
+    <item msgid="8258927774145391041">"ప్రమాణపత్రాలు మరియు హైబ్రిడ్ ప్రామాణీకరణతో IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ఏదీ వద్దు"</item>
+    <item msgid="1157046369795346308">"మాన్యువల్"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"అడగండి"</item>
+    <item msgid="7718817231348607934">"ఎప్పటికీ అనుమతించవద్దు"</item>
+    <item msgid="8184570120217958741">"ఎల్లప్పుడూ అనుమతించు"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"స్థిరం"</item>
+    <item msgid="167418068739176448">"ప్రముఖ కార్యకలాపం"</item>
+    <item msgid="4760813290195199773">"ముఖ్యం (ముందుభాగం)"</item>
+    <item msgid="2328684826817647595">"ముఖ్యం (నేపథ్యం)"</item>
+    <item msgid="7746406490652867365">"బ్యాకప్"</item>
+    <item msgid="5597404364389196754">"అధిక భారం"</item>
+    <item msgid="1290888779300174556">"సేవ (అమలవుతోంది)"</item>
+    <item msgid="7241098542073939046">"సేవ (పునఃప్రారంభమవుతోంది)"</item>
+    <item msgid="6610439017684111046">"రిసీవర్"</item>
+    <item msgid="7367606086319921117">"హోమ్"</item>
+    <item msgid="3344660712396741826">"చివరి కార్యకలాపం"</item>
+    <item msgid="5006559348883303865">"కాష్ చేసినవి (కార్యకలాపం)"</item>
+    <item msgid="8633480732468137525">"కాష్ చేసినవి (కార్యకలాపం క్లయింట్)"</item>
+    <item msgid="6248998242443333892">"కాష్ చేసినవి (ఖాళీ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"నీలి ఆకుపచ్చ"</item>
+    <item msgid="3228505970082457852">"నీలి రంగు"</item>
+    <item msgid="6590260735734795647">"నీలిరంగు"</item>
+    <item msgid="3521763377357218577">"వంగ రంగు"</item>
+    <item msgid="5932337981182999919">"గులాబీ"</item>
+    <item msgid="5642914536624000094">"ఎరుపు రంగు"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 రోజులు పైబడినవి"</item>
+    <item msgid="8699273238891265610">"60 రోజులు పైబడినవి"</item>
+    <item msgid="8346279419423837266">"90 రోజులు పైబడినవి"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ఆటోమేటిక్‌గా గుర్తించు"</item>
+    <item msgid="773943026484148895">"గణించబడేదానిగా పరిగణించండి"</item>
+    <item msgid="1008268820118852416">"గణించబడనిదిగా పరిగణించండి"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"యాదృచ్ఛిక MAC అడ్రస్‌ని ఉపయోగించండి (డిఫాల్ట్)"</item>
+    <item msgid="214234417308375326">"MAC పరికరాన్ని ఉపయోగించండి"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"వద్దు"</item>
+    <item msgid="1930581185557754880">"అవును"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"ముదురు రంగు"</item>
+    <item msgid="5079453644557603349">"లేత రంగు"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ఆఫ్‌లో ఉంది"</item>
+    <item msgid="4072198137051566919">"డీబగ్"</item>
+    <item msgid="2473005316958868509">"విశదీకృత"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"ఇల్లు మాత్రమే"</item>
+    <item msgid="1161026694891024702">"ఆటోమేటిక్‌"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"ప్రాధాన్యత ఉన్న నెట్‌వర్క్ మోడ్‌లు: GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"GSM మాత్రమే"</item>
+    <item msgid="8579197487913425819">"WCDMA మాత్రమే"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA స్వయంచాలకం"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo ఆటోమేటిక్‌"</item>
+    <item msgid="4219607161971472471">"CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo మాత్రమే"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"అంతర్జాతీయ"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA మాత్రమే"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"అంతర్జాతీయ"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMT"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-te/strings.xml b/tests/CarDeveloperOptions/res/values-te/strings.xml
index 9f09c49..51bb24d 100644
--- a/tests/CarDeveloperOptions/res/values-te/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-te/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"స్క్రీన్ లాక్ ఎంపికతో మీ టాబ్లెట్‌ను రక్షించండి, తద్వారా అది పోయిన లేదా దొంగిలించబడిన దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖ ప్రమాణీకరణను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. రద్దు చేయిని నొక్కండి, తర్వాత పిన్‌ను సెట్ చేయండి లేదా మరొక స్క్రీన్ లాక్ ఎంపికను ఎంచుకోండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"స్క్రీన్ లాక్ ఎంపికతో మీ పరికరాన్ని రక్షించండి, తద్వారా అది పోయిన లేదా దొంగిలించబడిన దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖ ప్రమాణీకరణను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. రద్దు చేయిని నొక్కండి, తర్వాత పిన్‌ను సెట్ చేయండి లేదా మరొక స్క్రీన్ లాక్ ఎంపికను ఎంచుకోండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"స్క్రీన్ లాక్ ఎంపికతో మీ ఫోన్‌ను రక్షించండి, తద్వారా అది పోయిన లేదా దొంగిలించబడిన దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖ ప్రమాణీకరణను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. రద్దు చేయిని నొక్కండి, తర్వాత పిన్‌ను సెట్ చేయండి లేదా మరొక స్క్రీన్ లాక్ ఎంపికను ఎంచుకోండి."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"పిన్ సెటప్‌ను దాటవేయాలా?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"పాస్‌వర్డ్‌ సెటప్‌ దాటవేయాలా?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ఆకృతి సెటప్‌ను దాటవేయాలా?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"స్క్రీన్ లాక్‌ను సెటప్ చేయి"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"మొబైల్"</item>
+    <item msgid="6007360612667098926">"Wi-Fi మాత్రమే"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1303,7 +1305,7 @@
     <string name="system_update_settings_list_item_title" msgid="1907497454722790033">"సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="system_update_settings_list_item_summary" msgid="3497456690691907873"></string>
     <string name="firmware_version" msgid="547095584029938749">"Android వెర్షన్"</string>
-    <string name="security_patch" msgid="483709031051932208">"Android భద్రతా అతికింపు స్థాయి"</string>
+    <string name="security_patch" msgid="483709031051932208">"Android భద్రతా ప్యాచ్ స్థాయి"</string>
     <string name="model_info" msgid="1729765474260797594">"మోడల్"</string>
     <string name="model_summary" msgid="8781425868254352168">"మోడల్: %1$s"</string>
     <string name="hardware_info" msgid="174270144950621815">"మోడల్ &amp; హార్డ్‌వేర్"</string>
@@ -2088,7 +2090,7 @@
     <string name="accessibility_notification_vibration_title" msgid="1005799039440510298">"నోటిఫికేషన్ వైబ్రేషన్"</string>
     <string name="accessibility_ring_vibration_title" msgid="7943341443551359985">"రింగ్ వైబ్రేషన్"</string>
     <string name="accessibility_touch_vibration_title" msgid="285890135612038092">"స్పర్శ వైబ్రేషన్"</string>
-    <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"సేవని ఉపయోగించండి"</string>
+    <string name="accessibility_service_master_switch_title" msgid="2734791644475782924">"ఈ సేవను ఉపయోగించు"</string>
     <string name="accessibility_daltonizer_master_switch_title" msgid="4855011639012300777">"రంగు సవరణను ఉపయోగించండి"</string>
     <string name="accessibility_caption_master_switch_title" msgid="6373335123229234053">"శీర్షికలను ఉపయోగించండి"</string>
     <string name="accessibility_hearingaid_instruction_continue_button" msgid="4650111296711466691">"కొనసాగించు"</string>
@@ -2420,7 +2422,7 @@
     <string name="battery_used_by" msgid="840331542883421888">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ఉపయోగించింది"</string>
     <string name="battery_overall_usage" msgid="5874301442415987516">"మొత్తం బ్యాటరీలో <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_detail_since_full_charge" msgid="3814176986148084378">"చివరిసారి పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి వినియోగ వివరాలు"</string>
-    <string name="battery_last_full_charge" msgid="5624033030647170717">"చివర‌గా పూర్తి ఛార్జ్ చేసింది"</string>
+    <string name="battery_last_full_charge" msgid="5624033030647170717">"చివరిసారి పూర్తిగా ఛార్జ్ చేసింది"</string>
     <string name="battery_full_charge_last" msgid="4614554109170251301">"పూర్తి ఛార్జ్ మిగిలి ఉండే సమయం"</string>
     <string name="battery_footer_summary" msgid="4828444679643906943">"బ్యాటరీ వినియోగ డేటా క‌చ్చితం కాదు. వాడ‌కాన్ని బ‌ట్టి మారుతూ ఉంటుంది"</string>
     <string name="battery_detail_foreground" msgid="6616408559186553085">"ఫోన్ బాగా వాడుతున్న‌ప్పుడు"</string>
@@ -2459,7 +2461,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="2623381258359775227">"ఎప్పటికీ వద్దు"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="434270432432390307">"<xliff:g id="PERCENT">%1$s</xliff:g> బ్యాటరీ ఉన్నప్పుడు"</string>
     <string name="battery_percentage" msgid="7782252476471033843">"బ్యాటరీ పవర్ శాతం"</string>
-    <string name="battery_percentage_description" msgid="9219875229166700610">"స్థితి బార్‌లో బ్యాటరీ పవర్ శాతాన్ని చూపు"</string>
+    <string name="battery_percentage_description" msgid="9219875229166700610">"స్టేటస్ బార్‌లో బ్యాటరీ పవర్ శాతాన్ని చూపుతుంది"</string>
     <string name="process_stats_summary_title" msgid="9189588417488537954">"ప్రాసెస్ గణాంకాలు"</string>
     <string name="process_stats_summary" msgid="8077998499161221885">"అమలవుతున్న ప్రాసెస్‌ల గురించి అసాధారణమైన గణాంకాలు"</string>
     <string name="app_memory_use" msgid="5126237308545653706">"మెమరీ వినియోగం"</string>
@@ -2519,13 +2521,13 @@
     <string name="credentials_install" product="nosdcard" msgid="8509362500537206883">"నిల్వ నుండి ఇన్‌స్టాల్ చేయండి"</string>
     <string name="credentials_install" product="default" msgid="8997183776710118353">"SD కార్డు నుండి ఇన్‌స్టాల్ చేయండి"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="3426661965567059596">"నిల్వ నుండి స‌ర్టిఫికెట్‌ల‌ను ఇన్‌స్టాల్ చేయండి"</string>
-    <string name="credentials_install_summary" product="default" msgid="4943897416156671633">"SD కార్డు నుండి ప్రమాణపత్రాలను ఇన్‌స్టాల్ చేయండి"</string>
+    <string name="credentials_install_summary" product="default" msgid="4943897416156671633">"SD కార్డు నుండి సర్టిఫికెట్‌లను ఇన్‌స్టాల్ చేయండి"</string>
     <string name="credentials_reset" msgid="355080737664731678">"ఆధారాలను క్లియర్ చేయండి"</string>
     <string name="credentials_reset_summary" msgid="7622528359699428555">"అన్ని స‌ర్టిఫికెట్‌ల‌ను తీసివేయండి"</string>
     <string name="trusted_credentials" msgid="6989242522455395200">"విశ్వసనీయ ఆధారాలు"</string>
-    <string name="trusted_credentials_summary" msgid="7411781319056251582">"విశ్వసనీయ CA స‌ర్టిఫికెట్‌ల‌ను ప్రదర్శించు"</string>
+    <string name="trusted_credentials_summary" msgid="7411781319056251582">"విశ్వసనీయ CA స‌ర్టిఫికెట్‌ల‌ను ప్రదర్శిస్తుంది"</string>
     <string name="user_credentials" msgid="8365731467650306757">"వినియోగదారు ఆధారాలు"</string>
-    <string name="user_credentials_summary" msgid="7350223899317423252">"నిల్వ చేసిన ఆధారాలను వీక్షించండి మరియు సవరించండి"</string>
+    <string name="user_credentials_summary" msgid="7350223899317423252">"నిల్వ ఉన్న ఆధారాలను చూడండి, వాటిని సవరించండి"</string>
     <string name="advanced_security_title" msgid="286883005673855845">"అధునాతనం"</string>
     <string name="credential_storage_type" msgid="2585337320206095255">"నిల్వ రకం"</string>
     <string name="credential_storage_type_hardware" msgid="5054143224259023600">"హార్డ్‌వేర్ మద్దతు"</string>
@@ -2612,7 +2614,7 @@
     <string name="sync_one_time_sync" msgid="6005174168405784256">"ఇప్పుడే సమకాలీకరించడానికి నొక్కండి<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="4457967084840001296">"Gmail"</string>
-    <string name="sync_calendar" msgid="6573708019827519372">"క్యాలెండర్"</string>
+    <string name="sync_calendar" msgid="6573708019827519372">"Calendar"</string>
     <string name="sync_contacts" msgid="5687434785723746534">"పరిచయాలు"</string>
     <string name="sync_plug" msgid="6703804441408427257"><font fgcolor="#ffffffff">"Google సమకాలీకరణకు స్వాగతం!"</font>" \nమీరు ఎక్కడ ఉన్నా సరే మీ పరిచయాలు, నియామకాలు మరియు మరిన్నింటికి ప్రాప్యతను అనుమతించడం కోసం డేటాను సమకాలీకరించడానికి Google అవలంబించే విధానం."</string>
     <string name="header_application_sync_settings" msgid="4581847153669774489">"అనువర్తన సమకాలీకరణ సెట్టింగ్‌లు"</string>
@@ -3382,7 +3384,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"pip picture in"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"చిత్రంలో చిత్రం"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"చిత్రంలో చిత్రాన్ని అనుమతించు"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"యాప్ తెరవబడి ఉన్నప్పుడు లేదా మీరు దాని నుండి నిష్క్రమించినప్పుడు (ఉదాహరణకు, వీడియోని చూడటం కొనసాగించడానికి) చిత్రంలో చిత్రం విండోని సృష్టించడానికి ఈ యాప్‌ని అనుమతించండి. మీరు ఉపయోగించే ఇతర యాప్‌‌ల ఎగువన ఈ విండో ప్రదర్శితమవుతుంది."</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"యాప్ తెరిచి ఉన్నప్పుడు లేదా మీరు దాని నుండి బ‌య‌ట‌కు వెళ్లిపోయిన‌ప్పుడు \'చిత్రంలో చిత్రం\' విండోను సృష్టించడానికి  ఈ యాప్‌ను అనుమతించండి (ఉదాహరణకు, వీడియోను చూడటం కొనసాగించడానికి). మీరు ఉపయోగించే ఇతర యాప్‌‌ల ఎగువున ఈ విండో ప్రదర్శితమవుతుంది."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"\'అంతరాయం కలిగించవద్దు\' ఫీచర్‌ను అనుమతించు"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
@@ -3397,7 +3399,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> వర్గం</item>
     </plurals>
     <string name="no_channels" msgid="8884254729302501652">"ఈ యాప్ ఏ నోటిఫికేషన్‌లను పోస్ట్ చేయలేదు"</string>
-    <string name="app_settings_link" msgid="8465287765715790984">"యాప్‌లో అదనపు సెట్టింగ్‌లు"</string>
+    <string name="app_settings_link" msgid="8465287765715790984">"యాప్‌లోని అదనపు సెట్టింగ్‌లు"</string>
     <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"అన్ని యాప్‌లలో ఆన్ చేయబడ్డాయి"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> యాప్‌లలో ఆఫ్ చేయబడింది</item>
@@ -3443,9 +3445,9 @@
     <string name="zen_mode_unknown_app_set_behavior" msgid="5666462954329932302">"ఈ సెట్టింగ్‌లు ప్రస్తుతం మార్చబడవు. ఒక యాప్ అనుకూల ప్రవర్తనతో స్వయంచాలకంగా అంతరాయం కలిగించవద్దుని ఆన్ చేసింది."</string>
     <string name="zen_mode_qs_set_behavior" msgid="788646569296973998">"ఈ సెట్టింగ్‌లు ప్రస్తుతం మార్చబడవు. అనుకూల ప్రవర్తనతో అంతరాయం కలిగించవద్దు మాన్యువల్‌గా ఆన్ చేయబడింది."</string>
     <string name="zen_schedule_rule_type_name" msgid="4516851728113801329">"సమయం"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"పేర్కొన్న సమయాల్లో అంతరాయం కలిగించవద్దు ఆన్ అయ్యేలా స్వయంచాలక నిబంధన సెట్ చేయబడింది"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="1742354493045049048">"నిర్దేశిత‌ సమయాల్లో \'అంతరాయం కలిగించవద్దు\' ఆన్ అయ్యేలా ఆటోమేటిక్ నిబంధన సెట్ చేయబడింది"</string>
     <string name="zen_event_rule_type_name" msgid="7467729997336583342">"ఈవెంట్"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"పేర్కొన్న సందర్భాల్లో అంతరాయం కలిగించవద్దు ఆన్ అయ్యేలా స్వయంచాలక నిబంధన సెట్ చేయబడింది"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="7087368268966855976">"నిర్దిష్ట‌ సందర్భాల్లో \'అంతరాయం కలిగించవద్దు\' ఆన్ అయ్యేలా ఆటోమేటిక్ నిబంధన సెట్ చేయబడింది"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6088077103908487442">"వీటి సంబంధిత ఈవెంట్‌ల సమయంలో"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="4027207992040792657">"<xliff:g id="CALENDAR">%1$s</xliff:g> సంబంధిత ఈవెంట్‌ల సమయంలో"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="7590085295784895885">"ఏదైనా క్యాలెండర్"</string>
@@ -3701,10 +3703,10 @@
       <item quantity="other">యాప్‌ల కారణంగా బ్యాటరీ ఖాళీ అవుతోంది</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> కారణంగా బ్యాటరీ ఖాళీ అవుతోంది</item>
     </plurals>
-    <string name="high_power_filter_on" msgid="5294209328473386403">"అనుకూలీకరించనివి"</string>
+    <string name="high_power_filter_on" msgid="5294209328473386403">"ఆప్టిమైజ్ చేయనివి"</string>
     <string name="high_power_on" msgid="3573501822510580334">"అనుకూలీకరించబడలేదు"</string>
     <string name="high_power_off" msgid="5906679734326490426">"బ్యాటరీ వినియోగాన్ని ఆప్టిమైజ్ చేస్తోంది"</string>
-    <string name="high_power_system" msgid="739584574711292753">"బ్యాటరీ అనుకూలీకరణ అందుబాటులో లేదు"</string>
+    <string name="high_power_system" msgid="739584574711292753">"బ్యాటరీ ఆప్టిమైజేషన్ అందుబాటులో లేదు"</string>
     <string name="high_power_desc" msgid="333756885680362741">"బ్యాటరీ అనుకూలీకరణను వర్తింపజేయదు. మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు."</string>
     <string name="high_power_prompt_title" msgid="2805745781720454052">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించాలా?"</string>
     <string name="high_power_prompt_body" msgid="8067395096053552289">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతిస్తే బ్యాటరీ జీవితకాలం తగ్గిపోవచ్చు. \n\nమీరు తర్వాత సెట్టింగ్‌లు &gt; యాప్‌లు &amp; నోటిఫికేషన్‌లలోకి వెళ్లి దీనిని మార్చవచ్చు."</string>
@@ -3864,7 +3866,7 @@
     <string name="users_summary" msgid="6693338169439092387">"<xliff:g id="USER_NAME">%1$s</xliff:g>గా సైన్ ఇన్ చేసారు"</string>
     <string name="payment_summary" msgid="1381646849276543242">"<xliff:g id="APP_NAME">%1$s</xliff:g> డిఫాల్ట్‌గా ఉంది"</string>
     <string name="backup_disabled" msgid="6941165814784765643">"బ్యాకప్ నిలిపివేయబడింది"</string>
-    <string name="android_version_summary" msgid="2192751442789395445">"Android <xliff:g id="VERSION">%1$s</xliff:g>కి అప్‌డేట్ చేయబడింది"</string>
+    <string name="android_version_summary" msgid="2192751442789395445">"Android <xliff:g id="VERSION">%1$s</xliff:g>కు అప్‌డేట్ చేయబడింది"</string>
     <string name="android_version_pending_update_summary" msgid="3554543810520655076">"అప్‌డేట్ అందుబాటులో ఉంది"</string>
     <string name="disabled_by_policy_title" msgid="1238318274952958846">"చర్య అనుమతించబడదు"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7094547090629203316">"వాల్యూమ్‌ని మార్చలేరు"</string>
@@ -4274,6 +4276,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"దీని వలన ఈ ఫోన్ పనితీరు నెమ్మదిస్తుంది"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"శక్తివంతమైన GNSS కొలతలు"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు ఫ్రీక్వెన్సీలను ట్రాక్ చేయండి"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"యూజర్‌ను మార్చేటప్పుడు డీబగ్ చేయి"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"యూజర్‌ను మార్చేటప్పుడు వివరణాత్మక సమాచారాన్ని చూపించు"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"బ్యాక్‌గ్రౌండ్ కార్యకలాపం మొదలవ్వడానికి అనుమతి ఇవ్వు"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"మొత్తం బ్యాక్‌గ్రౌండ్ కార్యకలాపం మొదలవ్వడానికి అనుమతిస్తుంది"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ఎల్లప్పుడూ క్రాష్ డైలాగ్‌ని చూపు"</string>
diff --git a/tests/CarDeveloperOptions/res/values-th-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-th-nokeys/strings.xml
new file mode 100644
index 0000000..a4a738e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-th-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"จัดการแอปพลิเคชัน"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-th/arrays.xml b/tests/CarDeveloperOptions/res/values-th/arrays.xml
new file mode 100644
index 0000000..b0bf1de
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-th/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"อเมริกา"</item>
+    <item msgid="4791956477275129121">"ยุโรป"</item>
+    <item msgid="3812126832016254559">"แอฟริกา"</item>
+    <item msgid="2765816300353408280">"เอเชีย"</item>
+    <item msgid="6683489385344409742">"ออสเตรเลีย"</item>
+    <item msgid="5194868215515664953">"แปซิฟิก"</item>
+    <item msgid="7044520255415007865">"ทั้งหมด"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 วินาที"</item>
+    <item msgid="772029947136115322">"30 วินาที"</item>
+    <item msgid="8743663928349474087">"1 นาที"</item>
+    <item msgid="1506508631223164814">"2 นาที"</item>
+    <item msgid="8664703938127907662">"5 นาที"</item>
+    <item msgid="5827960506924849753">"10 นาที"</item>
+    <item msgid="6677424950124253938">"30 นาที"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"ไม่เลย"</item>
+    <item msgid="2517785806387977252">"15 วินาที"</item>
+    <item msgid="6347954399441173672">"30 วินาที"</item>
+    <item msgid="4858305253279921789">"1 นาที"</item>
+    <item msgid="8109273437140044073">"2 นาที"</item>
+    <item msgid="2788593551142462622">"5 นาที"</item>
+    <item msgid="8012672183888404961">"10 นาที"</item>
+    <item msgid="8271452751594598661">"30 นาที"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"ทันที"</item>
+    <item msgid="2038544972632026612">"5 วินาที"</item>
+    <item msgid="5558060663472279597">"15 วินาที"</item>
+    <item msgid="45341168505452037">"30 วินาที"</item>
+    <item msgid="227647485917789272">"1 นาที"</item>
+    <item msgid="3367011891231217504">"2 นาที"</item>
+    <item msgid="4376575879222393045">"5 นาที"</item>
+    <item msgid="811192536981678974">"10 นาที"</item>
+    <item msgid="7258394417241706272">"30 นาที"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"เล็ก"</item>
+    <item msgid="591935967183159581">"ค่าเริ่มต้น"</item>
+    <item msgid="1714184661981538355">"ใหญ่"</item>
+    <item msgid="6195563047686707484">"ใหญ่ที่สุด"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"กำลังสแกน..."</item>
+    <item msgid="5597394826455877834">"กำลังเชื่อมต่อ…"</item>
+    <item msgid="5848277343965362748">"กำลังตรวจสอบสิทธิ์..."</item>
+    <item msgid="3391238031431440676">"กำลังรับที่อยู่ IP…"</item>
+    <item msgid="5257597310494000224">"เชื่อมต่อแล้ว"</item>
+    <item msgid="8472497592913050396">"ระงับไว้"</item>
+    <item msgid="1228072488815999109">"กำลังตัดการเชื่อมต่อ..."</item>
+    <item msgid="7253087004422991731">"ถูกตัดการเชื่อมต่อ"</item>
+    <item msgid="4169850917304751227">"ไม่สำเร็จ"</item>
+    <item msgid="6266658166690831131">"ถูกบล็อก"</item>
+    <item msgid="4517230805854909775">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"กำลังสแกน..."</item>
+    <item msgid="8058143476674427024">"กำลังเชื่อมต่อไปยัง <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"กำลังตรวจสอบสิทธิ์กับ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"กำลังรับที่อยู่ IP จาก <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"เชื่อมต่อกับ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> แล้ว"</item>
+    <item msgid="6600156231416890902">"ระงับไว้"</item>
+    <item msgid="4133290864821295785">"กำลังตัดการเชื่อมต่อจาก <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="3980154971187953257">"ถูกตัดการเชื่อมต่อ"</item>
+    <item msgid="2847316776634969068">"ไม่สำเร็จ"</item>
+    <item msgid="4390990424746035383">"ถูกบล็อก"</item>
+    <item msgid="3618248791367063949">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"ปุ่มกด"</item>
+    <item msgid="7401896200768713930">"PIN จากอุปกรณ์เพียร์"</item>
+    <item msgid="4526848028011846710">"PIN จากอุปกรณ์นี้"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"เชื่อมต่อแล้ว"</item>
+    <item msgid="983792611851499732">"เชิญแล้ว"</item>
+    <item msgid="5438273405428201793">"ไม่สำเร็จ"</item>
+    <item msgid="4646663015449312554">"ใช้งานได้"</item>
+    <item msgid="3230556734162006146">"อยู่นอกระยะสัญญาณ"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 นาที"</item>
+    <item msgid="2759776603549270587">"5 นาที"</item>
+    <item msgid="167772676068860015">"1 ชั่วโมง"</item>
+    <item msgid="5985477119043628504">"ไม่มีระยะหมดเวลา"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"ใช้ค่าเริ่มต้นของระบบ: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"อ่อน"</item>
+    <item msgid="7882129634982603782">"อ่อน"</item>
+    <item msgid="6457357501905996224">"ปานกลาง"</item>
+    <item msgid="405271628162918841">"ดี"</item>
+    <item msgid="999948812884919584">"ดีมาก"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 วันที่ผ่านมา"</item>
+    <item msgid="3211287705232736964">"ตั้งรอบการใช้..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"เวลาการใช้งาน"</item>
+    <item msgid="2784401352592276015">"ครั้งสุดท้ายที่ใช้"</item>
+    <item msgid="249854287216326349">"ชื่อแอปพลิเคชัน"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"ไม่มี"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"ไม่มี"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"ไม่มี"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"คงที่"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"ไม่มี"</item>
+    <item msgid="1464741437353223198">"คู่มือ"</item>
+    <item msgid="5793600062487886090">"กำหนดค่าพร็อกซีอัตโนมัติ"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"ไม่มี"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP หรือ CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"ไม่ระบุ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"ไม่มี"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"ที่จัดเก็บข้อมูลอุปกรณ์ภายใน"</item>
+    <item msgid="3186681694079967527">"การ์ด SD แบบนำออกได้"</item>
+    <item msgid="6902033473986647035">"ให้ระบบเลือก"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"ตำแหน่ง"</item>
+    <item msgid="6842381562497597649">"ส่วนตัว"</item>
+    <item msgid="3966700236695683444">"การรับส่งข้อความ"</item>
+    <item msgid="8563996233342430477">"สื่อ"</item>
+    <item msgid="5323851085993963783">"อุปกรณ์"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"ตำแหน่งคร่าวๆ"</item>
+    <item msgid="1830619568689922920">"ตำแหน่งโดยละเอียด"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"สั่น"</item>
+    <item msgid="8632513128515114092">"อ่านรายชื่อติดต่อ"</item>
+    <item msgid="3741042113569620272">"แก้ไขรายชื่อติดต่อ"</item>
+    <item msgid="4204420969709009931">"อ่านประวัติการโทร"</item>
+    <item msgid="2260380357119423209">"แก้ไขประวัติการโทร"</item>
+    <item msgid="6550710385014530934">"อ่านปฏิทิน"</item>
+    <item msgid="3575906174264853951">"แก้ไขปฏิทิน"</item>
+    <item msgid="4319843242568057174">"ค้นหา WiFi"</item>
+    <item msgid="2981791890467303819">"การแจ้งเตือน"</item>
+    <item msgid="6617825156152476692">"ค้นหาเซลล์"</item>
+    <item msgid="8865260890611559753">"โทรเข้าโทรศัพท์"</item>
+    <item msgid="3254999273961542982">"อ่าน SMS"</item>
+    <item msgid="7711446453028825171">"เขียน SMS"</item>
+    <item msgid="6123238544099198034">"รับ SMS"</item>
+    <item msgid="838342167431596036">"รับ SMS ฉุกเฉิน"</item>
+    <item msgid="8554432731560956686">"รับ MMS"</item>
+    <item msgid="7464863464299515059">"รับ WAP Push"</item>
+    <item msgid="310463075729606765">"ส่ง SMS"</item>
+    <item msgid="7338021933527689514">"อ่าน ICC SMS"</item>
+    <item msgid="6130369335466613036">"เขียน ICC SMS"</item>
+    <item msgid="6536865581421670942">"แก้ไขการตั้งค่า"</item>
+    <item msgid="4547203129183558973">"วาดด้านบน"</item>
+    <item msgid="9080347512916542840">"เข้าถึงการแจ้งเตือน"</item>
+    <item msgid="5332718516635907742">"กล้อง"</item>
+    <item msgid="6098422447246167852">"บันทึกเสียง"</item>
+    <item msgid="9182794235292595296">"เล่นเสียง"</item>
+    <item msgid="8760743229597702019">"อ่านคลิปบอร์ด"</item>
+    <item msgid="2266923698240538544">"แก้ไขคลิปบอร์ด"</item>
+    <item msgid="1801619438618539275">"ปุ่มสื่อ"</item>
+    <item msgid="31588119965784465">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="7565226799008076833">"ระดับเสียงหลัก"</item>
+    <item msgid="5420704980305018295">"ระดับเสียงสนทนา"</item>
+    <item msgid="5797363115508970204">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="8233154098550715999">"ระดับเสียงของสื่อ"</item>
+    <item msgid="5196715605078153950">"ระดับเสียงปลุก"</item>
+    <item msgid="394030698764284577">"ระดับเสียงการแจ้งเตือน"</item>
+    <item msgid="8952898972491680178">"ระดับเสียงบลูทูธ"</item>
+    <item msgid="8506227454543690851">"ทำงานตลอดเวลา"</item>
+    <item msgid="1108160036049727420">"ตำแหน่งจอภาพ"</item>
+    <item msgid="1496205959751719491">"ติดตามตำแหน่งโดยใช้พลังงานมาก"</item>
+    <item msgid="3776296279910987380">"ดูสถิติการใช้งาน"</item>
+    <item msgid="8827100324471975602">"ปิด/เปิดเสียงไมโครโฟน"</item>
+    <item msgid="6880736730520126864">"แสดงข้อความโทสต์"</item>
+    <item msgid="4933375960222609935">"สื่อของโครงการ"</item>
+    <item msgid="8357907018938895462">"เปิดใช้งาน VPN"</item>
+    <item msgid="8143812849911310973">"เขียนวอลเปเปอร์"</item>
+    <item msgid="6266277260961066535">"สนับสนุนโครงสร้าง"</item>
+    <item msgid="7715498149883482300">"สนับสนุนภาพหน้าจอ"</item>
+    <item msgid="4046679376726313293">"อ่านสถานะโทรศัพท์"</item>
+    <item msgid="6329507266039719587">"เพิ่มข้อความเสียง"</item>
+    <item msgid="7692440726415391408">"ใช้ SIP"</item>
+    <item msgid="8572453398128326267">"โทรออก"</item>
+    <item msgid="7775674394089376306">"ลายนิ้วมือ"</item>
+    <item msgid="3182815133441738779">"เซ็นเซอร์ร่างกาย"</item>
+    <item msgid="2793100005496829513">"อ่านการส่งข้อมูลเตือนภัยทางมือถือ (CB)"</item>
+    <item msgid="2633626056029384366">"จำลองสถานที่"</item>
+    <item msgid="8356842191824684631">"อ่านพื้นที่เก็บข้อมูล"</item>
+    <item msgid="5671906070163291500">"เขียนพื้นที่เก็บข้อมูล"</item>
+    <item msgid="2791955098549340418">"เปิดหน้าจอ"</item>
+    <item msgid="5599435119609178367">"สร้างบัญชี"</item>
+    <item msgid="1165623660533024666">"ทำงานในพื้นหลัง"</item>
+    <item msgid="6423861043647911030">"ระดับเสียงการเข้าถึง"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"สั้น"</item>
+    <item msgid="4816511817309094890">"ปานกลาง"</item>
+    <item msgid="8305084671259331134">"ยาว"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ค่าเริ่มต้น"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif แบบย่อ"</item>
+    <item msgid="6529379119163117545">"Sans-serif ความกว้างคงที่"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif ความกว้างคงที่"</item>
+    <item msgid="4448481989108928248">"แบบไม่เป็นทางการ"</item>
+    <item msgid="4627069151979553527">"คัดลายมือ"</item>
+    <item msgid="6896773537705206194">"อักษรตัวพิมพ์ใหญ่ขนาดเล็ก"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"เล็กมาก"</item>
+    <item msgid="5091603983404027034">"เล็ก"</item>
+    <item msgid="176844712416932112">"ปกติ"</item>
+    <item msgid="2784236342175159295">"ใหญ่"</item>
+    <item msgid="218913203203160606">"ใหญ่มาก"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ค่าเริ่มต้น"</item>
+    <item msgid="6488643537808152001">"ไม่มี"</item>
+    <item msgid="552332815156010137">"ตีกรอบ"</item>
+    <item msgid="7187891159463789272">"เงาตกกระทบ"</item>
+    <item msgid="8019330250538856521">"ยกสูงขึ้น"</item>
+    <item msgid="8987385315647049787">"ลดต่ำ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"ใช้ค่าเริ่มต้นของแอป"</item>
+    <item msgid="8611890312638868524">"สีขาวบนพื้นสีดำ"</item>
+    <item msgid="5891360837786277638">"สีดำบนพื้นสีขาว"</item>
+    <item msgid="2798457065945456853">"สีเหลืองบนพื้นสีดำ"</item>
+    <item msgid="5799049811524553967">"สีเหลืองบนพื้นสีน้ำเงิน"</item>
+    <item msgid="3673930830658169860">"กำหนดเอง"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN พร้อมด้วยคีย์ที่แชร์ไว้ล่วงหน้า"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN พร้อมด้วยใบรับรอง"</item>
+    <item msgid="312397853907741968">"IPSec VPN พร้อมด้วยคีย์ที่แชร์ไว้ล่วงหน้าและการตรวจสอบสิทธิ์ Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN พร้อมด้วยใบรับรองและการตรวจสอบสิทธิ์ Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN พร้อมด้วยใบรับรองและการตรวจสอบสิทธิ์แบบผสม"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"ไม่มี"</item>
+    <item msgid="1157046369795346308">"คู่มือ"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"ถูกตัดการเชื่อมต่อ"</item>
+    <item msgid="8754480102834556765">"กำลังเริ่มต้น..."</item>
+    <item msgid="3351334355574270250">"กำลังเชื่อมต่อ…"</item>
+    <item msgid="8303882153995748352">"เชื่อมต่อแล้ว"</item>
+    <item msgid="9135049670787351881">"ระยะหมดเวลา"</item>
+    <item msgid="2124868417182583926">"ไม่สำเร็จ"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"ถาม"</item>
+    <item msgid="7718817231348607934">"ไม่อนุญาตเลย"</item>
+    <item msgid="8184570120217958741">"อนุญาตเสมอ"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"ต่อเนื่อง"</item>
+    <item msgid="167418068739176448">"กิจกรรมแรก"</item>
+    <item msgid="4760813290195199773">"สำคัญ (พื้นหน้า)"</item>
+    <item msgid="2328684826817647595">"สำคัญ (พื้นหลัง)"</item>
+    <item msgid="7746406490652867365">"การสำรองข้อมูล"</item>
+    <item msgid="5597404364389196754">"ใช้หน่วยความจำมาก"</item>
+    <item msgid="1290888779300174556">"บริการ (กำลังทำงาน)"</item>
+    <item msgid="7241098542073939046">"บริการ (กำลังรีสตาร์ท)"</item>
+    <item msgid="6610439017684111046">"ผู้รับ"</item>
+    <item msgid="7367606086319921117">"หน้าแรก"</item>
+    <item msgid="3344660712396741826">"กิจกรรมสุดท้าย"</item>
+    <item msgid="5006559348883303865">"แคชไว้ (กิจกรรม)"</item>
+    <item msgid="8633480732468137525">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
+    <item msgid="6248998242443333892">"แคชไว้ (ว่างเปล่า)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"น้ำเงินอมเขียว"</item>
+    <item msgid="3228505970082457852">"น้ำเงิน"</item>
+    <item msgid="6590260735734795647">"น้ำเงินอมม่วง"</item>
+    <item msgid="3521763377357218577">"ม่วง"</item>
+    <item msgid="5932337981182999919">"ชมพู"</item>
+    <item msgid="5642914536624000094">"แดง"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"เกิน 30 วัน"</item>
+    <item msgid="8699273238891265610">"เกิน 60 วัน"</item>
+    <item msgid="8346279419423837266">"เกิน 90 วัน"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"ตรวจหาโดยอัตโนมัติ"</item>
+    <item msgid="773943026484148895">"ถือว่ามีการวัดปริมาณอินเทอร์เน็ต"</item>
+    <item msgid="1008268820118852416">"ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"ใช้ MAC แบบสุ่ม (ค่าเริ่มต้น)"</item>
+    <item msgid="214234417308375326">"ใช้ที่อยู่ MAC ของอุปกรณ์"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"ไม่"</item>
+    <item msgid="1930581185557754880">"ใช่"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"มืด"</item>
+    <item msgid="5079453644557603349">"สีอ่อน"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"ปิด"</item>
+    <item msgid="4072198137051566919">"แก้ไขข้อบกพร่อง"</item>
+    <item msgid="2473005316958868509">"รายละเอียด"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"เครือข่ายบ้านเท่านั้น"</item>
+    <item msgid="1161026694891024702">"อัตโนมัติ"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"ต้องการ GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"GSM เท่านั้น"</item>
+    <item msgid="8579197487913425819">"WCDMA เท่านั้น"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA อัตโนมัติ"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo อัตโนมัติ"</item>
+    <item msgid="4219607161971472471">"CDMA ที่ไม่มี EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo เท่านั้น"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"ทั่วโลก"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA เท่านั้น"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"ทั่วโลก"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-th/strings.xml b/tests/CarDeveloperOptions/res/values-th/strings.xml
index 0455a58..eb3a613 100644
--- a/tests/CarDeveloperOptions/res/values-th/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-th/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"ปกป้องแท็บเล็ตด้วยตัวเลือกล็อกหน้าจอเพื่อไม่ให้ผู้อื่นใช้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย คุณยังต้องใช้ตัวเลือกล็อกหน้าจอเพื่อตั้งค่าการตรวจสอบสิทธิ์ด้วยใบหน้าด้วย แตะ \"ยกเลิก\" แล้วตั้ง PIN หรือเลือกตัวเลือกอื่นสำหรับการล็อกหน้าจอ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"ปกป้องอุปกรณ์ด้วยตัวเลือกล็อกหน้าจอเพื่อไม่ให้ผู้อื่นใช้ได้หากอุปกรณ์สูญหายหรือถูกขโมย คุณยังต้องใช้ตัวเลือกล็อกหน้าจอเพื่อตั้งค่าการตรวจสอบสิทธิ์ด้วยใบหน้าด้วย แตะ \"ยกเลิก\" แล้วตั้ง PIN หรือเลือกตัวเลือกอื่นสำหรับการล็อกหน้าจอ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"ปกป้องโทรศัพท์ด้วยตัวเลือกล็อกหน้าจอเพื่อไม่ให้ผู้อื่นใช้ได้หากโทรศัพท์สูญหายหรือถูกขโมย คุณยังต้องใช้ตัวเลือกล็อกหน้าจอเพื่อตั้งค่าการตรวจสอบสิทธิ์ด้วยใบหน้าด้วย แตะ \"ยกเลิก\" แล้วตั้ง PIN หรือเลือกตัวเลือกอื่นสำหรับการล็อกหน้าจอ"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"ข้ามการตั้ง PIN ใช่ไหม"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"ข้ามการตั้งรหัสผ่านใช่ไหม"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"ข้ามการตั้งค่ารูปแบบใช่ไหม"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"ตั้งค่าการล็อกหน้าจอ"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"อินเทอร์เน็ตมือถือ"</item>
+    <item msgid="6007360612667098926">"Wi-Fi เท่านั้น"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2147,11 +2149,11 @@
     <string name="captioning_preset" msgid="7429888317480872337">"รูปแบบคำบรรยายภาพ"</string>
     <string name="captioning_custom_options_title" msgid="4530479671071326732">"ตัวเลือกที่กำหนดเอง"</string>
     <string name="captioning_background_color" msgid="2434458880326292180">"สีพื้นหลัง"</string>
-    <string name="captioning_background_opacity" msgid="8178926599201811936">"ความโปร่งแสงของพื้นหลัง"</string>
+    <string name="captioning_background_opacity" msgid="8178926599201811936">"ความทึบแสงของพื้นหลัง"</string>
     <string name="captioning_window_color" msgid="8696903405657599896">"สีของหน้าต่างคำอธิบายภาพ"</string>
-    <string name="captioning_window_opacity" msgid="4315586548781763353">"ความโปร่งแสงของหน้าต่างคำอธิบายภาพ"</string>
+    <string name="captioning_window_opacity" msgid="4315586548781763353">"ความทึบแสงของหน้าต่างคำอธิบายภาพ"</string>
     <string name="captioning_foreground_color" msgid="7412509133818882005">"สีข้อความ"</string>
-    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"ความโปร่งแสงของข้อความ"</string>
+    <string name="captioning_foreground_opacity" msgid="7635639017810117478">"ความทึบแสงของข้อความ"</string>
     <string name="captioning_edge_color" msgid="4330622137047993780">"สีขอบ"</string>
     <string name="captioning_edge_type" msgid="4414946407430588162">"ชนิดขอบ"</string>
     <string name="captioning_typeface" msgid="7893208796949341767">"ชุดแบบอักษร"</string>
@@ -2623,7 +2625,7 @@
     <string name="header_add_an_account" msgid="8482614556580804956">"เพิ่มบัญชี"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"นำบัญชีออกหรือไม่"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากแท็บเล็ต"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดจากโทรศัพท์"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"การนำบัญชีนี้ออกจะลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดของบัญชีออกจากโทรศัพท์"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"ผู้ดูแลระบบไม่อนุญาตให้ทำการเปลี่ยนแปลงนี้"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"ซิงค์ด้วยตนเองไม่ได้"</string>
@@ -2895,12 +2897,12 @@
     <string name="user_exit_guest_confirm_title" msgid="4767911571671099844">"ต้องการนำผู้เข้าร่วมออกไหม"</string>
     <string name="user_exit_guest_confirm_message" msgid="6955182181145748919">"ระบบจะลบแอปและข้อมูลทั้งหมดในเซสชันนี้"</string>
     <string name="user_exit_guest_dialog_remove" msgid="1878866060881115716">"นำออก"</string>
-    <string name="user_enable_calling" msgid="864760054792249503">"เปิดโทรศัพท์"</string>
-    <string name="user_enable_calling_sms" msgid="3450252891736718793">"เปิดโทรศัพท์และ SMS"</string>
+    <string name="user_enable_calling" msgid="864760054792249503">"เปิดการโทร"</string>
+    <string name="user_enable_calling_sms" msgid="3450252891736718793">"เปิดการโทรและ SMS"</string>
     <string name="user_remove_user" msgid="3687544420125911166">"ลบผู้ใช้"</string>
-    <string name="user_enable_calling_confirm_title" msgid="1141612415529158542">"เปิดโทรศัพท์ไหม"</string>
+    <string name="user_enable_calling_confirm_title" msgid="1141612415529158542">"เปิดการโทรไหม"</string>
     <string name="user_enable_calling_confirm_message" msgid="2490126715153125970">"ระบบจะแชร์ประวัติการโทรกับผู้ใช้รายนี้"</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"เปิดโทรศัพท์และ SMS ไหม"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="4153856398523366976">"เปิดการโทรและ SMS ไหม"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="3278802798876095734">"ระบบจะแชร์ประวัติการโทรและ SMS กับผู้ใช้รายนี้"</string>
     <string name="emergency_info_title" msgid="1522609271881425375">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
     <string name="emergency_info_summary" msgid="7280464759837387342">"ข้อมูลและรายชื่อติดต่อสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3521,7 +3523,7 @@
     <string name="zen_mode_when" msgid="7835420687948416255">"เปิดโดยอัตโนมัติ"</string>
     <string name="zen_mode_when_never" msgid="4506296396609224524">"ไม่ใช้"</string>
     <string name="zen_mode_when_every_night" msgid="3942151668791426194">"ทุกคืน"</string>
-    <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"คืนวันจันทร์-ศุกร์"</string>
+    <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"คืนวันธรรมดา"</string>
     <string name="zen_mode_start_time" msgid="5979122139937561731">"เวลาเริ่มต้น"</string>
     <string name="zen_mode_end_time" msgid="3188578493250909972">"เวลาสิ้นสุด"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> วันถัดไป"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"ฟีเจอร์ดังกล่าวจะทำให้โทรศัพท์เครื่องนี้ทำงานช้าลง"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"บังคับใช้การวัด GNSS เต็มรูปแบบ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ติดตามระบบดาวเทียมและความถี่สัญญาณ GNSS ทั้งหมดโดยไม่มีการปิดพักเพื่อประหยัดพลังงาน"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"แก้ไขข้อบกพร่องการเปลี่ยนผู้ใช้"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"แสดงข้อมูลละเอียดในระหว่างการเปลี่ยนผู้ใช้"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"อนุญาตให้เริ่มกิจกรรมในเบื้องหลัง"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"อนุญาตให้เริ่มกิจกรรมในเบื้องหลังทั้งหมด"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"แสดงปัญหาที่ขัดข้องเสมอ"</string>
diff --git a/tests/CarDeveloperOptions/res/values-tl-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-tl-nokeys/strings.xml
new file mode 100644
index 0000000..8a13a50
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-tl-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Pamahalaan ang mga application"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-tl/arrays.xml b/tests/CarDeveloperOptions/res/values-tl/arrays.xml
new file mode 100644
index 0000000..87099a2
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-tl/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"America"</item>
+    <item msgid="4791956477275129121">"Europe"</item>
+    <item msgid="3812126832016254559">"Africa"</item>
+    <item msgid="2765816300353408280">"Asia"</item>
+    <item msgid="6683489385344409742">"Australia"</item>
+    <item msgid="5194868215515664953">"Pacific"</item>
+    <item msgid="7044520255415007865">"Lahat"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 segundo"</item>
+    <item msgid="772029947136115322">"30 segundo"</item>
+    <item msgid="8743663928349474087">"1 minuto"</item>
+    <item msgid="1506508631223164814">"2 minuto"</item>
+    <item msgid="8664703938127907662">"5 minuto"</item>
+    <item msgid="5827960506924849753">"10 minuto"</item>
+    <item msgid="6677424950124253938">"30 minuto"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Hindi kailanman"</item>
+    <item msgid="2517785806387977252">"15 segundo"</item>
+    <item msgid="6347954399441173672">"30 segundo"</item>
+    <item msgid="4858305253279921789">"1 minuto"</item>
+    <item msgid="8109273437140044073">"2 minuto"</item>
+    <item msgid="2788593551142462622">"5 minuto"</item>
+    <item msgid="8012672183888404961">"10 minuto"</item>
+    <item msgid="8271452751594598661">"30 minuto"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Kaagad"</item>
+    <item msgid="2038544972632026612">"5 segundo"</item>
+    <item msgid="5558060663472279597">"15 segundo"</item>
+    <item msgid="45341168505452037">"30 segundo"</item>
+    <item msgid="227647485917789272">"1 minuto"</item>
+    <item msgid="3367011891231217504">"2 minuto"</item>
+    <item msgid="4376575879222393045">"5 minuto"</item>
+    <item msgid="811192536981678974">"10 minuto"</item>
+    <item msgid="7258394417241706272">"30 minuto"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Maliit"</item>
+    <item msgid="591935967183159581">"Default"</item>
+    <item msgid="1714184661981538355">"Malaki"</item>
+    <item msgid="6195563047686707484">"Pinakamalaki"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Nag-i-scan…"</item>
+    <item msgid="5597394826455877834">"Kumokonekta…"</item>
+    <item msgid="5848277343965362748">"Pinapatotohanan..."</item>
+    <item msgid="3391238031431440676">"Kumukuha ng IP address…"</item>
+    <item msgid="5257597310494000224">"Nakakonekta"</item>
+    <item msgid="8472497592913050396">"Suspendido"</item>
+    <item msgid="1228072488815999109">"Nadidiskonekta..."</item>
+    <item msgid="7253087004422991731">"Hindi nakakonekta"</item>
+    <item msgid="4169850917304751227">"Hindi tagumpay"</item>
+    <item msgid="6266658166690831131">"Naka-block"</item>
+    <item msgid="4517230805854909775">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Nagsa-scan..."</item>
+    <item msgid="8058143476674427024">"Kumukonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Nagpapatotoo sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Kumukuha ng IP address mula sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Nakakonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Suspendido"</item>
+    <item msgid="4133290864821295785">"Inaalis sa pagkakakonekta mula sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Hindi nakakonekta"</item>
+    <item msgid="2847316776634969068">"Hindi tagumpay"</item>
+    <item msgid="4390990424746035383">"Naka-block"</item>
+    <item msgid="3618248791367063949">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"button na Push"</item>
+    <item msgid="7401896200768713930">"PIN mula sa device ng kaibigan"</item>
+    <item msgid="4526848028011846710">"PIN mula sa device"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Nakakonekta"</item>
+    <item msgid="983792611851499732">"Inimbitahan"</item>
+    <item msgid="5438273405428201793">"Hindi tagumpay"</item>
+    <item msgid="4646663015449312554">"Available"</item>
+    <item msgid="3230556734162006146">"Wala-sa-sakop"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 minuto"</item>
+    <item msgid="2759776603549270587">"5 minuto"</item>
+    <item msgid="167772676068860015">"1 oras"</item>
+    <item msgid="5985477119043628504">"Huwag kailanman mag-time out"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Gamitin ang Default ng System: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Mahina"</item>
+    <item msgid="7882129634982603782">"Mahina"</item>
+    <item msgid="6457357501905996224">"Katamtaman"</item>
+    <item msgid="405271628162918841">"Malakas"</item>
+    <item msgid="999948812884919584">"Napakahusay"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Nakalipas na 30 araw"</item>
+    <item msgid="3211287705232736964">"Itakda ang usage cycle..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Oras ng paggamit"</item>
+    <item msgid="2784401352592276015">"Huling oras na ginamit"</item>
+    <item msgid="249854287216326349">"Pangalan ng app"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Wala"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Wala"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Wala"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Static"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Wala"</item>
+    <item msgid="1464741437353223198">"Manual"</item>
+    <item msgid="5793600062487886090">"Auto-Config ng Proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Wala"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP o CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Hindi tinukoy"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Wala"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Storage ng panloob na device"</item>
+    <item msgid="3186681694079967527">"Naaalis na SD card"</item>
+    <item msgid="6902033473986647035">"Hayaang magpasya ang system"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Lokasyon"</item>
+    <item msgid="6842381562497597649">"Personal"</item>
+    <item msgid="3966700236695683444">"Pagmemensahe"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"tinatayang lokasyon"</item>
+    <item msgid="1830619568689922920">"eksaktong lokasyon"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"mag-vibrate"</item>
+    <item msgid="8632513128515114092">"magbasa ng mga contact"</item>
+    <item msgid="3741042113569620272">"baguhin ang mga contact"</item>
+    <item msgid="4204420969709009931">"basahin ang log ng tawag"</item>
+    <item msgid="2260380357119423209">"baguhin ang log ng tawag"</item>
+    <item msgid="6550710385014530934">"magbasa ng kalendaryo"</item>
+    <item msgid="3575906174264853951">"baguhin ang kalendaryo"</item>
+    <item msgid="4319843242568057174">"pag-scan ng wi-fi"</item>
+    <item msgid="2981791890467303819">"notification"</item>
+    <item msgid="6617825156152476692">"pag-scan ng cell"</item>
+    <item msgid="8865260890611559753">"tumawag sa telepono"</item>
+    <item msgid="3254999273961542982">"magbasa ng SMS"</item>
+    <item msgid="7711446453028825171">"sumulat ng SMS"</item>
+    <item msgid="6123238544099198034">"tumanggap ng SMS"</item>
+    <item msgid="838342167431596036">"tumanggap ng pang-emergency na SMS"</item>
+    <item msgid="8554432731560956686">"tumanggap ng MMS"</item>
+    <item msgid="7464863464299515059">"tumanggap ng WAP push"</item>
+    <item msgid="310463075729606765">"magpadala ng SMS"</item>
+    <item msgid="7338021933527689514">"magbasa ng ICC SMS"</item>
+    <item msgid="6130369335466613036">"sumulat ng ICC SMS"</item>
+    <item msgid="6536865581421670942">"baguhin ang mga setting"</item>
+    <item msgid="4547203129183558973">"gumuhit sa tuktok"</item>
+    <item msgid="9080347512916542840">"i-access ang mga notification"</item>
+    <item msgid="5332718516635907742">"camera"</item>
+    <item msgid="6098422447246167852">"i-record ang audio"</item>
+    <item msgid="9182794235292595296">"i-play ang audio"</item>
+    <item msgid="8760743229597702019">"basahin ang clipboard"</item>
+    <item msgid="2266923698240538544">"baguhin ang clipboard"</item>
+    <item msgid="1801619438618539275">"mga button ng media"</item>
+    <item msgid="31588119965784465">"focus ng audio"</item>
+    <item msgid="7565226799008076833">"master na volume"</item>
+    <item msgid="5420704980305018295">"volume ng boses"</item>
+    <item msgid="5797363115508970204">"volume ng ring"</item>
+    <item msgid="8233154098550715999">"volume ng media"</item>
+    <item msgid="5196715605078153950">"volume ng alarma"</item>
+    <item msgid="394030698764284577">"volume ng notification"</item>
+    <item msgid="8952898972491680178">"volume ng bluetooth"</item>
+    <item msgid="8506227454543690851">"panatilihing bukas"</item>
+    <item msgid="1108160036049727420">"subaybayan ang lokasyon"</item>
+    <item msgid="1496205959751719491">"subaybayan ang lokasyon na gumagamit ng maraming power"</item>
+    <item msgid="3776296279910987380">"kumuha ng stats sa paggamit"</item>
+    <item msgid="8827100324471975602">"i-mute/i-unmute ang mikropono"</item>
+    <item msgid="6880736730520126864">"ipakita ang toast"</item>
+    <item msgid="4933375960222609935">"i-project ang media"</item>
+    <item msgid="8357907018938895462">"i-activate ang VPN"</item>
+    <item msgid="8143812849911310973">"write wallpaper"</item>
+    <item msgid="6266277260961066535">"assist structure"</item>
+    <item msgid="7715498149883482300">"assist screenshot"</item>
+    <item msgid="4046679376726313293">"basahin ang katayuan ng telepono"</item>
+    <item msgid="6329507266039719587">"magdagdag ng voicemail"</item>
+    <item msgid="7692440726415391408">"gamitin ang sip"</item>
+    <item msgid="8572453398128326267">"iproseso ang papalabas na tawag"</item>
+    <item msgid="7775674394089376306">"fingerprint"</item>
+    <item msgid="3182815133441738779">"mga sensor ng katawan"</item>
+    <item msgid="2793100005496829513">"basahin ang mga cell broadcast"</item>
+    <item msgid="2633626056029384366">"kunwaring lokasyon"</item>
+    <item msgid="8356842191824684631">"basahin ang storage"</item>
+    <item msgid="5671906070163291500">"i-write ang storage"</item>
+    <item msgid="2791955098549340418">"i-on ang screen"</item>
+    <item msgid="5599435119609178367">"kunin ang mga account"</item>
+    <item msgid="1165623660533024666">"patakbuhin sa background"</item>
+    <item msgid="6423861043647911030">"dami ng pagiging naa-access"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Maikli"</item>
+    <item msgid="4816511817309094890">"Katamtaman"</item>
+    <item msgid="8305084671259331134">"Mahaba"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Default"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Maliliit na capital"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Napakaliit"</item>
+    <item msgid="5091603983404027034">"Maliit"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Malaki"</item>
+    <item msgid="218913203203160606">"Napakalaki"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Default"</item>
+    <item msgid="6488643537808152001">"Wala"</item>
+    <item msgid="552332815156010137">"Outline"</item>
+    <item msgid="7187891159463789272">"Drop shadow"</item>
+    <item msgid="8019330250538856521">"Nakaangat"</item>
+    <item msgid="8987385315647049787">"Depressed"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Gamitin ang app default"</item>
+    <item msgid="8611890312638868524">"Puti sa itim"</item>
+    <item msgid="5891360837786277638">"Itim sa puti"</item>
+    <item msgid="2798457065945456853">"Dilaw sa itim"</item>
+    <item msgid="5799049811524553967">"Dilaw sa asul"</item>
+    <item msgid="3673930830658169860">"Custom"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN na may mga paunang nabahaging key"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN na may mga certificate"</item>
+    <item msgid="312397853907741968">"IPSec VPN na may mga paunang nabahaging keys at pagpapatotoo ng Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN na may mga certificate at pagpapatotoo ng Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN na may mga certificate at hybrid na pagpapatotoo"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Wala"</item>
+    <item msgid="1157046369795346308">"Manual"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Hindi nakakonekta"</item>
+    <item msgid="8754480102834556765">"Sinisimulan…"</item>
+    <item msgid="3351334355574270250">"Kumokonekta…"</item>
+    <item msgid="8303882153995748352">"Nakakonekta"</item>
+    <item msgid="9135049670787351881">"Timeout"</item>
+    <item msgid="2124868417182583926">"Hindi tagumpay"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Magtanong"</item>
+    <item msgid="7718817231348607934">"Huwag kailanman payagan"</item>
+    <item msgid="8184570120217958741">"Palaging payagan"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Tuluy-tuloy"</item>
+    <item msgid="167418068739176448">"Nangungunang gawain"</item>
+    <item msgid="4760813290195199773">"Mahalaga (foreground)"</item>
+    <item msgid="2328684826817647595">"Mahalaga (background)"</item>
+    <item msgid="7746406490652867365">"Pag-back Up"</item>
+    <item msgid="5597404364389196754">"Mabigat na timbang"</item>
+    <item msgid="1290888779300174556">"Serbisyo (gumagana)"</item>
+    <item msgid="7241098542073939046">"Serbisyo (nagre-restart)"</item>
+    <item msgid="6610439017684111046">"Receiver"</item>
+    <item msgid="7367606086319921117">"Home"</item>
+    <item msgid="3344660712396741826">"Huling gawain"</item>
+    <item msgid="5006559348883303865">"Naka-cache (gawain)"</item>
+    <item msgid="8633480732468137525">"Naka-cache (client ng gawain)"</item>
+    <item msgid="6248998242443333892">"Naka-cache (walang laman)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Teal"</item>
+    <item msgid="3228505970082457852">"Asul"</item>
+    <item msgid="6590260735734795647">"Indigo"</item>
+    <item msgid="3521763377357218577">"Lila"</item>
+    <item msgid="5932337981182999919">"Pink"</item>
+    <item msgid="5642914536624000094">"Pula"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Higit sa 30 araw"</item>
+    <item msgid="8699273238891265610">"Higit sa 60 araw"</item>
+    <item msgid="8346279419423837266">"Higit sa 90 araw"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Awtomatikong tukuyin"</item>
+    <item msgid="773943026484148895">"Ituring bilang nakametro"</item>
+    <item msgid="1008268820118852416">"Ituring bilang hindi nakametro"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Gamitin ang na-randomize na MAC (default)"</item>
+    <item msgid="214234417308375326">"Gamitin ang device MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Huwag"</item>
+    <item msgid="1930581185557754880">"Oo"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Madilim"</item>
+    <item msgid="5079453644557603349">"Maliwanag"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Naka-off"</item>
+    <item msgid="4072198137051566919">"Debug"</item>
+    <item msgid="2473005316958868509">"Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Home lang"</item>
+    <item msgid="1161026694891024702">"Awtomatiko"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Mas gusto ang GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"GSM lang"</item>
+    <item msgid="8579197487913425819">"WCDMA lang"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA auto"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo auto"</item>
+    <item msgid="4219607161971472471">"CDMA na walang EvDo"</item>
+    <item msgid="7278975240951052041">"EvDo lang"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Pangkalahatan"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"TDSCDMA lang"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Pangkalahatan"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-tl/strings.xml b/tests/CarDeveloperOptions/res/values-tl/strings.xml
index e1173ea..0a405bc 100644
--- a/tests/CarDeveloperOptions/res/values-tl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tl/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Protektahan ang iyong tablet sa pamamagitan ng opsyon sa lock ng screen para walang makakagamit nito kapag nawala o ninakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang pag-authenticate ng mukha. I-tap ang Kanselahin, pagkatapos ay magtakda ng PIN o pumili ng ibang opsyon sa lock ng screen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Protektahan ang iyong device sa pamamagitan ng opsyon sa lock ng screen para walang makakagamit nito kapag nawala o ninakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang pag-authenticate ng mukha. I-tap ang Kanselahin, pagkatapos ay magtakda ng PIN o pumili ng ibang opsyon sa lock ng screen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Protektahan ang iyong telepono sa pamamagitan ng opsyon sa lock ng screen para walang makakagamit nito kapag nawala o ninakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang pag-authenticate ng mukha. I-tap ang Kanselahin, pagkatapos ay magtakda ng PIN o pumili ng ibang opsyon sa lock ng screen."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Laktawan ang Pag-set Up ng PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Laktawan ang Pag-set Up ng Password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Laktawan ang Pag-set Up ng Pattern?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"I-set up ang screen lock"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobile"</item>
+    <item msgid="6007360612667098926">"Wi-Fi lang"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2052,8 +2054,8 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="5698545174944494486">"Mag-tap nang 3 beses upang mag-zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="5418767043532322397">"Mag-tap ng button upang mag-zoom"</string>
     <string name="accessibility_screen_magnification_summary" msgid="3363006902079431772"><b>"Upang mag-zoom"</b>", mabilisang i-tap ang screen nang 3 beses.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", mabilisang i-tap ang screen nang 3 beses at pumindot nang matagal sa pangatlong pag-tap.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang iyong daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard at navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Kapag naka-on ang pag-magnify, gamitin ang button na Pagiging Naa-access sa ibaba ng screen upang mabilisang mag-magnify.\n\n"<b>"Upang mag-zoom"</b>", i-tap ang button na Pagiging Naa-access, pagkatapos ay mag-tap saanman sa screen.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", i-tap ang button na Pagiging Naa-access, pagkatapos ay pumindot nang matagal saanman sa screen.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard o navigation bar."</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Nakatakda sa <xliff:g id="SERVICE">%1$s</xliff:g> ang button na Pagiging Naa-access. Upang gumamit ng pag-magnify, pindutin nang matagal ang button na Pagiging Naa-access, pagkatapos ay piliin ang pag-magnify."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Kapag naka-on ang pag-magnify, gamitin ang button na Pagiging Accessible sa ibaba ng screen upang mabilisang mag-magnify.\n\n"<b>"Upang mag-zoom"</b>", i-tap ang button na Pagiging Accessible, pagkatapos ay mag-tap saanman sa screen.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", i-tap ang button na Pagiging Accessible, pagkatapos ay pumindot nang matagal saanman sa screen.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard o navigation bar."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Nakatakda sa <xliff:g id="SERVICE">%1$s</xliff:g> ang button na Pagiging Accessible. Upang gumamit ng pag-magnify, pindutin nang matagal ang button na Pagiging Accessible, pagkatapos ay piliin ang pag-magnify."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Shortcut gamit ang volume key"</string>
     <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Serbisyo ng shortcut"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Payagan mula sa lock screen"</string>
@@ -2623,7 +2625,7 @@
     <string name="header_add_an_account" msgid="8482614556580804956">"Magdagdag ng account"</string>
     <string name="really_remove_account_title" msgid="4166512362915154319">"Alisin ang account?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="7403843371045856719">"Ang pag-aalis ng account na ito ay magtatanggal sa lahat ng mensahe, contact, at iba pang data nito mula sa tablet!"</string>
-    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Ang pag-aalis ng account na ito ay magde-delete sa lahat ng mensahe, contact at iba pang data nito mula sa telepono!"</string>
+    <string name="really_remove_account_message" product="default" msgid="8951224626153163914">"Ang pag-aalis ng account na ito ay magde-delete sa lahat ng mensahe, contact, at iba pang data nito mula sa telepono!"</string>
     <string name="really_remove_account_message" product="device" msgid="3751798556257519916">"Kapag inalis ang account na ito, made-delete ang lahat ng mensahe, contact, at iba pang data nito mula sa device!"</string>
     <string name="remove_account_failed" msgid="491458185327106966">"Hindi pinapahintulutan ng iyong admin ang pagbabagong ito"</string>
     <string name="cant_sync_dialog_title" msgid="5483419398223189881">"Hindi makapag-sync nang manual"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Pababagalin nito ang teleponong ito"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Ipatupad ang kumpletong sukat ng GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Sinusubaybayan ang lahat ng constellation at dalas ng GNSS nang walang duty cycling"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"I-debug ang pagpapalit ng user"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Ipakita ang detalyadong impormasyon habang nagpapalit ng user"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Payagang magsimula ng aktibidad sa background"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Pinapayagang magsimula ang lahat ng aktibidad sa background"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Palaging ipakita ang dialog ng pag-crash"</string>
diff --git a/tests/CarDeveloperOptions/res/values-tr-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-tr-nokeys/strings.xml
new file mode 100644
index 0000000..c83a1ca
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-tr-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Uygulamaları yönet"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-tr/arrays.xml b/tests/CarDeveloperOptions/res/values-tr/arrays.xml
new file mode 100644
index 0000000..af817b5
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-tr/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Avrupa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Asya"</item>
+    <item msgid="6683489385344409742">"Avustralya"</item>
+    <item msgid="5194868215515664953">"Pasifik"</item>
+    <item msgid="7044520255415007865">"Tümü"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 saniye"</item>
+    <item msgid="772029947136115322">"30 saniye"</item>
+    <item msgid="8743663928349474087">"1 dakika"</item>
+    <item msgid="1506508631223164814">"2 dakika"</item>
+    <item msgid="8664703938127907662">"5 dakika"</item>
+    <item msgid="5827960506924849753">"10 dakika"</item>
+    <item msgid="6677424950124253938">"30 dakika"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Hiçbir zaman"</item>
+    <item msgid="2517785806387977252">"15 saniye"</item>
+    <item msgid="6347954399441173672">"30 saniye"</item>
+    <item msgid="4858305253279921789">"1 dakika"</item>
+    <item msgid="8109273437140044073">"2 dakika"</item>
+    <item msgid="2788593551142462622">"5 dakika"</item>
+    <item msgid="8012672183888404961">"10 dakika"</item>
+    <item msgid="8271452751594598661">"30 dakika"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Hemen"</item>
+    <item msgid="2038544972632026612">"5 saniye"</item>
+    <item msgid="5558060663472279597">"15 saniye"</item>
+    <item msgid="45341168505452037">"30 saniye"</item>
+    <item msgid="227647485917789272">"1 dakika"</item>
+    <item msgid="3367011891231217504">"2 dakika"</item>
+    <item msgid="4376575879222393045">"5 dakika"</item>
+    <item msgid="811192536981678974">"10 dakika"</item>
+    <item msgid="7258394417241706272">"30 dakika"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Küçük"</item>
+    <item msgid="591935967183159581">"Varsayılan"</item>
+    <item msgid="1714184661981538355">"Büyük"</item>
+    <item msgid="6195563047686707484">"En büyük"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Taranıyor…"</item>
+    <item msgid="5597394826455877834">"Bağlanıyor..."</item>
+    <item msgid="5848277343965362748">"Kimlik doğrulaması yapılıyor..."</item>
+    <item msgid="3391238031431440676">"IP adresi alınıyor..."</item>
+    <item msgid="5257597310494000224">"Bağlı"</item>
+    <item msgid="8472497592913050396">"Askıya alındı"</item>
+    <item msgid="1228072488815999109">"Bağlantı kesiliyor…"</item>
+    <item msgid="7253087004422991731">"Bağlantı kesildi"</item>
+    <item msgid="4169850917304751227">"Başarısız"</item>
+    <item msgid="6266658166690831131">"Engellendi"</item>
+    <item msgid="4517230805854909775">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Taranıyor…"</item>
+    <item msgid="8058143476674427024">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlanılıyor…"</item>
+    <item msgid="7547609081339573756">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> üzerinde kimlik doğrulanıyor…"</item>
+    <item msgid="5145158315060185414">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağından IP adresi alınıyor…"</item>
+    <item msgid="3283243151651124831">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlandı"</item>
+    <item msgid="6600156231416890902">"Askıya alındı"</item>
+    <item msgid="4133290864821295785">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> bağlantısı kesiliyor…"</item>
+    <item msgid="3980154971187953257">"Bağlantı kesildi"</item>
+    <item msgid="2847316776634969068">"Başarısız"</item>
+    <item msgid="4390990424746035383">"Engellendi"</item>
+    <item msgid="3618248791367063949">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Düğme"</item>
+    <item msgid="7401896200768713930">"Eş cihazın PIN\'i"</item>
+    <item msgid="4526848028011846710">"Bu cihazın PIN\'i"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Bağlı"</item>
+    <item msgid="983792611851499732">"Davet edildi"</item>
+    <item msgid="5438273405428201793">"Başarısız"</item>
+    <item msgid="4646663015449312554">"Kullanılabilir"</item>
+    <item msgid="3230556734162006146">"Kapsama alanı dışında"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 dakika"</item>
+    <item msgid="2759776603549270587">"5 dakika"</item>
+    <item msgid="167772676068860015">"1 saat"</item>
+    <item msgid="5985477119043628504">"Asla zaman aşımı olmasın"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sistem Varsayılan ayarını kullan: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Zayıf"</item>
+    <item msgid="7882129634982603782">"Düşük"</item>
+    <item msgid="6457357501905996224">"Yeterli"</item>
+    <item msgid="405271628162918841">"İyi"</item>
+    <item msgid="999948812884919584">"Mükemmel"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Son 30 gün"</item>
+    <item msgid="3211287705232736964">"Kullanım döngüsünü ayarla..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Kullanım süresi"</item>
+    <item msgid="2784401352592276015">"Son kullanıldığı tarih"</item>
+    <item msgid="249854287216326349">"Uygulama adı"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Hiçbiri"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GT"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Yok"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GT"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Hiçbiri"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GT"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Statik"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Hiçbiri"</item>
+    <item msgid="1464741437353223198">"Manuel"</item>
+    <item msgid="5793600062487886090">"Proxy Otomatik Yapılandırması"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Hiçbiri"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP veya CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Belirtilmedi"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Yok"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Dahili cihaz depolaması"</item>
+    <item msgid="3186681694079967527">"Çıkarılabilir SD kart"</item>
+    <item msgid="6902033473986647035">"Sistem karar versin"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Konum"</item>
+    <item msgid="6842381562497597649">"Kişisel"</item>
+    <item msgid="3966700236695683444">"Mesajlaşma"</item>
+    <item msgid="8563996233342430477">"Medya"</item>
+    <item msgid="5323851085993963783">"Cihaz"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"yaklaşık konum"</item>
+    <item msgid="1830619568689922920">"hassas konum"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"titreşim"</item>
+    <item msgid="8632513128515114092">"kişileri oku"</item>
+    <item msgid="3741042113569620272">"kişileri değiştir"</item>
+    <item msgid="4204420969709009931">"çağrı günlüğünü oku"</item>
+    <item msgid="2260380357119423209">"çağrı günlüğünü değiştir"</item>
+    <item msgid="6550710385014530934">"takvimi oku"</item>
+    <item msgid="3575906174264853951">"takvimi değiştir"</item>
+    <item msgid="4319843242568057174">"kablosuz tarama"</item>
+    <item msgid="2981791890467303819">"bildirim"</item>
+    <item msgid="6617825156152476692">"hücre tarama"</item>
+    <item msgid="8865260890611559753">"telefon et"</item>
+    <item msgid="3254999273961542982">"SMS oku"</item>
+    <item msgid="7711446453028825171">"SMS yaz"</item>
+    <item msgid="6123238544099198034">"SMS al"</item>
+    <item msgid="838342167431596036">"acil SMS al"</item>
+    <item msgid="8554432731560956686">"MMS al"</item>
+    <item msgid="7464863464299515059">"WAP push al"</item>
+    <item msgid="310463075729606765">"SMS gönder"</item>
+    <item msgid="7338021933527689514">"ICC SMS oku"</item>
+    <item msgid="6130369335466613036">"ICC SMS yaz"</item>
+    <item msgid="6536865581421670942">"ayarları değiştir"</item>
+    <item msgid="4547203129183558973">"üste çiz"</item>
+    <item msgid="9080347512916542840">"bildirimlere eriş"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"ses kaydet"</item>
+    <item msgid="9182794235292595296">"sesi çal"</item>
+    <item msgid="8760743229597702019">"panoyu oku"</item>
+    <item msgid="2266923698240538544">"panoyu değiştir"</item>
+    <item msgid="1801619438618539275">"medya düğmeleri"</item>
+    <item msgid="31588119965784465">"ses odağı"</item>
+    <item msgid="7565226799008076833">"ana ses düzeyi"</item>
+    <item msgid="5420704980305018295">"konuşma sesi düzeyi"</item>
+    <item msgid="5797363115508970204">"çalma sesi düzeyi"</item>
+    <item msgid="8233154098550715999">"medya sesi düzeyi"</item>
+    <item msgid="5196715605078153950">"alarm sesi düzeyi"</item>
+    <item msgid="394030698764284577">"bildirim sesi düzeyi"</item>
+    <item msgid="8952898972491680178">"Bluetooth ses düzeyi"</item>
+    <item msgid="8506227454543690851">"uyanık tut"</item>
+    <item msgid="1108160036049727420">"konumu izle"</item>
+    <item msgid="1496205959751719491">"yüksek güç tüketen konum hizmetlerini izle"</item>
+    <item msgid="3776296279910987380">"kullanım istatistiklerini al"</item>
+    <item msgid="8827100324471975602">"mikrofonu kapat/aç"</item>
+    <item msgid="6880736730520126864">"kısa ileti göster"</item>
+    <item msgid="4933375960222609935">"medya yansıtma"</item>
+    <item msgid="8357907018938895462">"VPN\'yi etkinleştir"</item>
+    <item msgid="8143812849911310973">"yazı duvar kağıdı"</item>
+    <item msgid="6266277260961066535">"yardım yapısı"</item>
+    <item msgid="7715498149883482300">"yardım ekran görüntüsü"</item>
+    <item msgid="4046679376726313293">"telefon durumunu oku"</item>
+    <item msgid="6329507266039719587">"sesli mesaj ekle"</item>
+    <item msgid="7692440726415391408">"SIP kullan"</item>
+    <item msgid="8572453398128326267">"giden çağrıyı işle"</item>
+    <item msgid="7775674394089376306">"dijital parmak izi"</item>
+    <item msgid="3182815133441738779">"vücut sensörleri"</item>
+    <item msgid="2793100005496829513">"hücre yayınlarını oku"</item>
+    <item msgid="2633626056029384366">"sahte konum"</item>
+    <item msgid="8356842191824684631">"depolama alanını oku"</item>
+    <item msgid="5671906070163291500">"depolama alanına yaz"</item>
+    <item msgid="2791955098549340418">"ekranı aç"</item>
+    <item msgid="5599435119609178367">"hesapları al"</item>
+    <item msgid="1165623660533024666">"arka planda çalıştır"</item>
+    <item msgid="6423861043647911030">"erişilebilirlik ses düzeyi"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Konum"</item>
+    <item msgid="6656077694190491067">"Konum"</item>
+    <item msgid="8790228218278477369">"Konum"</item>
+    <item msgid="7836406246005211990">"Titreşim"</item>
+    <item msgid="3951439024549922598">"Kişileri oku"</item>
+    <item msgid="8802152411647068">"Kişileri değiştir"</item>
+    <item msgid="229544934599698735">"Çağrı günlüğünü oku"</item>
+    <item msgid="7396102294405899613">"Çağrı günlüğünü değiştir"</item>
+    <item msgid="3597797992398484655">"Takvimi okuma"</item>
+    <item msgid="2705975774250907343">"Takvimi değiştir"</item>
+    <item msgid="4668747371441932697">"Konum"</item>
+    <item msgid="1487578921720243646">"Bildirim yayınla"</item>
+    <item msgid="4636080349724146638">"Konum"</item>
+    <item msgid="673510900286463926">"Telefon et"</item>
+    <item msgid="542083422784609790">"SMS/MMS oku"</item>
+    <item msgid="1033780373029588436">"SMS/MMS yaz"</item>
+    <item msgid="5647111115517787488">"SMS/MMS al"</item>
+    <item msgid="8591105601108455893">"SMS/MMS al"</item>
+    <item msgid="7730995008517841903">"SMS/MMS al"</item>
+    <item msgid="2613033109026626086">"SMS/MMS al"</item>
+    <item msgid="3037159047591081136">"SMS/MMS gönder"</item>
+    <item msgid="4726682243833913568">"SMS/MMS oku"</item>
+    <item msgid="6555678522277865572">"SMS/MMS yaz"</item>
+    <item msgid="6981734935578130884">"Ayarları değiştir"</item>
+    <item msgid="8705854389991425629">"Üste çiz"</item>
+    <item msgid="5861356020344153651">"Bildirimlere eriş"</item>
+    <item msgid="78432174621628659">"Kamera"</item>
+    <item msgid="3986116419882154794">"Ses kaydet"</item>
+    <item msgid="4516840825756409490">"Sesi çal"</item>
+    <item msgid="6811712502798183957">"Panoyu oku"</item>
+    <item msgid="2780369012602289114">"Panoyu değiştir"</item>
+    <item msgid="2331359440170850868">"Medya düğmeleri"</item>
+    <item msgid="6133599737122751231">"Ses odağı"</item>
+    <item msgid="6844485713404805301">"Ana ses düzeyi"</item>
+    <item msgid="1600379420669104929">"Konuşma ses düzeyi"</item>
+    <item msgid="6296768210470214866">"Zil ses düzeyi"</item>
+    <item msgid="510690696071629241">"Medya ses düzeyi"</item>
+    <item msgid="406861638631430109">"Alarm ses düzeyi"</item>
+    <item msgid="4715864795872233884">"Bildirim ses düzeyi"</item>
+    <item msgid="2311478519251301183">"Bluetooth ses düzeyi"</item>
+    <item msgid="5133991377896747027">"Uyanık tut"</item>
+    <item msgid="2464189519136248621">"Konum"</item>
+    <item msgid="2062677934050803037">"Konum"</item>
+    <item msgid="1735171933192715957">"Kullanım istatistiklerini al"</item>
+    <item msgid="1014093788778383554">"Mikrofonu kapat/aç"</item>
+    <item msgid="4199297950608622850">"Kısa ileti göster"</item>
+    <item msgid="2527962435313398821">"Proje medyası"</item>
+    <item msgid="5117506254221861929">"VPN\'yi etkinleştir"</item>
+    <item msgid="8291198322681891160">"Yazı duvar kağıdı"</item>
+    <item msgid="7106921284621230961">"Yardım yapısı"</item>
+    <item msgid="4496533640894624799">"Yardım ekran görüntüsü"</item>
+    <item msgid="2598847264853993611">"Telefon durumunu oku"</item>
+    <item msgid="9215610846802973353">"Sesli mesaj ekle"</item>
+    <item msgid="9186411956086478261">"SIP kullan"</item>
+    <item msgid="6884763100104539558">"Giden çağrıyı işle"</item>
+    <item msgid="125513972170580692">"Parmak izi"</item>
+    <item msgid="2556071024281275619">"Vücut sensörleri"</item>
+    <item msgid="617168514928339387">"Hücre yayınlarını oku"</item>
+    <item msgid="7134693570516523585">"Sahte konum"</item>
+    <item msgid="7224489175375229399">"Depolama alanını oku"</item>
+    <item msgid="8472735063903258202">"Depolama alanına yaz"</item>
+    <item msgid="4069276819909595110">"Ekranı aç"</item>
+    <item msgid="1228338896751121025">"Hesapları al"</item>
+    <item msgid="3181581793459233672">"Arka planda çalıştır"</item>
+    <item msgid="2340936043025374076">"Erişilebilirlik ses düzeyi"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kısa"</item>
+    <item msgid="4816511817309094890">"Orta"</item>
+    <item msgid="8305084671259331134">"Uzun"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Varsayılan"</item>
+    <item msgid="4147246073737933622">"Sans Serif"</item>
+    <item msgid="3117680749167407907">"Sans Serif dar"</item>
+    <item msgid="6529379119163117545">"Sans-serif sabit aralıklı"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif sabit aralıklı"</item>
+    <item msgid="4448481989108928248">"Gayriresmî"</item>
+    <item msgid="4627069151979553527">"Bitişik el yazısı"</item>
+    <item msgid="6896773537705206194">"Küçük boyutlu büyük harfler"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Çok küçük"</item>
+    <item msgid="5091603983404027034">"Küçük"</item>
+    <item msgid="176844712416932112">"Normal"</item>
+    <item msgid="2784236342175159295">"Büyük"</item>
+    <item msgid="218913203203160606">"Çok büyük"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Varsayılan"</item>
+    <item msgid="6488643537808152001">"Hiçbiri"</item>
+    <item msgid="552332815156010137">"Dış çizgi"</item>
+    <item msgid="7187891159463789272">"Gölge"</item>
+    <item msgid="8019330250538856521">"Yükseltilmiş"</item>
+    <item msgid="8987385315647049787">"Bastırılmış"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"%25"</item>
+    <item msgid="4665048002584838262">"%50"</item>
+    <item msgid="1874668269931014581">"%75"</item>
+    <item msgid="6462911487571123954">"%100"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Uygulama varsayılanı"</item>
+    <item msgid="8611890312638868524">"Siyah üzerine beyaz"</item>
+    <item msgid="5891360837786277638">"Beyaz üzerine siyah"</item>
+    <item msgid="2798457065945456853">"Siyah üzerine sarı"</item>
+    <item msgid="5799049811524553967">"Mavi üzerine sarı"</item>
+    <item msgid="3673930830658169860">"Özel"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"Önceden paylaşılan anahtara sahip L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"Sertifikalara sahip L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"Önceden paylaşılan anahtarlara ve Xauth kimlik doğrulamaya sahip IPSec VPN"</item>
+    <item msgid="3319427315593649917">"Sertifikalara ve Xauth kimlik doğrulamaya sahip IPSec VPN"</item>
+    <item msgid="8258927774145391041">"Sertifikalara ve karma kimlik doğrulamaya sahip IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Yok"</item>
+    <item msgid="1157046369795346308">"Manuel"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Bağlantı kesildi"</item>
+    <item msgid="8754480102834556765">"Başlatılıyor..."</item>
+    <item msgid="3351334355574270250">"Bağlanıyor..."</item>
+    <item msgid="8303882153995748352">"Bağlı"</item>
+    <item msgid="9135049670787351881">"Zaman aşımı"</item>
+    <item msgid="2124868417182583926">"Başarısız"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Sor"</item>
+    <item msgid="7718817231348607934">"Asla izin verme"</item>
+    <item msgid="8184570120217958741">"Her zaman izin ver"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Kalıcı"</item>
+    <item msgid="167418068739176448">"En üstteki etkinlik"</item>
+    <item msgid="4760813290195199773">"Önemli (ön plan)"</item>
+    <item msgid="2328684826817647595">"Önemli (arka plan)"</item>
+    <item msgid="7746406490652867365">"Yedekleme"</item>
+    <item msgid="5597404364389196754">"Ağır"</item>
+    <item msgid="1290888779300174556">"Hizmet (çalışıyor)"</item>
+    <item msgid="7241098542073939046">"Hizmet (yeniden başlatılıyor)"</item>
+    <item msgid="6610439017684111046">"Alıcı"</item>
+    <item msgid="7367606086319921117">"Ana ekran"</item>
+    <item msgid="3344660712396741826">"En sondaki etkinlik"</item>
+    <item msgid="5006559348883303865">"Önbelleğe alındı (etkinlik)"</item>
+    <item msgid="8633480732468137525">"Önbelleğe alındı (etkinlik istemcisi)"</item>
+    <item msgid="6248998242443333892">"Önbelleğe alındı (boş)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Camgöbeği"</item>
+    <item msgid="3228505970082457852">"Mavi"</item>
+    <item msgid="6590260735734795647">"Çivit mavisi"</item>
+    <item msgid="3521763377357218577">"Mor"</item>
+    <item msgid="5932337981182999919">"Pembe"</item>
+    <item msgid="5642914536624000094">"Kırmızı"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 günden eski"</item>
+    <item msgid="8699273238891265610">"60 günden eski"</item>
+    <item msgid="8346279419423837266">"90 günden eski"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Otomatik olarak algıla"</item>
+    <item msgid="773943026484148895">"Sınırlı olarak ele al"</item>
+    <item msgid="1008268820118852416">"Sınırsız olarak ele al"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Rastgele MAC kullan (varsayılan)"</item>
+    <item msgid="214234417308375326">"Cihaz MAC kullan"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Hayır"</item>
+    <item msgid="1930581185557754880">"Evet"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Koyu"</item>
+    <item msgid="5079453644557603349">"Açık"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Kapalı"</item>
+    <item msgid="4072198137051566919">"Hata ayıklama"</item>
+    <item msgid="2473005316958868509">"Ayrıntılı"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Yalnızca ev"</item>
+    <item msgid="1161026694891024702">"Otomatik"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA tercih edilen"</item>
+    <item msgid="7581481130337402578">"Yalnızca GSM"</item>
+    <item msgid="8579197487913425819">"Yalnızca WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA otomatik"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo otomatik"</item>
+    <item msgid="4219607161971472471">"EvDo olmadan CDMA"</item>
+    <item msgid="7278975240951052041">"Yalnızca EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Küresel"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Yalnızca TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Küresel"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-tr/strings.xml b/tests/CarDeveloperOptions/res/values-tr/strings.xml
index f28ea00..7e4ef2c 100644
--- a/tests/CarDeveloperOptions/res/values-tr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tr/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Tabletiniz kaybolur veya çalınırsa kimsenin kullanamaması için ekran kilidi seçeneğiyle koruyun. Yüzle kimlik doğrulama için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. İptal\'e dokunun ve ardından bir PIN ayarlayın veya başka bir ekran kilidi seçeneği belirleyin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Cihazınız kaybolur veya çalınırsa kimsenin kullanamaması için ekran kilidi seçeneğiyle koruyun. Yüzle kimlik doğrulama için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. İptal\'e dokunun ve ardından bir PIN ayarlayın veya başka bir ekran kilidi seçeneği belirleyin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefonunuz kaybolur veya çalınırsa kimsenin kullanamaması için ekran kilidi seçeneğiyle koruyun. Yüzle kimlik doğrulama için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. İptal\'e dokunun ve ardından bir PIN ayarlayın veya başka bir ekran kilidi seçeneği belirleyin."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN Kurulumu atlansın mı?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Şifre Kurulumu atlansın mı?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Desen Kurulumu atlansın mı?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ekran kilidini ayarla"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Kablosuz"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Yalnızca kablosuz"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -3381,7 +3383,7 @@
     <string name="picture_in_picture_empty_text" msgid="8664071475324685241">"Yüklü uygulamalardan hiçbiri pencere içinde pencere özelliğini desteklemiyor"</string>
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"pip ekran içinde"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"Pencere içinde pencere"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Resim içinde resme izin ver"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"Pencere içinde pencereye izin ver"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"Bu uygulamanın, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) pencere içinde pencere oluşturmasına izin verin. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"Rahatsız Etmeyin\'e izin ver"</string>
@@ -4124,7 +4126,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8798915340594367449">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için telefonunuzu elinize alın."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="1077745287100012928">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için tabletinizi elinize alın."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="404199660076598026">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için cihazınızı elinize alın."</string>
-    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Telefonu kontrol etmek için dokunun"</string>
+    <string name="ambient_display_tap_screen_title" product="default" msgid="2784322628239960695">"Telefonu kontrol etmek için dokun"</string>
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6434521782016864148">"Tableti kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4396793721852647356">"Cihazı kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_summary" msgid="7869039870571925213">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza dokunun."</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Söz konusu özellik bu telefonu yavaşlatır"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Tam GNSS ölçümlerini zorla"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Tüm GNSS takımyıldızlarını ve görev döngüsü olmayan frekansları takip et"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Kullanıcı değiştirilirken hata ayıkla"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Kullanıcı değiştirilirken ayrıntılı bilgi göster"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Arka planda başlayan işlemlere izin ver"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Arka planda başlayan tüm işlemlere izin verir"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Kilitlenme iletişim kutusunu her zaman göster"</string>
diff --git a/tests/CarDeveloperOptions/res/values-uk-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-uk-nokeys/strings.xml
new file mode 100644
index 0000000..93ecf4a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-uk-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Керувати програмами"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-uk/arrays.xml b/tests/CarDeveloperOptions/res/values-uk/arrays.xml
new file mode 100644
index 0000000..2409764
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-uk/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Америка"</item>
+    <item msgid="4791956477275129121">"Європа"</item>
+    <item msgid="3812126832016254559">"Африка"</item>
+    <item msgid="2765816300353408280">"Азія"</item>
+    <item msgid="6683489385344409742">"Австралія"</item>
+    <item msgid="5194868215515664953">"Тихоокеан."</item>
+    <item msgid="7044520255415007865">"Усі"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 секунд"</item>
+    <item msgid="772029947136115322">"30 секунд"</item>
+    <item msgid="8743663928349474087">"1 хвилина"</item>
+    <item msgid="1506508631223164814">"2 хвилини"</item>
+    <item msgid="8664703938127907662">"5 хвилин"</item>
+    <item msgid="5827960506924849753">"10 хвилин"</item>
+    <item msgid="6677424950124253938">"30 хвилин"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Ніколи"</item>
+    <item msgid="2517785806387977252">"15 секунд"</item>
+    <item msgid="6347954399441173672">"30 секунд"</item>
+    <item msgid="4858305253279921789">"1 хвилина"</item>
+    <item msgid="8109273437140044073">"2 хвилини"</item>
+    <item msgid="2788593551142462622">"5 хвилин"</item>
+    <item msgid="8012672183888404961">"10 хвилин"</item>
+    <item msgid="8271452751594598661">"30 хв."</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Одразу"</item>
+    <item msgid="2038544972632026612">"5 секунд"</item>
+    <item msgid="5558060663472279597">"15 секунд"</item>
+    <item msgid="45341168505452037">"30 секунд"</item>
+    <item msgid="227647485917789272">"1 хвилина"</item>
+    <item msgid="3367011891231217504">"2 хвилини"</item>
+    <item msgid="4376575879222393045">"5 хвилин"</item>
+    <item msgid="811192536981678974">"10 хвилин"</item>
+    <item msgid="7258394417241706272">"30 хвилин"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Малий"</item>
+    <item msgid="591935967183159581">"За умовчанням"</item>
+    <item msgid="1714184661981538355">"Великий"</item>
+    <item msgid="6195563047686707484">"Найбільший"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Сканув-ня..."</item>
+    <item msgid="5597394826455877834">"Під’єднання..."</item>
+    <item msgid="5848277343965362748">"Автентифікація..."</item>
+    <item msgid="3391238031431440676">"Отримання ІР-адреси…"</item>
+    <item msgid="5257597310494000224">"Під’єднано"</item>
+    <item msgid="8472497592913050396">"Призупинено"</item>
+    <item msgid="1228072488815999109">"Відключення..."</item>
+    <item msgid="7253087004422991731">"Роз’єднано"</item>
+    <item msgid="4169850917304751227">"Помилка"</item>
+    <item msgid="6266658166690831131">"Заблоковано"</item>
+    <item msgid="4517230805854909775">"Тимчасове уникнення слабкого з’єднання"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Сканування..."</item>
+    <item msgid="8058143476674427024">"Підключення до <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"Автентифікація з мережею <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Отримання ІР-адреси від мережі <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Підключено до <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Призупинено"</item>
+    <item msgid="4133290864821295785">"Відключення від <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Роз’єднано"</item>
+    <item msgid="2847316776634969068">"Помилка"</item>
+    <item msgid="4390990424746035383">"Заблоковано"</item>
+    <item msgid="3618248791367063949">"Тимчасове уникнення слабкого з’єднання"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Кнопка Push"</item>
+    <item msgid="7401896200768713930">"PIN з однорангового пристрою"</item>
+    <item msgid="4526848028011846710">"PIN із цього пристрою"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Під’єднано"</item>
+    <item msgid="983792611851499732">"Запрошено"</item>
+    <item msgid="5438273405428201793">"Помилка"</item>
+    <item msgid="4646663015449312554">"Доступно"</item>
+    <item msgid="3230556734162006146">"Поза зоною"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 хвилини"</item>
+    <item msgid="2759776603549270587">"5 хвилин"</item>
+    <item msgid="167772676068860015">"1 година"</item>
+    <item msgid="5985477119043628504">"Без часу очікування"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"За умовчанням: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Слабкий"</item>
+    <item msgid="7882129634982603782">"Слабкий"</item>
+    <item msgid="6457357501905996224">"Задовільний"</item>
+    <item msgid="405271628162918841">"Добрий"</item>
+    <item msgid="999948812884919584">"Відмінний"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Останні 30 днів"</item>
+    <item msgid="3211287705232736964">"Цикл використання даних…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Час використ."</item>
+    <item msgid="2784401352592276015">"Останнє використання"</item>
+    <item msgid="249854287216326349">"Назва програми"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Немає"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Немає"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Немає"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Статичні"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Немає"</item>
+    <item msgid="1464741437353223198">"Посібник"</item>
+    <item msgid="5793600062487886090">"Автоконфігурація проксі"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Немає"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP або CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Не вказано"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Немає"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Внутрішня пам\'ять пристрою"</item>
+    <item msgid="3186681694079967527">"Знімна карта SD"</item>
+    <item msgid="6902033473986647035">"Дозвольте виріш. системі"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Місцезнаходження"</item>
+    <item msgid="6842381562497597649">"Особисте"</item>
+    <item msgid="3966700236695683444">"Повідомлення"</item>
+    <item msgid="8563996233342430477">"Медіа-файли"</item>
+    <item msgid="5323851085993963783">"Пристрій"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"приблизне місцезнаходження"</item>
+    <item msgid="1830619568689922920">"точне місцезнаходження"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"вібросигнал"</item>
+    <item msgid="8632513128515114092">"читати контакти"</item>
+    <item msgid="3741042113569620272">"змінювати контакти"</item>
+    <item msgid="4204420969709009931">"читати журнал викликів"</item>
+    <item msgid="2260380357119423209">"змінювати журнал викликів"</item>
+    <item msgid="6550710385014530934">"переглядати календар"</item>
+    <item msgid="3575906174264853951">"змінювати календар"</item>
+    <item msgid="4319843242568057174">"сканування Wi-Fi"</item>
+    <item msgid="2981791890467303819">"сповіщення"</item>
+    <item msgid="6617825156152476692">"пошук мобільних мереж"</item>
+    <item msgid="8865260890611559753">"телефонувати"</item>
+    <item msgid="3254999273961542982">"читати SMS"</item>
+    <item msgid="7711446453028825171">"писати SMS"</item>
+    <item msgid="6123238544099198034">"отримувати SMS"</item>
+    <item msgid="838342167431596036">"отримувати екстрені SMS"</item>
+    <item msgid="8554432731560956686">"отримувати MMS"</item>
+    <item msgid="7464863464299515059">"отримувати WAP Push"</item>
+    <item msgid="310463075729606765">"надсилати SMS"</item>
+    <item msgid="7338021933527689514">"читати ICC SMS"</item>
+    <item msgid="6130369335466613036">"писати ICC SMS"</item>
+    <item msgid="6536865581421670942">"змінювати налаштування"</item>
+    <item msgid="4547203129183558973">"відображати зверху"</item>
+    <item msgid="9080347512916542840">"отримувати доступ до сповіщень"</item>
+    <item msgid="5332718516635907742">"камера"</item>
+    <item msgid="6098422447246167852">"записувати аудіо"</item>
+    <item msgid="9182794235292595296">"відтворювати аудіо"</item>
+    <item msgid="8760743229597702019">"читати буфер обміну"</item>
+    <item msgid="2266923698240538544">"змінювати буфер обміну"</item>
+    <item msgid="1801619438618539275">"кнопки медіа"</item>
+    <item msgid="31588119965784465">"активізація звуку"</item>
+    <item msgid="7565226799008076833">"загальна гучність"</item>
+    <item msgid="5420704980305018295">"гучність голосу"</item>
+    <item msgid="5797363115508970204">"гучність дзвінка"</item>
+    <item msgid="8233154098550715999">"гучність медіа"</item>
+    <item msgid="5196715605078153950">"гучність будильника"</item>
+    <item msgid="394030698764284577">"гучність сповіщення"</item>
+    <item msgid="8952898972491680178">"гучність Bluetooth"</item>
+    <item msgid="8506227454543690851">"залишати активним"</item>
+    <item msgid="1108160036049727420">"відстежувати місцезнаходження"</item>
+    <item msgid="1496205959751719491">"відстежувати енергозатратні місцезнаходження"</item>
+    <item msgid="3776296279910987380">"отримати статистику використання"</item>
+    <item msgid="8827100324471975602">"вимкнути або ввімкнути мікрофон"</item>
+    <item msgid="6880736730520126864">"показувати підказки"</item>
+    <item msgid="4933375960222609935">"транслювати вміст"</item>
+    <item msgid="8357907018938895462">"активувати VPN"</item>
+    <item msgid="8143812849911310973">"змінювати фоновий малюнок"</item>
+    <item msgid="6266277260961066535">"допоміжна структура"</item>
+    <item msgid="7715498149883482300">"допоміжний знімок екрана"</item>
+    <item msgid="4046679376726313293">"переглядати статус телефона"</item>
+    <item msgid="6329507266039719587">"додавати голосову пошту"</item>
+    <item msgid="7692440726415391408">"використовувати протокол SIP"</item>
+    <item msgid="8572453398128326267">"обробляти вихідні виклики"</item>
+    <item msgid="7775674394089376306">"відбиток пальця"</item>
+    <item msgid="3182815133441738779">"датчики на тілі"</item>
+    <item msgid="2793100005496829513">"переглядати повідомлення Cell Broadcast"</item>
+    <item msgid="2633626056029384366">"фіктивне місцезнаходження"</item>
+    <item msgid="8356842191824684631">"переглядати дані про пам’ять"</item>
+    <item msgid="5671906070163291500">"додавати дані в пам’ять і змінювати їх"</item>
+    <item msgid="2791955098549340418">"вмикати екран"</item>
+    <item msgid="5599435119609178367">"отримувати дані облікових записів"</item>
+    <item msgid="1165623660533024666">"працювати у фоновому режимі"</item>
+    <item msgid="6423861043647911030">"спеціальні можливості: гучність"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Коротка"</item>
+    <item msgid="4816511817309094890">"Звичайне сповіщення"</item>
+    <item msgid="8305084671259331134">"Довга"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"За умовчанням"</item>
+    <item msgid="4147246073737933622">"Sans-Serif"</item>
+    <item msgid="3117680749167407907">"Sans-Serif стиснений"</item>
+    <item msgid="6529379119163117545">"Моноширинний Sans-Serif"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Моноширинний Serif"</item>
+    <item msgid="4448481989108928248">"Неформальний шрифт"</item>
+    <item msgid="4627069151979553527">"Курсив"</item>
+    <item msgid="6896773537705206194">"Зменшені великі букви"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Дуже малий"</item>
+    <item msgid="5091603983404027034">"Малий"</item>
+    <item msgid="176844712416932112">"Звичайний"</item>
+    <item msgid="2784236342175159295">"Великий"</item>
+    <item msgid="218913203203160606">"Дуже великий"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"За умовчанням"</item>
+    <item msgid="6488643537808152001">"Немає"</item>
+    <item msgid="552332815156010137">"Контур"</item>
+    <item msgid="7187891159463789272">"Додати тінь"</item>
+    <item msgid="8019330250538856521">"Опуклий"</item>
+    <item msgid="8987385315647049787">"Втиснений"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"За умовчанням"</item>
+    <item msgid="8611890312638868524">"Білий на чорному"</item>
+    <item msgid="5891360837786277638">"Чорний на білому"</item>
+    <item msgid="2798457065945456853">"Жовтий на чорному"</item>
+    <item msgid="5799049811524553967">"Жовтий на синьому"</item>
+    <item msgid="3673930830658169860">"Спеціальні звуки"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN зі спільними ключами"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN із сертифікатами"</item>
+    <item msgid="312397853907741968">"IPSec VPN зі спільними ключами й автентифікацією Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN із сертифікатами та автентифікацією Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN із сертифікатами та гібридною автентифікацією"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Немає"</item>
+    <item msgid="1157046369795346308">"Посібник"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Роз’єднано"</item>
+    <item msgid="8754480102834556765">"Ініціалізація..."</item>
+    <item msgid="3351334355574270250">"Під’єднання..."</item>
+    <item msgid="8303882153995748352">"Під’єднано"</item>
+    <item msgid="9135049670787351881">"Час очікування"</item>
+    <item msgid="2124868417182583926">"Помилка"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Запитувати"</item>
+    <item msgid="7718817231348607934">"Ніколи не дозволяти"</item>
+    <item msgid="8184570120217958741">"Завжди дозволяти"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Постійний"</item>
+    <item msgid="167418068739176448">"Перші дії"</item>
+    <item msgid="4760813290195199773">"Важливо (активний додаток)"</item>
+    <item msgid="2328684826817647595">"Важливо (фоновий додаток)"</item>
+    <item msgid="7746406490652867365">"Резервне копіювання"</item>
+    <item msgid="5597404364389196754">"Інтенсивний"</item>
+    <item msgid="1290888779300174556">"Служба (запущено)"</item>
+    <item msgid="7241098542073939046">"Служба (перезапуск)"</item>
+    <item msgid="6610439017684111046">"Приймач"</item>
+    <item msgid="7367606086319921117">"Головний екран"</item>
+    <item msgid="3344660712396741826">"Останні дії"</item>
+    <item msgid="5006559348883303865">"Кеш (дії)"</item>
+    <item msgid="8633480732468137525">"Кеш (дії клієнта)"</item>
+    <item msgid="6248998242443333892">"Кеш (порожньо)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Бірюзовий"</item>
+    <item msgid="3228505970082457852">"Синій"</item>
+    <item msgid="6590260735734795647">"Індиго"</item>
+    <item msgid="3521763377357218577">"Пурпуровий"</item>
+    <item msgid="5932337981182999919">"Рожевий"</item>
+    <item msgid="5642914536624000094">"Червоний"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Додані понад 30 днів тому"</item>
+    <item msgid="8699273238891265610">"Додані понад 60 днів тому"</item>
+    <item msgid="8346279419423837266">"Додані понад 90 днів тому"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Визначати автоматично"</item>
+    <item msgid="773943026484148895">"Вважати тарифікованою"</item>
+    <item msgid="1008268820118852416">"Вважати нетарифікованою"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Використовувати довільну MAC-адресу (за умовчанням)"</item>
+    <item msgid="214234417308375326">"Використовувати MAC-адресу пристрою"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Ні"</item>
+    <item msgid="1930581185557754880">"Так"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"темна"</item>
+    <item msgid="5079453644557603349">"світла"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Вимкнено"</item>
+    <item msgid="4072198137051566919">"Налагодження"</item>
+    <item msgid="2473005316958868509">"Докладно"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Лише домашні мережі"</item>
+    <item msgid="1161026694891024702">"Автоматично"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Рекомендовано GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"Лише GSM"</item>
+    <item msgid="8579197487913425819">"Лише WCDMA"</item>
+    <item msgid="8465243227505412498">"Авто GSM/WCDMA"</item>
+    <item msgid="9107479914166352132">"Авто CDMA/EvDo"</item>
+    <item msgid="4219607161971472471">"CDMA без EvDo"</item>
+    <item msgid="7278975240951052041">"Лише EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Загальний"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Лише TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Загальний"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-uk/strings.xml b/tests/CarDeveloperOptions/res/values-uk/strings.xml
index 626dd5f..b166589 100644
--- a/tests/CarDeveloperOptions/res/values-uk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uk/strings.xml
@@ -389,7 +389,7 @@
     <string name="decryption_settings_summary" product="default" msgid="7401802133199522441">"Телефон не зашифровано"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="8170667308598998791">"Пристрій зашифровано"</string>
     <string name="decryption_settings_summary" product="tablet" msgid="7524119945312453569">"Пристрій не зашифровано"</string>
-    <string name="lockscreen_settings_title" msgid="1221505938891948413">"Дисплей заблокованого екрана"</string>
+    <string name="lockscreen_settings_title" msgid="1221505938891948413">"Заблокований екран"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="3133378945821488654">"Що показувати"</string>
     <string name="security_settings_summary" msgid="5210109100643223686">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="1783066617800041869">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
@@ -489,8 +489,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Блокування екрана захистить ваш планшет, якщо його буде загублено або викрадено. Ця функція також потрібна, щоб налаштувати автентифікацію за обличчям. Натисніть \"Скасувати\" й налаштуйте PIN-код або інший варіант блокування екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Блокування екрана захистить ваш пристрій, якщо його буде загублено або викрадено. Ця функція також потрібна, щоб налаштувати автентифікацію за обличчям. Натисніть \"Скасувати\" й налаштуйте PIN-код або інший варіант блокування екрана."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Блокування екрана захистить ваш телефон, якщо його буде загублено або викрадено. Ця функція також потрібна, щоб налаштувати автентифікацію за обличчям. Натисніть \"Скасувати\" й налаштуйте PIN-код або інший варіант блокування екрана."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Не налаштовувати PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Не налаштовувати пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Не налаштовувати ключ?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Налаштувати блокування екрана"</string>
@@ -1126,8 +1125,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Мобільні"</item>
+    <item msgid="6007360612667098926">"Лише Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2095,7 +2097,7 @@
     <string name="accessibility_screen_magnification_navbar_summary" msgid="4726360285256503132">"Коли ввімкнено збільшення, використовуйте кнопку спеціальних можливостей унизу екрана, щоб швидко збільшувати його вміст.\n\n"<b>"Щоб збільшити вміст"</b>", торкніться кнопки спеціальних можливостей, а потім будь-де на екрані.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями."</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці."</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", торкніться кнопки спеціальних можливостей, а потім натисніть і втримуйте будь-яке місце на екрані.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном.у"</li>\n<li>"Підніміть палець, щоб знову зменшити елемент."</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="6477234309484795550">"Для кнопки спеціальних можливостей вибрано службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\". Щоб змінити на збільшення, натисніть і втримуйте кнопку спеціальних можливостей, а потім виберіть \"Збільшення\"."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="3842279082831426816">"Комбінація клавіш гучності"</string>
-    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Служба, пов’язана з ярликом"</string>
+    <string name="accessibility_shortcut_service_title" msgid="3516052294376744060">"Швидке ввімкнення сервісу"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="1279441617927949980">"Дозволити на заблокованому екрані"</string>
     <string name="accessibility_shortcut_description" msgid="1427049334225166395">"Якщо цю комбінацію клавіш увімкнено, ви можете активувати спеціальні можливості, утримуючи обидві клавіші гучності протягом 3 секунд."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Висококонтрастний текст"</string>
@@ -2572,7 +2574,7 @@
     <string name="voice_interactor_preference_summary" msgid="7321365727286121067">"Підтримка команд швидкого запуску та взаємодії"</string>
     <string name="voice_recognizer_preference_summary" msgid="3681161319745912594">"Просте перетворення мовлення на текст"</string>
     <string name="voice_interaction_security_warning" msgid="4986261746316889768">"Ця служба голосового вводу зможе постійно відстежувати голос і контролювати додатки, у яких увімкнено голосовий ввід, від вашого імені. Вона походить із додатка <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Увімкнути цю службу?"</string>
-    <string name="tts_engine_preference_title" msgid="1183116842356275061">"Бажана система"</string>
+    <string name="tts_engine_preference_title" msgid="1183116842356275061">"Система за умовчанням"</string>
     <string name="tts_engine_settings_title" msgid="4079757915136562358">"Налаштування системи"</string>
     <string name="tts_sliders_title" msgid="1927481069989092278">"Темп і тон мовлення"</string>
     <string name="tts_engine_section_title" msgid="7796486438271227076">"Система"</string>
@@ -4307,7 +4309,7 @@
     <string name="enterprise_privacy_installed_packages" msgid="4376014821459811800">"Список додатків на вашому пристрої"</string>
     <string name="enterprise_privacy_usage_stats" msgid="445762931318731975">"Час роботи й обсяг використаного трафіку в кожному додатку"</string>
     <string name="enterprise_privacy_network_logs" msgid="5427398751599441159">"Останній журнал мережевого трафіку"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"Останнє повідомлення про помилку"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="283443567328836380">"Останній звіт про помилку"</string>
     <string name="enterprise_privacy_security_logs" msgid="8936969480449604726">"Останній журнал безпеки"</string>
     <string name="enterprise_privacy_none" msgid="5990646476868794882">"Немає"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6575025134782391212">"Установлені додатки"</string>
@@ -4424,6 +4426,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Це сповільнить роботу телефона"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Увімкнути повне вимірювання GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Відстежувати всі фотосхеми й частоти GNSS без застосування циклічного режиму"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Налагодити зміну користувача"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Показувати детальну інформацію під час зміни користувача"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Починати дії у фоновому режимі"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Дозволяє починати будь-які дії у фоновому режимі"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Завжди показувати вікно збоїв"</string>
@@ -4468,7 +4472,7 @@
     <string name="battery_suggestion_summary" msgid="2669070349482656490"></string>
     <string name="gesture_prevent_ringing_screen_title" msgid="4173494225145223638">"Не дзвонити"</string>
     <string name="gesture_prevent_ringing_title" msgid="8827963588425673557">"Разом кнопка живлення та збільшення гучності вмикають"</string>
-    <string name="gesture_prevent_ringing_sound_title" msgid="8642330448721033641">"Комбінація клавіш, щоб вимкнути звук дзвінка"</string>
+    <string name="gesture_prevent_ringing_sound_title" msgid="8642330448721033641">"Швидке вимкнення звуку дзвінка"</string>
     <string name="prevent_ringing_option_vibrate" msgid="6456505293904544108">"Віброрежим"</string>
     <string name="prevent_ringing_option_mute" msgid="53662688921253613">"Беззвучний режим"</string>
     <string name="prevent_ringing_option_none" msgid="1450985763137666231">"Нічого не робити"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ur-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-ur-nokeys/strings.xml
new file mode 100644
index 0000000..a1da9ae
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ur-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"ایپلیکیشنز کا نظم کریں"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ur/arrays.xml b/tests/CarDeveloperOptions/res/values-ur/arrays.xml
new file mode 100644
index 0000000..e35712a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-ur/arrays.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"امریکہ"</item>
+    <item msgid="4791956477275129121">"یورپ"</item>
+    <item msgid="3812126832016254559">"افریقہ"</item>
+    <item msgid="2765816300353408280">"ایشیا"</item>
+    <item msgid="6683489385344409742">"آسٹریلیا"</item>
+    <item msgid="5194868215515664953">"پیسفک"</item>
+    <item msgid="7044520255415007865">"تمام"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 سیکنڈ"</item>
+    <item msgid="772029947136115322">"30 سیکنڈ"</item>
+    <item msgid="8743663928349474087">"1 منٹ"</item>
+    <item msgid="1506508631223164814">"2 منٹ"</item>
+    <item msgid="8664703938127907662">"5 منٹ"</item>
+    <item msgid="5827960506924849753">"10 منٹ"</item>
+    <item msgid="6677424950124253938">"30 منٹ"</item>
+  </string-array>
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"فوری طور پر"</item>
+    <item msgid="2038544972632026612">"5 سیکنڈ"</item>
+    <item msgid="5558060663472279597">"15 سیکنڈ"</item>
+    <item msgid="45341168505452037">"30 سیکنڈ"</item>
+    <item msgid="227647485917789272">"1 منٹ"</item>
+    <item msgid="3367011891231217504">"2 منٹ"</item>
+    <item msgid="4376575879222393045">"5 منٹ"</item>
+    <item msgid="811192536981678974">"10 منٹ"</item>
+    <item msgid="7258394417241706272">"30 منٹ"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"منسلک"</item>
+    <item msgid="983792611851499732">"مدعو"</item>
+    <item msgid="5438273405428201793">"ناکام"</item>
+    <item msgid="4646663015449312554">"دستیاب ہے"</item>
+    <item msgid="3230556734162006146">"حد سے باہر"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 منٹ"</item>
+    <item msgid="2759776603549270587">"5 منٹ"</item>
+    <item msgid="167772676068860015">"1 گھنٹہ"</item>
+    <item msgid="5985477119043628504">"کبھی ٹائم آؤٹ نہ کریں"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"سسٹم ڈیفالٹ استعمال کریں: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"آخری 30 دن"</item>
+    <item msgid="3211287705232736964">"استعمال کا دور سیٹ کریں…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"استعمال کا وقت"</item>
+    <item msgid="2784401352592276015">"آخری بار استعمال کردہ"</item>
+    <item msgid="249854287216326349">"ایپ کا نام"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"کوئی نہیں"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"کوئی نہیں"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'‎"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"کوئی نہیں"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"کوئی نہیں"</item>
+    <item msgid="1464741437353223198">"مینوئل"</item>
+    <item msgid="5793600062487886090">"پراکسی آٹو کنفیگ"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"کوئی نہیں"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP یا CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"غیر متعینہ"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"کوئی نہیں"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"آلہ کا داخلی اسٹوریج"</item>
+    <item msgid="3186681694079967527">"ہٹانے لائق SD کارڈ"</item>
+    <item msgid="6902033473986647035">"سسٹم کو فیصلہ کرنے دیں"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"مقام"</item>
+    <item msgid="6842381562497597649">"ذاتی"</item>
+    <item msgid="3966700236695683444">"پیغام رسانی"</item>
+    <item msgid="8563996233342430477">"میڈیا"</item>
+    <item msgid="5323851085993963783">"آلہ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"اندازاً مقام"</item>
+    <item msgid="1830619568689922920">"ٹھیک مقام"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"وائبریٹ"</item>
+    <item msgid="8632513128515114092">"رابطوں کو پڑھیں"</item>
+    <item msgid="3741042113569620272">"رابطوں میں ترمیم کریں"</item>
+    <item msgid="4204420969709009931">"کال لاگ پڑھیں"</item>
+    <item msgid="2260380357119423209">"کال لاگ میں ترمیم کریں"</item>
+    <item msgid="6550710385014530934">"کیلنڈر پڑھیں"</item>
+    <item msgid="3575906174264853951">"کیلنڈر میں ترمیم کریں"</item>
+    <item msgid="4319843242568057174">"wi-fi اسکین"</item>
+    <item msgid="2981791890467303819">"اطلاع"</item>
+    <item msgid="6617825156152476692">"سیل اسکین"</item>
+    <item msgid="8865260890611559753">"فون پر کال کریں"</item>
+    <item msgid="3254999273961542982">"SMS پڑھیں"</item>
+    <item msgid="7711446453028825171">"SMS لکھیں"</item>
+    <item msgid="6123238544099198034">"SMS وصول کریں"</item>
+    <item msgid="838342167431596036">"ہنگامی SMS موصول کریں"</item>
+    <item msgid="8554432731560956686">"MMS وصول کریں"</item>
+    <item msgid="7464863464299515059">"WAP پش وصول کریں"</item>
+    <item msgid="310463075729606765">"SMS بھیجیں"</item>
+    <item msgid="7338021933527689514">"ICC SMS پڑھیں"</item>
+    <item msgid="6130369335466613036">"ICC SMS لکھیں"</item>
+    <item msgid="6536865581421670942">"ترتیبات میں ترمیم کریں"</item>
+    <item msgid="4547203129183558973">"سب سے اوپر ڈرا کریں"</item>
+    <item msgid="9080347512916542840">"اطلاعات تک رسائی حاصل کریں"</item>
+    <item msgid="5332718516635907742">"کیمرا"</item>
+    <item msgid="6098422447246167852">"آڈیو ریکارڈ کریں"</item>
+    <item msgid="9182794235292595296">"آڈیو چلائیں"</item>
+    <item msgid="8760743229597702019">"کلپ بورڈ پڑھیں"</item>
+    <item msgid="2266923698240538544">"کلپ بورڈ میں ترمیم کریں"</item>
+    <item msgid="1801619438618539275">"میڈیا بٹنز"</item>
+    <item msgid="31588119965784465">"آڈیو فوکس"</item>
+    <item msgid="7565226799008076833">"ماسٹر والیوم"</item>
+    <item msgid="5420704980305018295">"صوتی والیوم"</item>
+    <item msgid="5797363115508970204">"رنگ والیوم"</item>
+    <item msgid="8233154098550715999">"میڈیا والیوم"</item>
+    <item msgid="5196715605078153950">"الارم والیوم"</item>
+    <item msgid="394030698764284577">"اطلاع کا والیوم"</item>
+    <item msgid="8952898972491680178">"بلوٹوتھ والیوم"</item>
+    <item msgid="8506227454543690851">"اسکرین آن رکھیں"</item>
+    <item msgid="1108160036049727420">"مقام پر نگاہ رکھیں"</item>
+    <item msgid="1496205959751719491">"اعلی قوت کے مقام پر نگاہ رکھیں"</item>
+    <item msgid="3776296279910987380">"استعمال کے اعداد و شمار حاصل کریں"</item>
+    <item msgid="8827100324471975602">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
+    <item msgid="6880736730520126864">"ٹوسٹ دکھائیں"</item>
+    <item msgid="4933375960222609935">"پروجیکٹ میڈیا"</item>
+    <item msgid="8357907018938895462">"VPN کو فعال کریں"</item>
+    <item msgid="8143812849911310973">"وال پیپر لکھیں"</item>
+    <item msgid="6266277260961066535">"اسٹرکچر اسسٹ کریں"</item>
+    <item msgid="7715498149883482300">"اسکرین شاٹ اسسٹ کریں"</item>
+    <item msgid="4046679376726313293">"فون اسٹیٹ پڑھیں"</item>
+    <item msgid="6329507266039719587">"صوتی میل شامل کریں"</item>
+    <item msgid="7692440726415391408">"سِپ استعمال کریں"</item>
+    <item msgid="8572453398128326267">"باہر جانے والی کال پر کاروائی کریں"</item>
+    <item msgid="7775674394089376306">"فنگر پرنٹ"</item>
+    <item msgid="3182815133441738779">"باڈی سینسرز"</item>
+    <item msgid="2793100005496829513">"سیل نشریات پڑھیں"</item>
+    <item msgid="2633626056029384366">"مقام فرضی بنائیں"</item>
+    <item msgid="8356842191824684631">"اسٹوریج پڑھیں"</item>
+    <item msgid="5671906070163291500">"اسٹوریج لکھیں"</item>
+    <item msgid="2791955098549340418">"اسکرین آن کریں"</item>
+    <item msgid="5599435119609178367">"اکاؤنٹس حاصل کریں"</item>
+    <item msgid="1165623660533024666">"پس منظر میں چلائیں"</item>
+    <item msgid="6423861043647911030">"ایکسیسبیلٹی والیوم"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"مختصر"</item>
+    <item msgid="4816511817309094890">"متوسط"</item>
+    <item msgid="8305084671259331134">"طویل"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"ڈیفالٹ"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif گٹھا ہوا"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"بڑے حروف چھوٹے سائز میں"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"ڈیفالٹ"</item>
+    <item msgid="6488643537808152001">"کوئی نہیں"</item>
+    <item msgid="552332815156010137">"آؤٹ لائن"</item>
+    <item msgid="7187891159463789272">"سایہ شامل کریں"</item>
+    <item msgid="8019330250538856521">"ابھرا ہوا"</item>
+    <item msgid="8987385315647049787">"دبا ہوا"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"پہلے سے اشتراک کردہ کلیدوں کے ساتھ L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"سرٹیفیکیٹس کے ساتھ L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"پہلے سے اشتراک کردہ کلیدوں اور Xauth توثیق کے ساتھ IPSec VPN"</item>
+    <item msgid="3319427315593649917">"سرٹیفیکیٹس اور Xauth توثیق کے ساتھ IPSec VPN"</item>
+    <item msgid="8258927774145391041">"سرٹیفیکیٹس اور ہائی برڈ توثیق کے ساتھ IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"کوئی نہیں"</item>
+    <item msgid="1157046369795346308">"مینوئل"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"پوچھیں"</item>
+    <item msgid="7718817231348607934">"کبھی اجازت نہ دیں"</item>
+    <item msgid="8184570120217958741">"ہمیشہ اجازت دیں"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"استقلال پذیر"</item>
+    <item msgid="167418068739176448">"سرفہرست سرگرمی"</item>
+    <item msgid="4760813290195199773">"اہم (پیش منظر)"</item>
+    <item msgid="2328684826817647595">"اہم (پس منظر)"</item>
+    <item msgid="7746406490652867365">"بیک اپ"</item>
+    <item msgid="5597404364389196754">"بھاری بھرکم"</item>
+    <item msgid="1290888779300174556">"سروس (چل رہی ہے)"</item>
+    <item msgid="7241098542073939046">"سروس (دوبارہ شروع ہو رہی ہے)"</item>
+    <item msgid="6610439017684111046">"وصول کنندہ"</item>
+    <item msgid="7367606086319921117">"ہوم"</item>
+    <item msgid="3344660712396741826">"آخری سرگرمی"</item>
+    <item msgid="5006559348883303865">"کیش کی ہوئی (سرگرمی)"</item>
+    <item msgid="8633480732468137525">"کیش کی ہوئی (سرگرمی کلائنٹ)"</item>
+    <item msgid="6248998242443333892">"کیش کی ہوئی (خالی)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"نیلگوں سبز"</item>
+    <item msgid="3228505970082457852">"نیلا"</item>
+    <item msgid="6590260735734795647">"گہرا نیلا"</item>
+    <item msgid="3521763377357218577">"جامنی"</item>
+    <item msgid="5932337981182999919">"گلابی"</item>
+    <item msgid="5642914536624000094">"سرخ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 دن سے زیادہ پرانی"</item>
+    <item msgid="8699273238891265610">"60 دن سے زیادہ پرانی"</item>
+    <item msgid="8346279419423837266">"90 دن سے زیادہ پرانی"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"خود کار طور پر پتہ لگائیں"</item>
+    <item msgid="773943026484148895">"میٹر شدہ کے بطور خیال کریں"</item>
+    <item msgid="1008268820118852416">"غیر میٹر شدہ کے بطور خیال کریں"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"بے ترتیب MAC کا استعمال کریں (ڈیفالٹ)"</item>
+    <item msgid="214234417308375326">"آلہ کا MAC استعمال کریں"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"نہیں"</item>
+    <item msgid="1930581185557754880">"ہاں"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"گہری"</item>
+    <item msgid="5079453644557603349">"ہلکی"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"آف"</item>
+    <item msgid="4072198137051566919">"ڈیبگ کریں"</item>
+    <item msgid="2473005316958868509">"وربوس"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"صرف ہوم"</item>
+    <item msgid="1161026694891024702">"خودکار"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA ترجیحی"</item>
+    <item msgid="7581481130337402578">"صرف GSM"</item>
+    <item msgid="8579197487913425819">"صرف WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA خودکار"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo خودکار"</item>
+    <item msgid="4219607161971472471">"EvDo کے بغیر CDMA"</item>
+    <item msgid="7278975240951052041">"صرف EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"عالمی"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"صرف TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"عالمی"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-ur/strings.xml b/tests/CarDeveloperOptions/res/values-ur/strings.xml
index 3c8fbc5..fb8ff24 100644
--- a/tests/CarDeveloperOptions/res/values-ur/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ur/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"اپنے ٹیبلیٹ کو اسکرین لاک کے اختیار کے ساتھ محفوظ رکھیں تاکہ گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہ کر سکے۔ چہرے سے تصدیق کو سیٹ اپ کرنے کے لیے آپ کے لیے اسکرین لاک کا اختیار بھی ضروری ہے۔ \'منسوخ کريں\' پر تھپتھپائیں، پھر PIN سیٹ کریں یا اسکرین لاک کا کوئی دوسرا اختیار منتخب کریں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"اپنے آلہ کو اسکرین لاک کے اختیار کے ذریعے محفوظ رکھیں تاکہ گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہ کر سکے۔ چہرے سے تصدیق کو سیٹ اپ کرنے کے لیے آپ کے لیے اسکرین لاک کا اختیار بھی ضروری ہے۔ \'منسوخ کريں\' پر تھپتھپائیں، پھر PIN سیٹ کریں یا اسکرین لاک کا کوئی دوسرا اختیار منتخب کریں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"اپنے فون کو اسکرین لاک کے اختیار سے محفوظ رکھیں تاکہ گمشدہ یا چوری ہونے پر بھی کوئی اس کا استعمال نہ کر پائے۔ چہرے سے تصدیق کو سیٹ اپ کرنے کے لیے آپ کے لیے اسکرین لاک کا اختیار بھی ضروری ہے۔ \'منسوخ کريں\' پر تھپتھپائیں، پھر PIN سیٹ کریں یا اسکرین لاک کا کوئی دوسرا اختیار منتخب کریں۔"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN سیٹ اپ کو نظر انداز کریں؟"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"پاس ورڈ سیٹ اپ نظر انداز کریں؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"پیٹرن سیٹ اپ نظر انداز کریں؟"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"اسکرین لاک کو ترتیب دیں"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"‎@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"موبائل"</item>
+    <item msgid="6007360612667098926">"صرف Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"‎@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"‎@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1237,7 +1239,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="8950504698015331202">"حسب ضرورت"</string>
     <string name="wallpaper_suggestion_title" msgid="3012130414886743201">"وال پیپر تبدیل کریں"</string>
     <string name="wallpaper_suggestion_summary" msgid="4247262938988875842">"اپنی اسکرین کو ذاتی نوعیت کا بنائیں"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"وال پیپر منتخب کریں منجانب"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="1503701065297188901">"وال پیپر منتخب کریں"</string>
     <string name="screensaver_settings_title" msgid="7720091234133721021">"اسکرین سیور"</string>
     <string name="screensaver_settings_summary_either_long" msgid="6078038506795498288">"ڈاک سے منسلک یا چارج ہونے کے دوران"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2453772128682850053">"دونوں صورتوں میں"</string>
@@ -3164,7 +3166,7 @@
     <string name="zen_mode_behavior_settings_title" msgid="423125904296667490">"مستثنیات"</string>
     <string name="zen_mode_duration_settings_title" msgid="5522668871014735728">"ڈیفالٹ دورانیہ"</string>
     <string name="zen_mode_behavior_allow_title" msgid="2440627647424280842">"اس سے آوازیں اور وائبریشنز کی اجازت دیں"</string>
-    <string name="zen_mode_behavior_no_sound" msgid="7290387625018248748">"کوئی آواز نہیں ہے"</string>
+    <string name="zen_mode_behavior_no_sound" msgid="7290387625018248748">"کوئی آواز نہیں"</string>
     <string name="zen_mode_behavior_total_silence" msgid="371498357539257671">"مکمل خاموشی"</string>
     <string name="zen_mode_behavior_no_sound_except" msgid="8894465423364103198">"<xliff:g id="CATEGORIES">%1$s</xliff:g> کے سوا کوئی آواز نہیں ہے"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="8406622989983047562">"الارمز اور میڈیا کے علاوہ کوئی آواز نہیں ہے"</string>
@@ -4270,6 +4272,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"اس سے فون کی رفتار سست ہوجائے گی"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"مکمل GNSS پیمائشوں کو زبردستی لاگو کریں"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"ڈیوٹی سائیکلنگ کے بغیر سبھی GNSS مجموعوں اور کثرتوں کو ٹریک کریں"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"صارف کے سوئچ کو ڈیبگ کریں"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"صارف سوئچ کے دوران معلومات کی تفصیلات دکھائے"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"پس منظر کی سرگرمی شروع ہونے دیں"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"پس منظر کی سبھی سرگرمیوں کو شروع ہونے دیتی ہے"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"ہمیشہ ناکامی کا ڈائیلاگ دکھائیں"</string>
diff --git a/tests/CarDeveloperOptions/res/values-uz-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-uz-nokeys/strings.xml
new file mode 100644
index 0000000..9c97e4a
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-uz-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Ilovalarni boshqarish"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-uz/arrays.xml b/tests/CarDeveloperOptions/res/values-uz/arrays.xml
new file mode 100644
index 0000000..2dfcf75
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-uz/arrays.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Amerika"</item>
+    <item msgid="4791956477275129121">"Yevropa"</item>
+    <item msgid="3812126832016254559">"Afrika"</item>
+    <item msgid="2765816300353408280">"Osiyo"</item>
+    <item msgid="6683489385344409742">"Avstraliya"</item>
+    <item msgid="5194868215515664953">"Tinch okeani"</item>
+    <item msgid="7044520255415007865">"Hammasi"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:0 (8596143519087753804) -->
+    <!-- no translation found for dream_timeout_entries:7 (8271452751594598661) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Darhol"</item>
+    <item msgid="2038544972632026612">"5 soniya"</item>
+    <item msgid="5558060663472279597">"15 soniya"</item>
+    <item msgid="45341168505452037">"30 soniya"</item>
+    <item msgid="227647485917789272">"1 daqiqa"</item>
+    <item msgid="3367011891231217504">"2 daqiqa"</item>
+    <item msgid="4376575879222393045">"5 daqiqa"</item>
+    <item msgid="811192536981678974">"10 daqiqa"</item>
+    <item msgid="7258394417241706272">"30 daqiqa"</item>
+  </string-array>
+    <!-- no translation found for entries_font_size:0 (2340391964816059553) -->
+    <!-- no translation found for entries_font_size:0 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:2 (1714184661981538355) -->
+    <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
+    <!-- no translation found for wifi_status:3 (5848277343965362748) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (6816207058895999545) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (7547609081339573756) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (5145158315060185414) -->
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+    <!-- no translation found for wifi_p2p_wps_setup:0 (5390235347963255303) -->
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Ulandi"</item>
+    <item msgid="983792611851499732">"Taklif qilingan"</item>
+    <item msgid="5438273405428201793">"Muvaffaqiyatsiz"</item>
+    <item msgid="4646663015449312554">"Mavjud"</item>
+    <item msgid="3230556734162006146">"Chegaradan tashqari"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (2759776603549270587) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Standart tizim parametrlaridan foydalanish: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+    <!-- no translation found for wifi_signal:1 (7882129634982603782) -->
+    <!-- no translation found for wifi_signal:4 (999948812884919584) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"So‘nggi 30 kun"</item>
+    <item msgid="3211287705232736964">"Internetdan foyd-sh davri…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Sarf vaqti"</item>
+    <item msgid="2784401352592276015">"So‘nggi marta foydalanish"</item>
+    <item msgid="249854287216326349">"Ilova nomi"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Tarmoq yo‘q"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Hech qanday"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Tarmoq yo‘q"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_ip_settings:1 (4377002609760712163) -->
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Tarmoq yo‘q"</item>
+    <item msgid="1464741437353223198">"Qo‘llanma"</item>
+    <item msgid="5793600062487886090">"Proksi avto-sozlamalari"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Tarmoq yo‘q"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP yoki CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Ko‘rsatilmagan"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Hech qanday"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Ichki xotira qurilmasi"</item>
+    <item msgid="3186681694079967527">"Tashqi SD karta"</item>
+    <item msgid="6902033473986647035">"Tizimni o‘zi tanlasin"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Joylashuv"</item>
+    <item msgid="6842381562497597649">"Shaxsiy"</item>
+    <item msgid="3966700236695683444">"SMS/MMS"</item>
+    <item msgid="8563996233342430477">"Media"</item>
+    <item msgid="5323851085993963783">"Qurilma"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"taxminiy joylashuv"</item>
+    <item msgid="1830619568689922920">"aniq joylashuv"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"tebranish"</item>
+    <item msgid="8632513128515114092">"kontaktlarni ko‘rib chiqish"</item>
+    <item msgid="3741042113569620272">"kontaktlarni o‘zgartirish"</item>
+    <item msgid="4204420969709009931">"qo‘ng‘iroqlar jurnalini ko‘rib chiqish"</item>
+    <item msgid="2260380357119423209">"qo‘ng‘iroqlar jurnalini o‘zgartirish"</item>
+    <item msgid="6550710385014530934">"taqvimni ko‘rib chiqish"</item>
+    <item msgid="3575906174264853951">"taqvimni o‘zgartirish"</item>
+    <item msgid="4319843242568057174">"wi-fi tarmog‘ini qidirish"</item>
+    <item msgid="2981791890467303819">"xabarnoma"</item>
+    <item msgid="6617825156152476692">"uyali tarmoqni qidirish"</item>
+    <item msgid="8865260890611559753">"telefonga qo‘ng‘iroq qilish"</item>
+    <item msgid="3254999273961542982">"SMS\'ni o‘qish"</item>
+    <item msgid="7711446453028825171">"SMS yozish"</item>
+    <item msgid="6123238544099198034">"SMS qabul qilish"</item>
+    <item msgid="838342167431596036">"Favqulodda SMS qabul qilish"</item>
+    <item msgid="8554432731560956686">"MMS qabul qilish"</item>
+    <item msgid="7464863464299515059">"WAP push xabarlarini qabul qilish"</item>
+    <item msgid="310463075729606765">"SMS yuborish"</item>
+    <item msgid="7338021933527689514">"ICC SMS‘ni o‘qish"</item>
+    <item msgid="6130369335466613036">"ICC SMS yozish"</item>
+    <item msgid="6536865581421670942">"sozlamalarni o‘zgartirish"</item>
+    <item msgid="4547203129183558973">"ustiga chizish"</item>
+    <item msgid="9080347512916542840">"xabarnomalarga kirish"</item>
+    <item msgid="5332718516635907742">"kamera"</item>
+    <item msgid="6098422447246167852">"ovoz yozib olish"</item>
+    <item msgid="9182794235292595296">"audioqaydni ijro etish"</item>
+    <item msgid="8760743229597702019">"vaqtinchalik xotira ma‘lumotini o‘qish"</item>
+    <item msgid="2266923698240538544">"vaqtinchalik xotira ma‘lumotini o‘zgartirish"</item>
+    <item msgid="1801619438618539275">"multimedia tugmalari"</item>
+    <item msgid="31588119965784465">"audio fokus"</item>
+    <item msgid="7565226799008076833">"umumiy tovush balandligi"</item>
+    <item msgid="5420704980305018295">"ovoz balandligi"</item>
+    <item msgid="5797363115508970204">"jiringlash tovushi"</item>
+    <item msgid="8233154098550715999">"multimedia tovushi"</item>
+    <item msgid="5196715605078153950">"signal tovushi"</item>
+    <item msgid="394030698764284577">"xabarnoma tovush balandligi"</item>
+    <item msgid="8952898972491680178">"bluetooth tovush balandligi"</item>
+    <item msgid="8506227454543690851">"uyg‘oq turish"</item>
+    <item msgid="1108160036049727420">"joylashuvni kuzatish"</item>
+    <item msgid="1496205959751719491">"yuqori elektr kuchlanishga ega joylashuvlarni kuzatish"</item>
+    <item msgid="3776296279910987380">"foydalanish statistikasini ko‘rish"</item>
+    <item msgid="8827100324471975602">"mikrofonni o‘chirish/yoqish"</item>
+    <item msgid="6880736730520126864">"toast dasturini ko‘rsatish"</item>
+    <item msgid="4933375960222609935">"kontentni translatsiya qilish"</item>
+    <item msgid="8357907018938895462">"VPN tarmog‘ini faollashtirish"</item>
+    <item msgid="8143812849911310973">"orqa fon rasmiga yozish"</item>
+    <item msgid="6266277260961066535">"yordam tuzilishi"</item>
+    <item msgid="7715498149883482300">"yordam ekran rasmi"</item>
+    <item msgid="4046679376726313293">"telefon holatini o‘qish"</item>
+    <item msgid="6329507266039719587">"ovozli xabar qo‘shish"</item>
+    <item msgid="7692440726415391408">"SIPdan foydalanish"</item>
+    <item msgid="8572453398128326267">"chiquvchi qo‘ng‘iroq jarayoni"</item>
+    <item msgid="7775674394089376306">"barmoq izi"</item>
+    <item msgid="3182815133441738779">"tana sezgichlari"</item>
+    <item msgid="2793100005496829513">"tarqatma xabarlarni o‘qish"</item>
+    <item msgid="2633626056029384366">"soxta joylashuv"</item>
+    <item msgid="8356842191824684631">"xotirani o‘qish"</item>
+    <item msgid="5671906070163291500">"xotiraga yozish"</item>
+    <item msgid="2791955098549340418">"ekranni yoqish"</item>
+    <item msgid="5599435119609178367">"hisoblarni olish"</item>
+    <item msgid="1165623660533024666">"fonda ishga tushirish"</item>
+    <item msgid="6423861043647911030">"maxsus imkoniyatlar ovozi balandligi"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:3 (7836406246005211990) -->
+    <!-- no translation found for app_ops_labels:4 (3951439024549922598) -->
+    <!-- no translation found for app_ops_labels:8 (3597797992398484655) -->
+    <!-- no translation found for app_ops_labels:20 (3037159047591081136) -->
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Qisqa"</item>
+    <item msgid="4816511817309094890">"O‘rtacha"</item>
+    <item msgid="8305084671259331134">"Uzoq"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Asosiy"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Ixchamlashtirilgan Sans-serif"</item>
+    <item msgid="6529379119163117545">"Sans-serif (bir xil oraliqli)"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif (bir xil oraliqli)"</item>
+    <item msgid="4448481989108928248">"Norasmiy"</item>
+    <item msgid="4627069151979553527">"Qiya"</item>
+    <item msgid="6896773537705206194">"Kichik bosh harflar"</item>
+  </string-array>
+    <!-- no translation found for captioning_font_size_selector_titles:3 (2784236342175159295) -->
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Asosiy"</item>
+    <item msgid="6488643537808152001">"Tarmoq yo‘q"</item>
+    <item msgid="552332815156010137">"Chegara"</item>
+    <item msgid="7187891159463789272">"Soyani olib tashlash"</item>
+    <item msgid="8019330250538856521">"Ko‘tarilgan"</item>
+    <item msgid="8987385315647049787">"Pasaytirilgan"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+    <!-- no translation found for captioning_preset_selector_titles:2 (5891360837786277638) -->
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN avval ulashilgan kalitlar bilan"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN sertifikatlar bilan"</item>
+    <item msgid="312397853907741968">"IPSec VPN avval ulashilgan kalitlar bilan va Xauth tasdiqidan o‘tish"</item>
+    <item msgid="3319427315593649917">"IPSec VPN sertifikatlar bilan and Xauth tasdiqidan o‘tish"</item>
+    <item msgid="8258927774145391041">"IPSec VPN sertifikatlar bilan va aralash tasdiqidan o‘tish"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Hech biri"</item>
+    <item msgid="1157046369795346308">"Qo‘llanma"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:4 (9135049670787351881) -->
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"So‘rash"</item>
+    <item msgid="7718817231348607934">"Hech qachon ruxsat berilmasin"</item>
+    <item msgid="8184570120217958741">"Har doim ruxsat berilsin"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Barqaror"</item>
+    <item msgid="167418068739176448">"Eng mashhur harakat"</item>
+    <item msgid="4760813290195199773">"Muhim (faol rejim)"</item>
+    <item msgid="2328684826817647595">"Muhim (orqa fon)"</item>
+    <item msgid="7746406490652867365">"Zaxiralash"</item>
+    <item msgid="5597404364389196754">"O‘ta og‘ir"</item>
+    <item msgid="1290888779300174556">"Xizmat (ishlamoqda)"</item>
+    <item msgid="7241098542073939046">"Xizmat (qayta ishga tushirilmoqda)"</item>
+    <item msgid="6610439017684111046">"Qabul qiluvchi"</item>
+    <item msgid="7367606086319921117">"Bosh sahifa"</item>
+    <item msgid="3344660712396741826">"So‘nggi harakat"</item>
+    <item msgid="5006559348883303865">"Keshlangan (harakat)"</item>
+    <item msgid="8633480732468137525">"Keshlangan (harakat mijozi)"</item>
+    <item msgid="6248998242443333892">"Keshlangan (bo‘sh)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Moviy"</item>
+    <item msgid="3228505970082457852">"Ko‘k"</item>
+    <item msgid="6590260735734795647">"To‘q ko‘k"</item>
+    <item msgid="3521763377357218577">"Binafsharang"</item>
+    <item msgid="5932337981182999919">"Pushti"</item>
+    <item msgid="5642914536624000094">"Qizil"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"30 kundan ortiq"</item>
+    <item msgid="8699273238891265610">"60 kundan ortiq"</item>
+    <item msgid="8346279419423837266">"90 kundan ortiq"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Avtomatik aniqlash"</item>
+    <item msgid="773943026484148895">"Bu – pulli tarmoq"</item>
+    <item msgid="1008268820118852416">"Bu – bepul tarmoq"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Ixtiyoriy MAC manzil (standart)"</item>
+    <item msgid="214234417308375326">"Ixtiyoriy MAC manzil"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Yo‘q"</item>
+    <item msgid="1930581185557754880">"Ha"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tungi"</item>
+    <item msgid="5079453644557603349">"Kunduzgi"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Yoqilmagan"</item>
+    <item msgid="4072198137051566919">"Tuzatish"</item>
+    <item msgid="2473005316958868509">"Batafsil"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Faqat uy"</item>
+    <item msgid="1161026694891024702">"Avtomatik"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA (afzal)"</item>
+    <item msgid="7581481130337402578">"Faqat GSM"</item>
+    <item msgid="8579197487913425819">"Faqat WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA (avtomatik)"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo (avtomatik)"</item>
+    <item msgid="4219607161971472471">"CDMA (EvDo imkoniyatisiz)"</item>
+    <item msgid="7278975240951052041">"Faqat EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA va LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Global"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Faqat TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Global"</item>
+    <item msgid="7893851358184700811">"LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-uz/strings.xml b/tests/CarDeveloperOptions/res/values-uz/strings.xml
index 0f54e7a..6b347a5 100644
--- a/tests/CarDeveloperOptions/res/values-uz/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uz/strings.xml
@@ -62,7 +62,7 @@
     <string name="radioInfo_roaming_not" msgid="7733269160603599835">"Rouming o‘chirilgan"</string>
     <string name="radioInfo_phone_idle" msgid="1893851191227617344">"Faol emas"</string>
     <string name="radioInfo_phone_ringing" msgid="5587975376222853265">"Jiringlamoqda"</string>
-    <string name="radioInfo_phone_offhook" msgid="3186071430568806208">"Qo‘ng‘iroq"</string>
+    <string name="radioInfo_phone_offhook" msgid="3186071430568806208">"Chaqiruv"</string>
     <string name="radioInfo_data_disconnected" msgid="5311119240521915279">"Uzildi"</string>
     <string name="radioInfo_data_connecting" msgid="47095003276717745">"Ulanilmoqda"</string>
     <string name="radioInfo_data_connected" msgid="3755289851642913750">"Ulandi"</string>
@@ -355,7 +355,7 @@
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Qulflangan ekran ustidagi matn"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Vidjetlarni yoqish"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Administrator tomonidan o‘chirilgan"</string>
-    <string name="lockdown_settings_title" msgid="4534779922580115990">"Qulflash funksiyasini ko‘rsatish"</string>
+    <string name="lockdown_settings_title" msgid="4534779922580115990">"Qulflash tugmasini chiqarish"</string>
     <string name="lockdown_settings_summary" msgid="7270756909878256174">"Smart Lock, barmoq izi bilan qulfni ochish va ekran qulfidagi bildirishnomalarni faolsizlantiradigan quvvat tugmasi funksiyasini ko‘rsatish."</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Ishonch agentlari qulf ochishni sura oladi"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Bu parametr yoqilsa, ishonch agentlari uzoq vaqt qulfsiz saqlaydi, lekin qulflangan qurilmani qulfdan chiqara olmaydi."</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Planshet ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishi oldini oladi. Ekran qulfi yuzni tanitish parametri bilan sozlanishi kerak. Bekor qilish ustiga bosib, PIN kod kiriting yoki boshqa ekran qulfi parametrini tanlang."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Qurilma ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishi oldini oladi. Ekran qulfi yuzni tanitish parametri bilan sozlanishi kerak. Bekor qilish ustiga bosib, PIN kod kiriting yoki boshqa ekran qulfi parametrini tanlang."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Telefon ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishi oldini oladi. Ekran qulfi yuzni tanitish parametri bilan sozlanishi kerak. Bekor qilish ustiga bosib, PIN kod kiriting yoki boshqa ekran qulfi parametrini tanlang."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"PIN kod kerak emasmi?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Parol kerak emasmi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Grafik kalit kerak emasmi?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Ekranni qulfini sozlash"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Mobil"</item>
+    <item msgid="6007360612667098926">"Faqat Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1116,7 +1118,7 @@
     <string name="sound_settings" msgid="3306063041029638807">"Tovush"</string>
     <string name="all_volume_title" msgid="1750261506951315423">"Ovoz balandligi"</string>
     <string name="musicfx_title" msgid="6456079041566773649">"Musiqa effektlari"</string>
-    <string name="ring_volume_title" msgid="5874791723449821646">"Qo‘ng‘iroq ovozi"</string>
+    <string name="ring_volume_title" msgid="5874791723449821646">"Jiringlash tovushi"</string>
     <string name="vibrate_in_silent_title" msgid="2314667015729841220">"Ovozsizligida tebranish"</string>
     <string name="notification_sound_title" msgid="6812164482799723931">"Standart bildirishnoma tovushi"</string>
     <string name="incoming_call_volume_title" msgid="4736570528754310450">"Rington"</string>
@@ -2061,7 +2063,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="5652244684961877255">"Yuqori kontrastli matn"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="2466317284195934003">"Ekranda kattalashtirish xususiyatini avtomatik ravishda yangilash"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="6625473745911276917">"Bir ilovadan ikkinchisiga o‘tishda ekranda kattalashtirish xususiyatini yangilash"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Quvvat tugmasi qo‘n-ni tugatadi"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6172987104538172869">"Quvvat tugmasi chaqiruvni tugatadi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="9127905775116570565">"Yirik sichqoncha kursori"</string>
     <string name="accessibility_disable_animations" msgid="8378441317115710009">"Animatsiyalarni olib tashlash"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="899550848196702565">"Mono audio"</string>
@@ -2201,7 +2203,7 @@
     <string name="print_menu_item_settings" msgid="2654804159012579508">"Sozlamalar"</string>
     <string name="print_menu_item_add_printers" msgid="8198201275621756510">"Printerlar qo‘shish"</string>
     <string name="print_feature_state_on" msgid="1838010230650403367">"YONIQ"</string>
-    <string name="print_feature_state_off" msgid="208580346723223688">"YOQILMAGAN"</string>
+    <string name="print_feature_state_off" msgid="208580346723223688">"Yoqilmagan"</string>
     <string name="print_menu_item_add_service" msgid="6803000110578493782">"Xizmat qo‘shish"</string>
     <string name="print_menu_item_add_printer" msgid="8529196211179574921">"Printer qo‘shish"</string>
     <string name="print_menu_item_search" msgid="1165316329772287360">"Qidiruv"</string>
@@ -3145,9 +3147,9 @@
     <string name="sound_settings_example_summary" msgid="2091822107298841827">"Jiringlaganda: 80%"</string>
     <string name="media_volume_option_title" msgid="3553411883305505682">"Multimedia tovushi"</string>
     <string name="remote_media_volume_option_title" msgid="6355710054191873836">"Translatsiya tovushi balandligi"</string>
-    <string name="call_volume_option_title" msgid="5028003296631037334">"Chaqiruv tovushi"</string>
-    <string name="alarm_volume_option_title" msgid="3184076022438477047">"Signal tovushi balandligi"</string>
-    <string name="ring_volume_option_title" msgid="2038924918468372264">"Rington"</string>
+    <string name="call_volume_option_title" msgid="5028003296631037334">"Suhbat tovushi"</string>
+    <string name="alarm_volume_option_title" msgid="3184076022438477047">"Signal tovushi"</string>
+    <string name="ring_volume_option_title" msgid="2038924918468372264">"Jiringlash tovushi"</string>
     <string name="notification_volume_option_title" msgid="1358512611511348260">"Bildirishnomalar ovozi"</string>
     <string name="ringtone_title" msgid="1409086028485922583">"Telefon ringtoni"</string>
     <string name="notification_ringtone_title" msgid="2932960620843976285">"Standart bildirishnoma tovushi"</string>
@@ -3313,7 +3315,7 @@
     <string name="asst_capabilities_actions_replies_title" msgid="3929395108744251338">"Tezkor amallar va javoblar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="5647029698181357902">"Bildirishnomalarga kontekstga oid amallar va tezkor javoblarni avtomatik kiritish"</string>
     <string name="hide_silent_icons_title" msgid="1070905516921542662">"Tovushsiz bildirishnomalar holatiga oid belgilarni berkitish"</string>
-    <string name="hide_silent_icons_summary" msgid="2624346914488256888">"Holat qatorida tovushsiz bildirishnomalar belgilarini berkitish"</string>
+    <string name="hide_silent_icons_summary" msgid="2624346914488256888">"Holat qatorida sokin bildirishnomalar belgilarini berkitish"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"Bildirishnoma belgisi"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"Pufakchalar"</string>
     <string name="notification_bubbles_summary" msgid="4624512775901949578">"Erkin yorliqlar yordamida ilova kontentini istalgan sahifadan tezkor ochish"</string>
@@ -3562,7 +3564,7 @@
     <string name="device_feedback" msgid="4042352891448769818">"Qurilma haqida fikr-mulohaza"</string>
     <string name="restr_pin_enter_admin_pin" msgid="8577847751493521230">"Administrator PIN kodini kiriting"</string>
     <string name="switch_on_text" msgid="7100491749799298324">"YONIQ"</string>
-    <string name="switch_off_text" msgid="3539551289454353555">"YOQILMAGAN"</string>
+    <string name="switch_off_text" msgid="3539551289454353555">"Yoqilmagan"</string>
     <string name="screen_pinning_title" msgid="578020318289781102">"Ekranni mahkamlash"</string>
     <string name="screen_pinning_description" msgid="3814537379086412278">"Agar bu xususiyat yoqilsa, ekran faqat bitta ilovaga mahkamlanadi.\n\nEkranni mahkamlash uchun:\n\n1. Ekranni mahkamlash xususiyatini yoqing\n\n2. Umumiy ma’lumot tugmasini bosing\n\n3. Ekranning yuqorisidagi ilova ikonkasini bosib, keyin Makhamlash tugmasini bosing"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1060334707088339444">"Yechishdan oldin grafik kalit so‘ralsin"</string>
@@ -3816,7 +3818,7 @@
     <string name="system_alert_window_settings" msgid="3024330223417646567">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="system_alert_window_apps_title" msgid="9188448296493699566">"Ilovalar"</string>
     <string name="system_alert_window_access_title" msgid="5187343732185369675">"Boshqa ilovalar ustidan ochilish"</string>
-    <string name="permit_draw_overlay" msgid="9039092257052422344">"Boshqa ilovalar ustidan ochilishiga ruxsat"</string>
+    <string name="permit_draw_overlay" msgid="9039092257052422344">"Boshqa ilovalar ustidan ochilish"</string>
     <string name="allow_overlay_description" msgid="6669524816705082807">"Interfeys elementlarini boshqa oynalar ustidan ochishga ruxsat beradi. Bu funksiya ilovalar bilan ishlashingizga xalaqit qilishi yoki ularning interfeysini buzib tashlashi mumkin."</string>
     <string name="keywords_vr_listener" msgid="5312633527788917750">"vr virtual borliq tinglovchi stereo yordamchi xizmat"</string>
     <string name="keywords_system_alert_window" msgid="3936658600272194599">"tizim signal muloqot oynasi boshqa ilovalar ustidan ochilish"</string>
@@ -4292,6 +4294,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Bunda telefon sekinlashi mumkin"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Butun GNSS statistikasini yuklash"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Siklsiz barcha GNSS sxema va davriyliklarini kuzatish"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Foydalanuvchi almashinuvi tafsilotlari"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Foydalanuvchi almashinuvi tafsilotlarini chiqarish"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Orqa fonda ishga tushirishga ruxsat berish"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Barcha harakatlarni orqa fonda ishga tushirishga ruxsat berish"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Buzilish oynasi doim ko‘rsatilsin"</string>
diff --git a/tests/CarDeveloperOptions/res/values-vi-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-vi-nokeys/strings.xml
new file mode 100644
index 0000000..4b76224
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-vi-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Quản lý ứng dụng"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-vi/arrays.xml b/tests/CarDeveloperOptions/res/values-vi/arrays.xml
new file mode 100644
index 0000000..a34ad55
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-vi/arrays.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"Châu Mỹ"</item>
+    <item msgid="4791956477275129121">"Châu Âu"</item>
+    <item msgid="3812126832016254559">"Châu Phi"</item>
+    <item msgid="2765816300353408280">"Châu Á"</item>
+    <item msgid="6683489385344409742">"Úc"</item>
+    <item msgid="5194868215515664953">"Thái Bình Dương"</item>
+    <item msgid="7044520255415007865">"Tất cả"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 giây"</item>
+    <item msgid="772029947136115322">"30 giây"</item>
+    <item msgid="8743663928349474087">"1 phút"</item>
+    <item msgid="1506508631223164814">"2 phút"</item>
+    <item msgid="8664703938127907662">"5 phút"</item>
+    <item msgid="5827960506924849753">"10 phút"</item>
+    <item msgid="6677424950124253938">"30 phút"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Không bao giờ"</item>
+    <item msgid="2517785806387977252">"15 giây"</item>
+    <item msgid="6347954399441173672">"30 giây"</item>
+    <item msgid="4858305253279921789">"1 phút"</item>
+    <item msgid="8109273437140044073">"2 phút"</item>
+    <item msgid="2788593551142462622">"5 phút"</item>
+    <item msgid="8012672183888404961">"10 phút"</item>
+    <item msgid="8271452751594598661">"30 phút"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Ngay lập tức"</item>
+    <item msgid="2038544972632026612">"5 giây"</item>
+    <item msgid="5558060663472279597">"15 giây"</item>
+    <item msgid="45341168505452037">"30 giây"</item>
+    <item msgid="227647485917789272">"1 phút"</item>
+    <item msgid="3367011891231217504">"2 phút"</item>
+    <item msgid="4376575879222393045">"5 phút"</item>
+    <item msgid="811192536981678974">"10 phút"</item>
+    <item msgid="7258394417241706272">"30 phút"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Nhỏ"</item>
+    <item msgid="591935967183159581">"Mặc định"</item>
+    <item msgid="1714184661981538355">"Lớn"</item>
+    <item msgid="6195563047686707484">"Lớn nhất"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Đang quét…"</item>
+    <item msgid="5597394826455877834">"Đang kết nối…"</item>
+    <item msgid="5848277343965362748">"Đang xác thực..."</item>
+    <item msgid="3391238031431440676">"Đang lấy địa chỉ IP…"</item>
+    <item msgid="5257597310494000224">"Đã kết nối"</item>
+    <item msgid="8472497592913050396">"Bị tạm ngưng"</item>
+    <item msgid="1228072488815999109">"Đang ngắt kết nối…"</item>
+    <item msgid="7253087004422991731">"Đã ngắt kết nối"</item>
+    <item msgid="4169850917304751227">"Không thành công"</item>
+    <item msgid="6266658166690831131">"Bị chặn"</item>
+    <item msgid="4517230805854909775">"Tạm thời tránh kết nối kém"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Đang quét…"</item>
+    <item msgid="8058143476674427024">"Đang kết nối tới <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="7547609081339573756">"Đang xác thực với <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="5145158315060185414">"Đang lấy địa chỉ IP từ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3283243151651124831">"Đã kết nối tới <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Bị tạm ngưng"</item>
+    <item msgid="4133290864821295785">"Đăng ngắt kết nối khỏi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Đã ngắt kết nối"</item>
+    <item msgid="2847316776634969068">"Không thành công"</item>
+    <item msgid="4390990424746035383">"Bị chặn"</item>
+    <item msgid="3618248791367063949">"Tạm thời tránh kết nối kém"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Nút bấm"</item>
+    <item msgid="7401896200768713930">"Mã PIN từ thiết bị ngang hàng"</item>
+    <item msgid="4526848028011846710">"Mã PIN từ th.bị này"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Đã kết nối"</item>
+    <item msgid="983792611851499732">"Đã mời"</item>
+    <item msgid="5438273405428201793">"Không thành công"</item>
+    <item msgid="4646663015449312554">"Có sẵn"</item>
+    <item msgid="3230556734162006146">"Ngoài vùng phủ sóng"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 phút"</item>
+    <item msgid="2759776603549270587">"5 phút"</item>
+    <item msgid="167772676068860015">"1 giờ"</item>
+    <item msgid="5985477119043628504">"Không bao giờ hết thời gian chờ"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sử dụng cài đặt mặc định của hệ thống: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Kém"</item>
+    <item msgid="7882129634982603782">"Kém"</item>
+    <item msgid="6457357501905996224">"Khá tốt"</item>
+    <item msgid="405271628162918841">"Tốt"</item>
+    <item msgid="999948812884919584">"Tuyệt vời"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"30 ngày qua"</item>
+    <item msgid="3211287705232736964">"Đặt chu kỳ sử dụng..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Thời gian sử dụng"</item>
+    <item msgid="2784401352592276015">"Sử dụng lần cuối"</item>
+    <item msgid="249854287216326349">"Tên ứng dụng"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"0 mạng"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Không có"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"0 mạng"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"Tĩnh"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"0 mạng"</item>
+    <item msgid="1464741437353223198">"Hướng dẫn sử dụng"</item>
+    <item msgid="5793600062487886090">"Tự động định cấu hình proxy"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"0 mạng"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP hoặc CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"Không xác định"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Không có"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Bộ nhớ trong của thiết bị"</item>
+    <item msgid="3186681694079967527">"Thẻ SD tháo lắp được"</item>
+    <item msgid="6902033473986647035">"Cho phép hệ thống quyết định"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Vị trí"</item>
+    <item msgid="6842381562497597649">"Cá nhân"</item>
+    <item msgid="3966700236695683444">"Nhắn tin"</item>
+    <item msgid="8563996233342430477">"Phương tiện"</item>
+    <item msgid="5323851085993963783">"Thiết bị"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"vị trí tổng thể"</item>
+    <item msgid="1830619568689922920">"vị trí chính xác"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"rung"</item>
+    <item msgid="8632513128515114092">"đọc danh sách liên hệ"</item>
+    <item msgid="3741042113569620272">"sửa đổi danh sách liên hệ"</item>
+    <item msgid="4204420969709009931">"đọc nhật ký cuộc gọi"</item>
+    <item msgid="2260380357119423209">"sửa đổi nhật ký cuộc gọi"</item>
+    <item msgid="6550710385014530934">"đọc lịch"</item>
+    <item msgid="3575906174264853951">"sửa đổi lịch"</item>
+    <item msgid="4319843242568057174">"quét wi-fi"</item>
+    <item msgid="2981791890467303819">"thông báo"</item>
+    <item msgid="6617825156152476692">"quét điện thoại di động"</item>
+    <item msgid="8865260890611559753">"gọi điện thoại"</item>
+    <item msgid="3254999273961542982">"đọc SMS"</item>
+    <item msgid="7711446453028825171">"soạn SMS"</item>
+    <item msgid="6123238544099198034">"nhận SMS"</item>
+    <item msgid="838342167431596036">"nhận SMS khẩn cấp"</item>
+    <item msgid="8554432731560956686">"nhận MMS"</item>
+    <item msgid="7464863464299515059">"nhận WAP push"</item>
+    <item msgid="310463075729606765">"gửi SMS"</item>
+    <item msgid="7338021933527689514">"đọc ICC SMS"</item>
+    <item msgid="6130369335466613036">"soạn ICC SMS"</item>
+    <item msgid="6536865581421670942">"sửa đổi cài đặt"</item>
+    <item msgid="4547203129183558973">"vẽ lên trên"</item>
+    <item msgid="9080347512916542840">"truy cập thông báo"</item>
+    <item msgid="5332718516635907742">"máy ảnh"</item>
+    <item msgid="6098422447246167852">"ghi âm"</item>
+    <item msgid="9182794235292595296">"phát âm thanh"</item>
+    <item msgid="8760743229597702019">"đọc khay nhớ tạm"</item>
+    <item msgid="2266923698240538544">"sửa đổi khay nhớ tạm"</item>
+    <item msgid="1801619438618539275">"các nút phương tiện truyền thông"</item>
+    <item msgid="31588119965784465">"tập trung âm thanh"</item>
+    <item msgid="7565226799008076833">"âm lượng chính"</item>
+    <item msgid="5420704980305018295">"âm lượng thoại"</item>
+    <item msgid="5797363115508970204">"âm lượng chuông"</item>
+    <item msgid="8233154098550715999">"âm lượng phương tiện"</item>
+    <item msgid="5196715605078153950">"âm lượng báo thức"</item>
+    <item msgid="394030698764284577">"âm lượng thông báo"</item>
+    <item msgid="8952898972491680178">"âm lượng bluetooth"</item>
+    <item msgid="8506227454543690851">"không khóa màn hình"</item>
+    <item msgid="1108160036049727420">"giám sát vị trí"</item>
+    <item msgid="1496205959751719491">"theo dõi vị trí dùng điện năng cao"</item>
+    <item msgid="3776296279910987380">"tải thống kế sử dụng"</item>
+    <item msgid="8827100324471975602">"tắt/bật micrô"</item>
+    <item msgid="6880736730520126864">"hiển thị thông báo nhanh"</item>
+    <item msgid="4933375960222609935">"chiếu phương tiện"</item>
+    <item msgid="8357907018938895462">"kích hoạt VPN"</item>
+    <item msgid="8143812849911310973">"hình nền ghi"</item>
+    <item msgid="6266277260961066535">"cấu trúc hỗ trợ"</item>
+    <item msgid="7715498149883482300">"ảnh chụp màn hình hỗ trợ"</item>
+    <item msgid="4046679376726313293">"đọc trạng thái điện thoại"</item>
+    <item msgid="6329507266039719587">"thêm thư thoại"</item>
+    <item msgid="7692440726415391408">"sử dụng SIP"</item>
+    <item msgid="8572453398128326267">"xử lý cuộc gọi đi"</item>
+    <item msgid="7775674394089376306">"vân tay"</item>
+    <item msgid="3182815133441738779">"cảm biến cơ thể"</item>
+    <item msgid="2793100005496829513">"đọc truyền phát trên di động"</item>
+    <item msgid="2633626056029384366">"vị trí mô phỏng"</item>
+    <item msgid="8356842191824684631">"bộ nhớ đọc"</item>
+    <item msgid="5671906070163291500">"bộ nhớ ghi"</item>
+    <item msgid="2791955098549340418">"bật màn hình"</item>
+    <item msgid="5599435119609178367">"nhận tài khoản"</item>
+    <item msgid="1165623660533024666">"chạy trong nền"</item>
+    <item msgid="6423861043647911030">"âm lượng hỗ trợ tiếp cận"</item>
+  </string-array>
+    <!-- no translation found for app_ops_labels:41 (2464189519136248621) -->
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Ngắn"</item>
+    <item msgid="4816511817309094890">"Trung bình"</item>
+    <item msgid="8305084671259331134">"Dài"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Mặc định"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif mật độ cao"</item>
+    <item msgid="6529379119163117545">"Giãn cách đơn Sans-serif"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Giãn cách đơn Serif"</item>
+    <item msgid="4448481989108928248">"Thông thường"</item>
+    <item msgid="4627069151979553527">"Chữ thảo"</item>
+    <item msgid="6896773537705206194">"Chữ viết hoa nhỏ"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Rất nhỏ"</item>
+    <item msgid="5091603983404027034">"Nhỏ"</item>
+    <item msgid="176844712416932112">"Bình thường"</item>
+    <item msgid="2784236342175159295">"Lớn"</item>
+    <item msgid="218913203203160606">"Rất lớn"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Mặc định"</item>
+    <item msgid="6488643537808152001">"0 mạng"</item>
+    <item msgid="552332815156010137">"Viền ngoài"</item>
+    <item msgid="7187891159463789272">"Bóng đổ"</item>
+    <item msgid="8019330250538856521">"Tăng"</item>
+    <item msgid="8987385315647049787">"Giảm"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Mặc định của ứng dụng"</item>
+    <item msgid="8611890312638868524">"Chữ trắng trên nền đen"</item>
+    <item msgid="5891360837786277638">"Chữ đen trên nền trắng"</item>
+    <item msgid="2798457065945456853">"Chữ vàng trên nền đen"</item>
+    <item msgid="5799049811524553967">"Chữ vàng trên nền xanh lam"</item>
+    <item msgid="3673930830658169860">"Tùy chỉnh"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN có khóa chia sẻ trước"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN có chứng chỉ"</item>
+    <item msgid="312397853907741968">"IPSec VPN có khóa được chia sẻ trước và xác thực Xauth"</item>
+    <item msgid="3319427315593649917">"IPSec VPN có chứng chỉ và xác thực Xauth"</item>
+    <item msgid="8258927774145391041">"IPSec VPN có chứng chỉ và xác thực kết hợp"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Không có gì"</item>
+    <item msgid="1157046369795346308">"Hướng dẫn sử dụng"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Đã ngắt kết nối"</item>
+    <item msgid="8754480102834556765">"Đang chạy..."</item>
+    <item msgid="3351334355574270250">"Đang kết nối…"</item>
+    <item msgid="8303882153995748352">"Đã kết nối"</item>
+    <item msgid="9135049670787351881">"Thời gian chờ"</item>
+    <item msgid="2124868417182583926">"Không thành công"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Hỏi"</item>
+    <item msgid="7718817231348607934">"Không bao giờ cho phép"</item>
+    <item msgid="8184570120217958741">"Luôn cho phép"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Liên tục"</item>
+    <item msgid="167418068739176448">"Hoạt động hàng đầu"</item>
+    <item msgid="4760813290195199773">"Quan trọng (nền trước)"</item>
+    <item msgid="2328684826817647595">"Quan trọng (nền sau)"</item>
+    <item msgid="7746406490652867365">"Sao lưu"</item>
+    <item msgid="5597404364389196754">"Hạng nặng"</item>
+    <item msgid="1290888779300174556">"Dịch vụ (đang chạy)"</item>
+    <item msgid="7241098542073939046">"Dịch vụ (đang khởi động lại)"</item>
+    <item msgid="6610439017684111046">"Người nhận"</item>
+    <item msgid="7367606086319921117">"Màn hình chính"</item>
+    <item msgid="3344660712396741826">"Hoạt động sau cùng"</item>
+    <item msgid="5006559348883303865">"Được lưu trong bộ nhớ đệm (hoạt động)"</item>
+    <item msgid="8633480732468137525">"Được lưu trong bộ nhớ đệm (máy khách hoạt động)"</item>
+    <item msgid="6248998242443333892">"Được lưu trong bộ nhớ đệm (trống)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Xanh két"</item>
+    <item msgid="3228505970082457852">"Lam"</item>
+    <item msgid="6590260735734795647">"Chàm"</item>
+    <item msgid="3521763377357218577">"Tía"</item>
+    <item msgid="5932337981182999919">"Hồng"</item>
+    <item msgid="5642914536624000094">"Đỏ"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Cách đây hơn 30 ngày"</item>
+    <item msgid="8699273238891265610">"Cách đây hơn 60 ngày"</item>
+    <item msgid="8346279419423837266">"Cách đây hơn 90 ngày"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Tự động phát hiện"</item>
+    <item msgid="773943026484148895">"Coi như có đo lượng dữ liệu"</item>
+    <item msgid="1008268820118852416">"Coi như không đo lượng dữ liệu"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Sử dụng MAC ngẫu nhiên (mặc định)"</item>
+    <item msgid="214234417308375326">"Sử dụng địa chỉ MAC của thiết bị"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Không"</item>
+    <item msgid="1930581185557754880">"Có"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Tối"</item>
+    <item msgid="5079453644557603349">"Sáng"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Đang tắt"</item>
+    <item msgid="4072198137051566919">"Gỡ lỗi"</item>
+    <item msgid="2473005316958868509">"Chi tiết"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Chỉ nhà riêng"</item>
+    <item msgid="1161026694891024702">"Tự động"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA được ưu tiên"</item>
+    <item msgid="7581481130337402578">"Chỉ GSM"</item>
+    <item msgid="8579197487913425819">"Chỉ WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA tự động"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo tự động"</item>
+    <item msgid="4219607161971472471">"CDMA không có EvDo"</item>
+    <item msgid="7278975240951052041">"Chỉ EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Toàn cầu"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"Chỉ TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Toàn cầu"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-vi/strings.xml b/tests/CarDeveloperOptions/res/values-vi/strings.xml
index 731fd69..7024a6f 100644
--- a/tests/CarDeveloperOptions/res/values-vi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-vi/strings.xml
@@ -355,8 +355,8 @@
     <string name="owner_info_settings_title" msgid="2537966178998339896">"Thông điệp trên màn hình khóa"</string>
     <string name="security_enable_widgets_title" msgid="1701510007926738088">"Bật tiện ích"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="4408176087132339331">"Bị quản trị viên vô hiệu hóa"</string>
-    <string name="lockdown_settings_title" msgid="4534779922580115990">"Tùy chọn hiển thị khóa"</string>
-    <string name="lockdown_settings_summary" msgid="7270756909878256174">"Tùy chọn hiển thị nút nguồn sẽ tắt tính năng Smart Lock, tính năng mở khóa bằng vân tay và thông báo trên màn hình khóa"</string>
+    <string name="lockdown_settings_title" msgid="4534779922580115990">"Hiện tùy chọn khóa"</string>
+    <string name="lockdown_settings_summary" msgid="7270756909878256174">"Hiển thị tùy chọn nút nguồn để tắt tính năng Smart Lock, mở khóa bằng vân tay, và thông báo trên màn hình khóa"</string>
     <string name="trust_agents_extend_unlock_title" msgid="3582017561316089951">"Tác nhân tin cậy chỉ kéo dài thời gian mở khóa"</string>
     <string name="trust_agents_extend_unlock_summary" msgid="3543997596586078084">"Nếu bạn bật, các tác nhân tin cậy sẽ kéo dài thời gian mở khóa, nhưng không thể mở khóa thiết bị bị khóa nữa."</string>
     <string name="trust_lost_locks_screen_title" msgid="3094736590690459372">"Khóa màn hình khi mất đi sự tin cậy"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Bảo vệ máy tính bảng của bạn bằng tùy chọn khóa màn hình để không ai có thể sử dụng được nếu máy tính bảng này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng xác thực khuôn mặt. Nhấn vào Hủy rồi đặt mã PIN hoặc chọn tùy chọn khóa màn hình khác."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Bảo vệ thiết bị của bạn bằng tùy chọn khóa màn hình để không ai có thể sử dụng được nếu thiết bị này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng xác thực khuôn mặt. Nhấn vào Hủy rồi đặt mã PIN hoặc chọn tùy chọn khóa màn hình khác."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Bảo vệ điện thoại của bạn bằng tùy chọn khóa màn hình để không ai có thể sử dụng được nếu điện thoại này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng xác thực khuôn mặt. Nhấn vào Hủy rồi đặt mã PIN hoặc chọn tùy chọn khóa màn hình khác."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Bỏ qua thiết lập mã PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Bỏ qua thiết lập mật khẩu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Bỏ qua thiết lập hình mở khóa?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Thiết lập phương thức khóa màn hình"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Di động"</item>
+    <item msgid="6007360612667098926">"Chỉ Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -2515,7 +2517,7 @@
     <string name="tts_reset" msgid="8864073594540705579">"Đặt lại"</string>
     <string name="tts_play" msgid="9023430029380675514">"Phát"</string>
     <string name="vpn_settings_title" msgid="7008219502396889192">"VPN"</string>
-    <string name="credentials_title" msgid="7119207354982673965">"Lưu thông tin xác thực"</string>
+    <string name="credentials_title" msgid="7119207354982673965">"Bộ nhớ chứa thông tin xác thực"</string>
     <string name="credentials_install" product="nosdcard" msgid="8509362500537206883">"Cài đặt từ bộ nhớ"</string>
     <string name="credentials_install" product="default" msgid="8997183776710118353">"Cài đặt từ thẻ SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="3426661965567059596">"Cài đặt chứng chỉ từ bộ nhớ"</string>
@@ -3181,7 +3183,7 @@
     <string name="zen_mode_automation_suggestion_summary" msgid="2709837472884371037">"Đặt quy tắc Không làm phiền"</string>
     <string name="zen_mode_schedule_title" msgid="5275268813192802631">"Lên lịch"</string>
     <string name="zen_mode_use_automatic_rule" msgid="446326253915861824">"Sử dụng lịch biểu"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="5173944276846940149">"Chỉ ưu tiên"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="5173944276846940149">"Chỉ cho các mục ưu tiên"</string>
     <string name="zen_mode_option_alarms" msgid="4843278125235203076">"Chỉ chuông báo"</string>
     <string name="zen_mode_option_no_interruptions" msgid="4723700274519260852">"Hoàn toàn tắt tiếng"</string>
     <string name="zen_mode_summary_combination" msgid="6960111215170691605">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3231,7 +3233,7 @@
     <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="5103454923160912313">"Chế độ Không làm phiền đã được một ứng dụng (<xliff:g id="APP_NAME">%s</xliff:g>) bật tự động"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6335108298640066560">"Chế độ Không làm phiền đang bật đối với <xliff:g id="RULE_NAMES">%s</xliff:g> với các mục cài đặt tùy chỉnh."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="4007974052885089379"><annotation id="link">" Xem mục cài đặt tùy chỉnh"</annotation></string>
-    <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Chỉ ưu tiên"</string>
+    <string name="zen_interruption_level_priority" msgid="9178419297408319234">"Chỉ cho các mục ưu tiên"</string>
     <string name="zen_mode_and_condition" msgid="4123722186007123567">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="2539952366467518398">"Đang bật / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_off_with_info" msgid="3910718455243440265">"Đang tắt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Tính năng này sẽ làm giảm tốc độ điện thoại"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Thực thi số đo GNSS đầy đủ"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Theo dõi tất cả chòm sao và tần suất GNSS mà không có chu kỳ làm việc"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Phân tích lượt chuyển đổi người dùng"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Hiển thị thông tin chi tiết trong khi chuyển đổi người dùng"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Cho phép các lượt bắt đầu hoạt động trong nền"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Cho phép tất cả các lượt bắt đầu hoạt động trong nền"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Luôn hiển thị hộp thoại sự cố"</string>
@@ -4398,8 +4402,8 @@
     <string name="mobile_network_list_add_more" msgid="65420172175416318">"Thêm"</string>
     <string name="mobile_network_active_sim" msgid="7660119090716084589">"Đang hoạt động/SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="8296195866147486039">"Không hoạt động/SIM"</string>
-    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Đang hoạt động/SIM đã tải xuống"</string>
-    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Không hoạt động/SIM đã tải xuống"</string>
+    <string name="mobile_network_active_esim" msgid="2919290915755581140">"Đang hoạt động/Đã tải SIM xuống"</string>
+    <string name="mobile_network_inactive_esim" msgid="6525747163540293028">"Không hoạt động/Đã tải SIM xuống"</string>
     <string name="mobile_network_sim_name" msgid="8228870017368926761">"Tên SIM"</string>
     <string name="mobile_network_sim_name_rename" msgid="4810736493612513152">"Đổi tên"</string>
     <string name="mobile_network_use_sim_on" msgid="1944823242539751387">"Dùng SIM"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rCN-nokeys/strings.xml
new file mode 100644
index 0000000..633153c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"管理应用"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml b/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..c6c525e
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"美洲"</item>
+    <item msgid="4791956477275129121">"欧洲"</item>
+    <item msgid="3812126832016254559">"非洲"</item>
+    <item msgid="2765816300353408280">"亚洲"</item>
+    <item msgid="6683489385344409742">"澳大利亚"</item>
+    <item msgid="5194868215515664953">"太平洋"</item>
+    <item msgid="7044520255415007865">"全部"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15秒"</item>
+    <item msgid="772029947136115322">"30 秒"</item>
+    <item msgid="8743663928349474087">"1 分钟"</item>
+    <item msgid="1506508631223164814">"2 分钟"</item>
+    <item msgid="8664703938127907662">"5 分钟"</item>
+    <item msgid="5827960506924849753">"10分钟"</item>
+    <item msgid="6677424950124253938">"30 分钟"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"一律不"</item>
+    <item msgid="2517785806387977252">"15 秒"</item>
+    <item msgid="6347954399441173672">"30 秒"</item>
+    <item msgid="4858305253279921789">"1 分钟"</item>
+    <item msgid="8109273437140044073">"2 分钟"</item>
+    <item msgid="2788593551142462622">"5 分钟"</item>
+    <item msgid="8012672183888404961">"10 分钟"</item>
+    <item msgid="8271452751594598661">"30 分钟"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"立即"</item>
+    <item msgid="2038544972632026612">"5秒"</item>
+    <item msgid="5558060663472279597">"15 秒"</item>
+    <item msgid="45341168505452037">"30 秒"</item>
+    <item msgid="227647485917789272">"1 分钟"</item>
+    <item msgid="3367011891231217504">"2 分钟"</item>
+    <item msgid="4376575879222393045">"5 分钟"</item>
+    <item msgid="811192536981678974">"10 分钟"</item>
+    <item msgid="7258394417241706272">"30 分钟"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"小"</item>
+    <item msgid="591935967183159581">"默认"</item>
+    <item msgid="1714184661981538355">"大"</item>
+    <item msgid="6195563047686707484">"最大"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"正在扫描..."</item>
+    <item msgid="5597394826455877834">"正在连接..."</item>
+    <item msgid="5848277343965362748">"正在进行身份验证..."</item>
+    <item msgid="3391238031431440676">"正在获取IP地址..."</item>
+    <item msgid="5257597310494000224">"已连接"</item>
+    <item msgid="8472497592913050396">"已暂停"</item>
+    <item msgid="1228072488815999109">"正在断开连接..."</item>
+    <item msgid="7253087004422991731">"已断开连接"</item>
+    <item msgid="4169850917304751227">"失败"</item>
+    <item msgid="6266658166690831131">"屏蔽"</item>
+    <item msgid="4517230805854909775">"暂时关闭（网络状况不佳）"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"正在扫描..."</item>
+    <item msgid="8058143476674427024">"正在连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"正在通过 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 进行身份验证..."</item>
+    <item msgid="5145158315060185414">"正在从 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 获取 IP 地址..."</item>
+    <item msgid="3283243151651124831">"已连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"已暂停"</item>
+    <item msgid="4133290864821295785">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
+    <item msgid="3980154971187953257">"已断开连接"</item>
+    <item msgid="2847316776634969068">"失败"</item>
+    <item msgid="4390990424746035383">"屏蔽"</item>
+    <item msgid="3618248791367063949">"暂时关闭（网络状况不佳）"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"按钮"</item>
+    <item msgid="7401896200768713930">"从对等设备获取的 PIN 码"</item>
+    <item msgid="4526848028011846710">"此设备生成的 PIN 码"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"已连接"</item>
+    <item msgid="983792611851499732">"已邀请"</item>
+    <item msgid="5438273405428201793">"失败"</item>
+    <item msgid="4646663015449312554">"可用"</item>
+    <item msgid="3230556734162006146">"超出范围"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 分钟"</item>
+    <item msgid="2759776603549270587">"5分钟"</item>
+    <item msgid="167772676068860015">"1 小时"</item>
+    <item msgid="5985477119043628504">"永不超时"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"使用系统默认值：<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"微弱"</item>
+    <item msgid="7882129634982603782">"弱"</item>
+    <item msgid="6457357501905996224">"一般"</item>
+    <item msgid="405271628162918841">"良好"</item>
+    <item msgid="999948812884919584">"很强"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"过去30天"</item>
+    <item msgid="3211287705232736964">"设置流量周期…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"使用时间"</item>
+    <item msgid="2784401352592276015">"上次使用时间"</item>
+    <item msgid="249854287216326349">"应用名称"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"无"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"无"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"无"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"静态"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"无"</item>
+    <item msgid="1464741437353223198">"手册"</item>
+    <item msgid="5793600062487886090">"代理自动配置"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"无"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP 或 CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"未指定"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"无"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"内部存储设备"</item>
+    <item msgid="3186681694079967527">"可卸载的SD卡"</item>
+    <item msgid="6902033473986647035">"由系统确定"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"位置信息"</item>
+    <item msgid="6842381562497597649">"个人"</item>
+    <item msgid="3966700236695683444">"短信"</item>
+    <item msgid="8563996233342430477">"媒体"</item>
+    <item msgid="5323851085993963783">"设备"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"粗略位置"</item>
+    <item msgid="1830619568689922920">"精确位置"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"振动"</item>
+    <item msgid="8632513128515114092">"读取联系人"</item>
+    <item msgid="3741042113569620272">"修改联系人"</item>
+    <item msgid="4204420969709009931">"读取通话记录"</item>
+    <item msgid="2260380357119423209">"修改通话记录"</item>
+    <item msgid="6550710385014530934">"读取日历"</item>
+    <item msgid="3575906174264853951">"修改日历"</item>
+    <item msgid="4319843242568057174">"WLAN扫描"</item>
+    <item msgid="2981791890467303819">"通知"</item>
+    <item msgid="6617825156152476692">"手机网络扫描"</item>
+    <item msgid="8865260890611559753">"拨打电话"</item>
+    <item msgid="3254999273961542982">"读取短信"</item>
+    <item msgid="7711446453028825171">"编写短信"</item>
+    <item msgid="6123238544099198034">"接收短信"</item>
+    <item msgid="838342167431596036">"接收紧急短信"</item>
+    <item msgid="8554432731560956686">"接收彩信"</item>
+    <item msgid="7464863464299515059">"接收 WAP PUSH 消息"</item>
+    <item msgid="310463075729606765">"发送短信"</item>
+    <item msgid="7338021933527689514">"读取 ICC 短信"</item>
+    <item msgid="6130369335466613036">"写入 ICC 短信"</item>
+    <item msgid="6536865581421670942">"修改设置"</item>
+    <item msgid="4547203129183558973">"在最上层显示内容"</item>
+    <item msgid="9080347512916542840">"访问通知"</item>
+    <item msgid="5332718516635907742">"相机"</item>
+    <item msgid="6098422447246167852">"录制音频"</item>
+    <item msgid="9182794235292595296">"播放音频"</item>
+    <item msgid="8760743229597702019">"读取剪贴板内容"</item>
+    <item msgid="2266923698240538544">"修改剪贴板内容"</item>
+    <item msgid="1801619438618539275">"媒体按钮"</item>
+    <item msgid="31588119965784465">"音频焦点"</item>
+    <item msgid="7565226799008076833">"主音量"</item>
+    <item msgid="5420704980305018295">"语音音量"</item>
+    <item msgid="5797363115508970204">"铃声音量"</item>
+    <item msgid="8233154098550715999">"媒体音量"</item>
+    <item msgid="5196715605078153950">"闹钟音量"</item>
+    <item msgid="394030698764284577">"通知音量"</item>
+    <item msgid="8952898972491680178">"蓝牙音量"</item>
+    <item msgid="8506227454543690851">"保持唤醒状态"</item>
+    <item msgid="1108160036049727420">"监测位置"</item>
+    <item msgid="1496205959751719491">"监控高电耗位置信息服务"</item>
+    <item msgid="3776296279910987380">"获取使用情况统计信息"</item>
+    <item msgid="8827100324471975602">"将麦克风静音或取消静音"</item>
+    <item msgid="6880736730520126864">"显示问候语"</item>
+    <item msgid="4933375960222609935">"投影媒体"</item>
+    <item msgid="8357907018938895462">"激活 VPN"</item>
+    <item msgid="8143812849911310973">"写入壁纸"</item>
+    <item msgid="6266277260961066535">"辅助结构"</item>
+    <item msgid="7715498149883482300">"辅助屏幕截图"</item>
+    <item msgid="4046679376726313293">"读取手机状态"</item>
+    <item msgid="6329507266039719587">"添加语音邮件"</item>
+    <item msgid="7692440726415391408">"使用 SIP"</item>
+    <item msgid="8572453398128326267">"处理拨出电话"</item>
+    <item msgid="7775674394089376306">"指纹"</item>
+    <item msgid="3182815133441738779">"身体传感器"</item>
+    <item msgid="2793100005496829513">"读取小区广播"</item>
+    <item msgid="2633626056029384366">"模拟位置"</item>
+    <item msgid="8356842191824684631">"读取存储空间"</item>
+    <item msgid="5671906070163291500">"写入存储空间"</item>
+    <item msgid="2791955098549340418">"开启屏幕"</item>
+    <item msgid="5599435119609178367">"获取帐号"</item>
+    <item msgid="1165623660533024666">"在后台运行"</item>
+    <item msgid="6423861043647911030">"无障碍功能音量"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"位置信息"</item>
+    <item msgid="6656077694190491067">"位置信息"</item>
+    <item msgid="8790228218278477369">"位置信息"</item>
+    <item msgid="7836406246005211990">"振动"</item>
+    <item msgid="3951439024549922598">"读取联系人"</item>
+    <item msgid="8802152411647068">"修改联系人"</item>
+    <item msgid="229544934599698735">"读取通话记录"</item>
+    <item msgid="7396102294405899613">"修改通话记录"</item>
+    <item msgid="3597797992398484655">"读取日历"</item>
+    <item msgid="2705975774250907343">"修改日历"</item>
+    <item msgid="4668747371441932697">"位置信息"</item>
+    <item msgid="1487578921720243646">"发布通知"</item>
+    <item msgid="4636080349724146638">"位置"</item>
+    <item msgid="673510900286463926">"拨打电话"</item>
+    <item msgid="542083422784609790">"读取短信/彩信"</item>
+    <item msgid="1033780373029588436">"编写短信/彩信"</item>
+    <item msgid="5647111115517787488">"接收短信/彩信"</item>
+    <item msgid="8591105601108455893">"接收短信/彩信"</item>
+    <item msgid="7730995008517841903">"接收短信/彩信"</item>
+    <item msgid="2613033109026626086">"接收短信/彩信"</item>
+    <item msgid="3037159047591081136">"发送短信/彩信"</item>
+    <item msgid="4726682243833913568">"读取短信/彩信"</item>
+    <item msgid="6555678522277865572">"编写短信/彩信"</item>
+    <item msgid="6981734935578130884">"修改设置"</item>
+    <item msgid="8705854389991425629">"在最上层显示内容"</item>
+    <item msgid="5861356020344153651">"访问通知"</item>
+    <item msgid="78432174621628659">"相机"</item>
+    <item msgid="3986116419882154794">"录制音频"</item>
+    <item msgid="4516840825756409490">"播放音频"</item>
+    <item msgid="6811712502798183957">"读取剪贴板内容"</item>
+    <item msgid="2780369012602289114">"修改剪贴板内容"</item>
+    <item msgid="2331359440170850868">"媒体按钮"</item>
+    <item msgid="6133599737122751231">"音频焦点"</item>
+    <item msgid="6844485713404805301">"主音量"</item>
+    <item msgid="1600379420669104929">"语音音量"</item>
+    <item msgid="6296768210470214866">"铃声音量"</item>
+    <item msgid="510690696071629241">"媒体音量"</item>
+    <item msgid="406861638631430109">"闹钟音量"</item>
+    <item msgid="4715864795872233884">"通知音量"</item>
+    <item msgid="2311478519251301183">"蓝牙音量"</item>
+    <item msgid="5133991377896747027">"保持唤醒状态"</item>
+    <item msgid="2464189519136248621">"位置"</item>
+    <item msgid="2062677934050803037">"位置"</item>
+    <item msgid="1735171933192715957">"获取使用情况统计信息"</item>
+    <item msgid="1014093788778383554">"将麦克风静音或取消静音"</item>
+    <item msgid="4199297950608622850">"显示问候语"</item>
+    <item msgid="2527962435313398821">"投影媒体"</item>
+    <item msgid="5117506254221861929">"激活 VPN"</item>
+    <item msgid="8291198322681891160">"写入壁纸"</item>
+    <item msgid="7106921284621230961">"辅助结构"</item>
+    <item msgid="4496533640894624799">"辅助屏幕截图"</item>
+    <item msgid="2598847264853993611">"读取手机状态"</item>
+    <item msgid="9215610846802973353">"添加语音邮件"</item>
+    <item msgid="9186411956086478261">"使用 SIP"</item>
+    <item msgid="6884763100104539558">"处理拨出电话"</item>
+    <item msgid="125513972170580692">"指纹"</item>
+    <item msgid="2556071024281275619">"身体传感器"</item>
+    <item msgid="617168514928339387">"读取小区广播"</item>
+    <item msgid="7134693570516523585">"模拟位置"</item>
+    <item msgid="7224489175375229399">"读取存储空间"</item>
+    <item msgid="8472735063903258202">"写入存储空间"</item>
+    <item msgid="4069276819909595110">"开启屏幕"</item>
+    <item msgid="1228338896751121025">"获取帐号"</item>
+    <item msgid="3181581793459233672">"在后台运行"</item>
+    <item msgid="2340936043025374076">"无障碍功能音量"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"短"</item>
+    <item msgid="4816511817309094890">"中"</item>
+    <item msgid="8305084671259331134">"长"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"默认"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif monospace"</item>
+    <item msgid="4448481989108928248">"Casual"</item>
+    <item msgid="4627069151979553527">"Cursive"</item>
+    <item msgid="6896773537705206194">"Small capitals"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"超小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"正常"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"超大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"默认"</item>
+    <item msgid="6488643537808152001">"无"</item>
+    <item msgid="552332815156010137">"轮廓"</item>
+    <item msgid="7187891159463789272">"阴影"</item>
+    <item msgid="8019330250538856521">"凸起"</item>
+    <item msgid="8987385315647049787">"凹陷"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"使用应用默认样式"</item>
+    <item msgid="8611890312638868524">"黑底白字"</item>
+    <item msgid="5891360837786277638">"白底黑字"</item>
+    <item msgid="2798457065945456853">"黑底黄字"</item>
+    <item msgid="5799049811524553967">"蓝底黄字"</item>
+    <item msgid="3673930830658169860">"自定义"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"具有预共享密钥的 L2TP/IPSec VPN"</item>
+    <item msgid="6128519070545038358">"具有证书的 L2TP/IPSec VPN"</item>
+    <item msgid="312397853907741968">"具有预共享密钥且进行 Xauth 身份验证的 IPSec VPN"</item>
+    <item msgid="3319427315593649917">"具有证书且进行 Xauth 身份验证的 IPSec VPN"</item>
+    <item msgid="8258927774145391041">"具有证书且进行混合身份验证的 IPSec VPN"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"无"</item>
+    <item msgid="1157046369795346308">"手册"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"已断开连接"</item>
+    <item msgid="8754480102834556765">"正在初始化..."</item>
+    <item msgid="3351334355574270250">"正在连接..."</item>
+    <item msgid="8303882153995748352">"已连接"</item>
+    <item msgid="9135049670787351881">"超时"</item>
+    <item msgid="2124868417182583926">"失败"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"询问"</item>
+    <item msgid="7718817231348607934">"永不允许"</item>
+    <item msgid="8184570120217958741">"始终允许"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"常驻"</item>
+    <item msgid="167418068739176448">"顶层 Activity"</item>
+    <item msgid="4760813290195199773">"重要（前台）"</item>
+    <item msgid="2328684826817647595">"重要（后台）"</item>
+    <item msgid="7746406490652867365">"备份"</item>
+    <item msgid="5597404364389196754">"重量级"</item>
+    <item msgid="1290888779300174556">"服务（运行中）"</item>
+    <item msgid="7241098542073939046">"服务（重新启动中）"</item>
+    <item msgid="6610439017684111046">"接收器"</item>
+    <item msgid="7367606086319921117">"主屏幕"</item>
+    <item msgid="3344660712396741826">"前一个 Activity"</item>
+    <item msgid="5006559348883303865">"已缓存 (Activity)"</item>
+    <item msgid="8633480732468137525">"已缓存（Activity 客户端）"</item>
+    <item msgid="6248998242443333892">"已缓存（空）"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"青色"</item>
+    <item msgid="3228505970082457852">"蓝色"</item>
+    <item msgid="6590260735734795647">"靛青色"</item>
+    <item msgid="3521763377357218577">"紫色"</item>
+    <item msgid="5932337981182999919">"粉红色"</item>
+    <item msgid="5642914536624000094">"红色"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"超过 30 天"</item>
+    <item msgid="8699273238891265610">"超过 60 天"</item>
+    <item msgid="8346279419423837266">"超过 90 天"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"自动检测"</item>
+    <item msgid="773943026484148895">"视为按流量计费"</item>
+    <item msgid="1008268820118852416">"视为不按流量计费"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"使用随机 MAC（默认）"</item>
+    <item msgid="214234417308375326">"使用设备 MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"否"</item>
+    <item msgid="1930581185557754880">"是"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"深色"</item>
+    <item msgid="5079453644557603349">"浅色"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"关闭"</item>
+    <item msgid="4072198137051566919">"调试"</item>
+    <item msgid="2473005316958868509">"详细"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"仅本地系统"</item>
+    <item msgid="1161026694891024702">"自动"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"首选 GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"仅限 GSM"</item>
+    <item msgid="8579197487913425819">"仅限 WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA 自动选择"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo 自动选择"</item>
+    <item msgid="4219607161971472471">"CDMA，无 EvDo 功能"</item>
+    <item msgid="7278975240951052041">"仅限 EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"通用"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"仅限 TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"通用"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
index 7f0fbd3..a2c5369 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"请使用屏幕锁定选项来保护您的平板电脑，这样一来，即使平板电脑丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定选项，才能设置人脸身份验证。点按“取消”，然后设置 PIN 码或选择其他屏幕锁定选项。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"请使用屏幕锁定选项来保护您的设备，这样一来，即使设备丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定选项，才能设置人脸身份验证。点按“取消”，然后设置 PIN 码或选择其他屏幕锁定选项。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"请使用屏幕锁定选项来保护您的手机，这样一来，即使手机丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定选项，才能设置人脸身份验证。点按“取消”，然后设置 PIN 码或选择其他屏幕锁定选项。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"要跳过 PIN 码设置吗？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"要跳过密码设置吗？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"要跳过图案设置吗？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"设置屏幕锁定"</string>
@@ -845,7 +844,7 @@
     <string name="wifi_error" msgid="5605801874484465557">"出错"</string>
     <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"在此国家/地区无法使用 5 GHz 频段"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"正处于飞行模式下"</string>
-    <string name="wifi_notify_open_networks" msgid="4782239203624619655">"打开网络通知"</string>
+    <string name="wifi_notify_open_networks" msgid="4782239203624619655">"开放网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"有可用的高品质公共网络时通知我"</string>
     <string name="wifi_wakeup" msgid="4963732992164721548">"自动开启 WLAN"</string>
     <string name="wifi_wakeup_summary" msgid="1152699417411690">"位于已保存的高品质网络（例如您的家庭网络）附近时自动重新开启 WLAN"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"WLAN"</item>
+    <item msgid="4421333712484542489">"移动数据"</item>
+    <item msgid="6007360612667098926">"仅限 WLAN"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1223,8 +1225,8 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"将在日出时自动关闭"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"立即开启"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"立即关闭"</string>
-    <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"保持开启状态，直到日出"</string>
-    <string name="night_display_activation_off_twilight" msgid="6846727701281556110">"保持关闭状态，直到日落"</string>
+    <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"开启，直到日出"</string>
+    <string name="night_display_activation_off_twilight" msgid="6846727701281556110">"关闭，直到日落"</string>
     <string name="night_display_activation_on_custom" msgid="4761140206778957611">"保持开启状态，直到<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_activation_off_custom" msgid="4207238846687792731">"保持关闭状态，直到<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_not_currently_on" msgid="1436588493764429281">"目前未开启护眼模式"</string>
@@ -1353,7 +1355,7 @@
     <string name="status_wifi_mac_address" msgid="3868452167971295995">"WLAN MAC 地址"</string>
     <string name="status_bt_address" msgid="460568179311735657">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="8257722124627415159">"序列号"</string>
-    <string name="status_up_time" msgid="77128395333934087">"已开机时间"</string>
+    <string name="status_up_time" msgid="77128395333934087">"开机累计时长"</string>
     <string name="status_awake_time" msgid="1251959094010776954">"唤醒时间"</string>
     <string name="internal_memory" msgid="8632841998435408869">"内部存储空间"</string>
     <string name="sd_memory" product="nosdcard" msgid="1377713983817298275">"USB存储设备"</string>
@@ -2078,7 +2080,7 @@
     <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"操作执行时长"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"请选择您需要阅读的消息的显示时间（只会暂时显示）。\n\n只有部分应用支持这项设置。"</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"请选择提示您执行操作的消息的显示时间（只会暂时显示）。\n\n部分应用可能不支持这项设置。"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"触摸和按住延迟"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"轻触并按住的延迟时间"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="3852635518618938998">"颜色反转"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="69291255322175323">"可能会影响性能"</string>
     <string name="accessibility_autoclick_preference_title" msgid="9164599088410340405">"停留时间"</string>
@@ -3096,9 +3098,9 @@
     <string name="keywords_sim_status" msgid="3852088576719874387">"网络, 移动网络状态, 服务状态, 信号强度, 移动网络类型, 漫游, ICCID"</string>
     <string name="keywords_model_and_hardware" msgid="2743197096210895251">"序列号, 硬件版本"</string>
     <string name="keywords_android_version" msgid="4842749998088987740">"Android 安全补丁程序级别, 基带版本, 内核版本"</string>
-    <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"主题背景, 浅色, 夜间, 模式"</string>
+    <string name="keywords_dark_ui_mode" msgid="1027966176887770318">"主题背景, 光亮, 深色, 模式"</string>
     <string name="keywords_financial_apps_sms_access" msgid="3236014691838121857">"财经应用，短信，权限"</string>
-    <string name="keywords_systemui_theme" msgid="9150908170417305866">"深色主题背景"</string>
+    <string name="keywords_systemui_theme" msgid="9150908170417305866">"深色主题"</string>
     <string name="keywords_device_feedback" msgid="6948977907405738490">"错误"</string>
     <string name="keywords_ambient_display_screen" msgid="5873935693887583428">"主动显示, 锁定屏幕显示"</string>
     <string name="keywords_lock_screen_notif" msgid="4914337222856805463">"锁定屏幕通知, 通知"</string>
@@ -4070,7 +4072,7 @@
     <string name="dark_ui_mode" msgid="703844190192599217">"主题背景"</string>
     <string name="dark_ui_mode_title" msgid="8774932716427742413">"选择主题背景"</string>
     <string name="dark_ui_settings_light_summary" msgid="5219102347744462812">"此设置也适用于应用"</string>
-    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"受支持的应用还会切换到深色主题背景"</string>
+    <string name="dark_ui_settings_dark_summary" msgid="7042737828943784289">"受支持的应用还会切换到深色主题"</string>
     <string name="quick_settings_developer_tiles" msgid="7423485925757678719">"快捷设置开发者图块"</string>
     <string name="winscope_trace_quick_settings_title" msgid="940971040388411374">"Winscope 跟踪"</string>
     <string name="sensors_off_quick_settings_title" msgid="3655699045300438902">"传感器已关闭"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"它会降低这部手机的速度"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"强制启用 GNSS 测量结果全面跟踪"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"在停用工作周期的情况下跟踪所有 GNSS 星座和频率"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"在切换用户时显示更多信息"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"在切换用户时显示详细信息"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"允许系统执行后台活动"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"允许系统执行所有后台活动"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"一律显示崩溃对话框"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rHK-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rHK-nokeys/strings.xml
new file mode 100644
index 0000000..10ea868
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"管理應用程式"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml b/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml
new file mode 100644
index 0000000..b91281c
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"美洲"</item>
+    <item msgid="4791956477275129121">"歐洲"</item>
+    <item msgid="3812126832016254559">"非洲"</item>
+    <item msgid="2765816300353408280">"亞洲"</item>
+    <item msgid="6683489385344409742">"澳洲"</item>
+    <item msgid="5194868215515664953">"太平洋"</item>
+    <item msgid="7044520255415007865">"全部"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 秒"</item>
+    <item msgid="772029947136115322">"30 秒"</item>
+    <item msgid="8743663928349474087">"1 分鐘"</item>
+    <item msgid="1506508631223164814">"2 分鐘"</item>
+    <item msgid="8664703938127907662">"5 分鐘"</item>
+    <item msgid="5827960506924849753">"10 分鐘"</item>
+    <item msgid="6677424950124253938">"30 分鐘"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"永不"</item>
+    <item msgid="2517785806387977252">"15 秒"</item>
+    <item msgid="6347954399441173672">"30 秒"</item>
+    <item msgid="4858305253279921789">"1 分鐘"</item>
+    <item msgid="8109273437140044073">"2 分鐘"</item>
+    <item msgid="2788593551142462622">"5 分鐘"</item>
+    <item msgid="8012672183888404961">"10 分鐘"</item>
+    <item msgid="8271452751594598661">"30 分鐘"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"立即"</item>
+    <item msgid="2038544972632026612">"5 秒"</item>
+    <item msgid="5558060663472279597">"15 秒"</item>
+    <item msgid="45341168505452037">"30 秒"</item>
+    <item msgid="227647485917789272">"1 分鐘"</item>
+    <item msgid="3367011891231217504">"2 分鐘"</item>
+    <item msgid="4376575879222393045">"5 分鐘"</item>
+    <item msgid="811192536981678974">"10 分鐘"</item>
+    <item msgid="7258394417241706272">"30 分鐘"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"小"</item>
+    <item msgid="591935967183159581">"預設"</item>
+    <item msgid="1714184661981538355">"大"</item>
+    <item msgid="6195563047686707484">"最大"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"掃瞄中…"</item>
+    <item msgid="5597394826455877834">"正在連線..."</item>
+    <item msgid="5848277343965362748">"正在驗證..."</item>
+    <item msgid="3391238031431440676">"正在取得 IP 位址…"</item>
+    <item msgid="5257597310494000224">"已連接"</item>
+    <item msgid="8472497592913050396">"已暫停"</item>
+    <item msgid="1228072488815999109">"正在中斷連線..."</item>
+    <item msgid="7253087004422991731">"已中斷連線"</item>
+    <item msgid="4169850917304751227">"不成功"</item>
+    <item msgid="6266658166690831131">"已封鎖"</item>
+    <item msgid="4517230805854909775">"目前正暫時避開欠佳的連線"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"正在掃瞄…"</item>
+    <item msgid="8058143476674427024">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權..."</item>
+    <item msgid="5145158315060185414">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址..."</item>
+    <item msgid="3283243151651124831">"已連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"已暫停"</item>
+    <item msgid="4133290864821295785">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線…"</item>
+    <item msgid="3980154971187953257">"已中斷連線"</item>
+    <item msgid="2847316776634969068">"不成功"</item>
+    <item msgid="4390990424746035383">"已封鎖"</item>
+    <item msgid="3618248791367063949">"目前正暫時避開欠佳的連線"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"按鍵"</item>
+    <item msgid="7401896200768713930">"來自對端裝置的 PIN"</item>
+    <item msgid="4526848028011846710">"從這部裝置產生的 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"已連接"</item>
+    <item msgid="983792611851499732">"已邀請"</item>
+    <item msgid="5438273405428201793">"不成功"</item>
+    <item msgid="4646663015449312554">"可用"</item>
+    <item msgid="3230556734162006146">"超出範圍"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 分鐘"</item>
+    <item msgid="2759776603549270587">"5 分鐘"</item>
+    <item msgid="167772676068860015">"1 小時"</item>
+    <item msgid="5985477119043628504">"永不逾時"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"使用系統預設值：<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"弱"</item>
+    <item msgid="7882129634982603782">"差"</item>
+    <item msgid="6457357501905996224">"一般"</item>
+    <item msgid="405271628162918841">"強"</item>
+    <item msgid="999948812884919584">"極好"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"最近 30 天"</item>
+    <item msgid="3211287705232736964">"設定用量週期…"</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"使用時間"</item>
+    <item msgid="2784401352592276015">"上次使用時間"</item>
+    <item msgid="249854287216326349">"應用程式名稱"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"無"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"無"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"無"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"靜態"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"無"</item>
+    <item msgid="1464741437353223198">"手動"</item>
+    <item msgid="5793600062487886090">"Proxy 自動設定"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"無"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP 或 CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"未指定"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"無"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"內部裝置儲存空間"</item>
+    <item msgid="3186681694079967527">"卸除式 SD 卡"</item>
+    <item msgid="6902033473986647035">"讓系統決定"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"位置"</item>
+    <item msgid="6842381562497597649">"個人"</item>
+    <item msgid="3966700236695683444">"短訊"</item>
+    <item msgid="8563996233342430477">"媒體"</item>
+    <item msgid="5323851085993963783">"裝置"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"約略位置"</item>
+    <item msgid="1830619568689922920">"精確位置"</item>
+    <item msgid="3317274469481923141">"全球衛星定位系統 (GPS)"</item>
+    <item msgid="8931785990160383356">"震動"</item>
+    <item msgid="8632513128515114092">"讀取通訊錄"</item>
+    <item msgid="3741042113569620272">"修改通訊錄"</item>
+    <item msgid="4204420969709009931">"讀取通話記錄"</item>
+    <item msgid="2260380357119423209">"修改通話記錄"</item>
+    <item msgid="6550710385014530934">"讀取日曆"</item>
+    <item msgid="3575906174264853951">"修改日曆"</item>
+    <item msgid="4319843242568057174">"Wi-Fi 掃瞄"</item>
+    <item msgid="2981791890467303819">"通知"</item>
+    <item msgid="6617825156152476692">"手機掃瞄"</item>
+    <item msgid="8865260890611559753">"撥打電話"</item>
+    <item msgid="3254999273961542982">"讀取 SMS"</item>
+    <item msgid="7711446453028825171">"寫入 SMS"</item>
+    <item msgid="6123238544099198034">"接收 SMS"</item>
+    <item msgid="838342167431596036">"接收緊急 SMS"</item>
+    <item msgid="8554432731560956686">"接收 MMS"</item>
+    <item msgid="7464863464299515059">"接收 WAP PUSH 短訊"</item>
+    <item msgid="310463075729606765">"傳送 SMS"</item>
+    <item msgid="7338021933527689514">"讀取 ICC SMS"</item>
+    <item msgid="6130369335466613036">"寫入 ICC SMS"</item>
+    <item msgid="6536865581421670942">"修改設定"</item>
+    <item msgid="4547203129183558973">"在上面繪圖"</item>
+    <item msgid="9080347512916542840">"存取通知"</item>
+    <item msgid="5332718516635907742">"相機"</item>
+    <item msgid="6098422447246167852">"錄製音效"</item>
+    <item msgid="9182794235292595296">"播放音效"</item>
+    <item msgid="8760743229597702019">"讀取剪貼簿"</item>
+    <item msgid="2266923698240538544">"修改剪貼簿"</item>
+    <item msgid="1801619438618539275">"媒體按鈕"</item>
+    <item msgid="31588119965784465">"音頻焦點"</item>
+    <item msgid="7565226799008076833">"主音量"</item>
+    <item msgid="5420704980305018295">"語音音量"</item>
+    <item msgid="5797363115508970204">"鈴聲音量"</item>
+    <item msgid="8233154098550715999">"媒體音量"</item>
+    <item msgid="5196715605078153950">"鬧鐘音量"</item>
+    <item msgid="394030698764284577">"通知音量"</item>
+    <item msgid="8952898972491680178">"藍牙音量"</item>
+    <item msgid="8506227454543690851">"保持啟用"</item>
+    <item msgid="1108160036049727420">"監測位置"</item>
+    <item msgid="1496205959751719491">"監控高耗電量定位功能"</item>
+    <item msgid="3776296279910987380">"取得使用統計資料"</item>
+    <item msgid="8827100324471975602">"關閉/開啟麥克風"</item>
+    <item msgid="6880736730520126864">"顯示 Toast"</item>
+    <item msgid="4933375960222609935">"投影媒體"</item>
+    <item msgid="8357907018938895462">"啟用 VPN"</item>
+    <item msgid="8143812849911310973">"撰寫桌布"</item>
+    <item msgid="6266277260961066535">"輔助結構"</item>
+    <item msgid="7715498149883482300">"輔助螢幕擷取畫面"</item>
+    <item msgid="4046679376726313293">"讀取手機狀態"</item>
+    <item msgid="6329507266039719587">"新增留言"</item>
+    <item msgid="7692440726415391408">"使用 SIP"</item>
+    <item msgid="8572453398128326267">"處理撥出的通話"</item>
+    <item msgid="7775674394089376306">"指紋"</item>
+    <item msgid="3182815133441738779">"人體感應器"</item>
+    <item msgid="2793100005496829513">"讀取區域廣播"</item>
+    <item msgid="2633626056029384366">"模擬位置"</item>
+    <item msgid="8356842191824684631">"讀取儲存空間"</item>
+    <item msgid="5671906070163291500">"寫入儲存空間"</item>
+    <item msgid="2791955098549340418">"開啟螢幕"</item>
+    <item msgid="5599435119609178367">"取得帳戶"</item>
+    <item msgid="1165623660533024666">"在背景中執行"</item>
+    <item msgid="6423861043647911030">"無障礙功能音量"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"位置"</item>
+    <item msgid="6656077694190491067">"位置"</item>
+    <item msgid="8790228218278477369">"位置"</item>
+    <item msgid="7836406246005211990">"震動"</item>
+    <item msgid="3951439024549922598">"讀取通訊錄"</item>
+    <item msgid="8802152411647068">"修改通訊錄"</item>
+    <item msgid="229544934599698735">"讀取通話記錄"</item>
+    <item msgid="7396102294405899613">"修改通話記錄"</item>
+    <item msgid="3597797992398484655">"讀取日曆"</item>
+    <item msgid="2705975774250907343">"修改日曆"</item>
+    <item msgid="4668747371441932697">"位置"</item>
+    <item msgid="1487578921720243646">"發佈通知"</item>
+    <item msgid="4636080349724146638">"位置"</item>
+    <item msgid="673510900286463926">"撥打電話"</item>
+    <item msgid="542083422784609790">"讀取 SMS/MMS"</item>
+    <item msgid="1033780373029588436">"寫入 SMS/MMS"</item>
+    <item msgid="5647111115517787488">"接收 SMS/MMS"</item>
+    <item msgid="8591105601108455893">"接收 SMS/MMS"</item>
+    <item msgid="7730995008517841903">"接收 SMS/MMS"</item>
+    <item msgid="2613033109026626086">"接收 SMS/MMS"</item>
+    <item msgid="3037159047591081136">"傳送 SMS/MMS"</item>
+    <item msgid="4726682243833913568">"讀取 SMS/MMS"</item>
+    <item msgid="6555678522277865572">"寫入 SMS/MMS"</item>
+    <item msgid="6981734935578130884">"修改設定"</item>
+    <item msgid="8705854389991425629">"在上面繪圖"</item>
+    <item msgid="5861356020344153651">"存取通知"</item>
+    <item msgid="78432174621628659">"相機"</item>
+    <item msgid="3986116419882154794">"錄製音效"</item>
+    <item msgid="4516840825756409490">"播放音效"</item>
+    <item msgid="6811712502798183957">"讀取剪貼簿"</item>
+    <item msgid="2780369012602289114">"修改剪貼簿"</item>
+    <item msgid="2331359440170850868">"媒體按鈕"</item>
+    <item msgid="6133599737122751231">"音頻焦點"</item>
+    <item msgid="6844485713404805301">"主音量"</item>
+    <item msgid="1600379420669104929">"語音音量"</item>
+    <item msgid="6296768210470214866">"鈴聲音量"</item>
+    <item msgid="510690696071629241">"媒體音量"</item>
+    <item msgid="406861638631430109">"鬧鐘音量"</item>
+    <item msgid="4715864795872233884">"通知音量"</item>
+    <item msgid="2311478519251301183">"藍牙音量"</item>
+    <item msgid="5133991377896747027">"保持啟用"</item>
+    <item msgid="2464189519136248621">"位置"</item>
+    <item msgid="2062677934050803037">"位置"</item>
+    <item msgid="1735171933192715957">"取得使用統計資料"</item>
+    <item msgid="1014093788778383554">"關閉/開啟麥克風"</item>
+    <item msgid="4199297950608622850">"顯示 Toast"</item>
+    <item msgid="2527962435313398821">"投影媒體"</item>
+    <item msgid="5117506254221861929">"啟用 VPN"</item>
+    <item msgid="8291198322681891160">"撰寫桌布"</item>
+    <item msgid="7106921284621230961">"輔助結構"</item>
+    <item msgid="4496533640894624799">"輔助螢幕擷取畫面"</item>
+    <item msgid="2598847264853993611">"讀取手機狀態"</item>
+    <item msgid="9215610846802973353">"新增留言"</item>
+    <item msgid="9186411956086478261">"使用 SIP"</item>
+    <item msgid="6884763100104539558">"處理撥出的通話"</item>
+    <item msgid="125513972170580692">"指紋"</item>
+    <item msgid="2556071024281275619">"人體感應器"</item>
+    <item msgid="617168514928339387">"讀取區域廣播"</item>
+    <item msgid="7134693570516523585">"模擬位置"</item>
+    <item msgid="7224489175375229399">"讀取儲存空間"</item>
+    <item msgid="8472735063903258202">"寫入儲存空間"</item>
+    <item msgid="4069276819909595110">"開啟螢幕"</item>
+    <item msgid="1228338896751121025">"取得帳戶"</item>
+    <item msgid="3181581793459233672">"在背景中執行"</item>
+    <item msgid="2340936043025374076">"無障礙功能音量"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"短"</item>
+    <item msgid="4816511817309094890">"中"</item>
+    <item msgid="8305084671259331134">"長"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"預設"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif 等寬字型"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif 等寬字型"</item>
+    <item msgid="4448481989108928248">"行書"</item>
+    <item msgid="4627069151979553527">"草書"</item>
+    <item msgid="6896773537705206194">"小楷"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"非常小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"正常"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"非常大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"預設"</item>
+    <item msgid="6488643537808152001">"無"</item>
+    <item msgid="552332815156010137">"外框"</item>
+    <item msgid="7187891159463789272">"投射陰影"</item>
+    <item msgid="8019330250538856521">"凸出"</item>
+    <item msgid="8987385315647049787">"內凹"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"使用應用程式預設樣式"</item>
+    <item msgid="8611890312638868524">"黑底白字"</item>
+    <item msgid="5891360837786277638">"白底黑字"</item>
+    <item msgid="2798457065945456853">"黑底黃字"</item>
+    <item msgid="5799049811524553967">"藍底黃字"</item>
+    <item msgid="3673930830658169860">"自訂"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN (預先共用密鑰)"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN (憑證)"</item>
+    <item msgid="312397853907741968">"IPSec VPN (預先共用密鑰和 Xauth 驗證)"</item>
+    <item msgid="3319427315593649917">"IPSec VPN (憑證和 Xauth 驗證)"</item>
+    <item msgid="8258927774145391041">"IPSec VPN (憑證和混合驗證)"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"無"</item>
+    <item msgid="1157046369795346308">"手動"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"已中斷連線"</item>
+    <item msgid="8754480102834556765">"正在初始..."</item>
+    <item msgid="3351334355574270250">"正在連線..."</item>
+    <item msgid="8303882153995748352">"已連接"</item>
+    <item msgid="9135049670787351881">"逾時"</item>
+    <item msgid="2124868417182583926">"不成功"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"詢問"</item>
+    <item msgid="7718817231348607934">"永不允許"</item>
+    <item msgid="8184570120217958741">"永遠允許"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"持續"</item>
+    <item msgid="167418068739176448">"重大活動"</item>
+    <item msgid="4760813290195199773">"重要 (前景)"</item>
+    <item msgid="2328684826817647595">"重要 (背景)"</item>
+    <item msgid="7746406490652867365">"備份"</item>
+    <item msgid="5597404364389196754">"高負載"</item>
+    <item msgid="1290888779300174556">"服務 (執行中)"</item>
+    <item msgid="7241098542073939046">"服務 (重新啟動中)"</item>
+    <item msgid="6610439017684111046">"接收器"</item>
+    <item msgid="7367606086319921117">"首頁"</item>
+    <item msgid="3344660712396741826">"最近活動"</item>
+    <item msgid="5006559348883303865">"快取 (活動)"</item>
+    <item msgid="8633480732468137525">"快取 (活動使用者端)"</item>
+    <item msgid="6248998242443333892">"快取 (清空)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"藍綠色"</item>
+    <item msgid="3228505970082457852">"藍色"</item>
+    <item msgid="6590260735734795647">"靛藍色"</item>
+    <item msgid="3521763377357218577">"紫色"</item>
+    <item msgid="5932337981182999919">"粉紅色"</item>
+    <item msgid="5642914536624000094">"紅色"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"超過 30 天"</item>
+    <item msgid="8699273238891265610">"超過 60 天"</item>
+    <item msgid="8346279419423837266">"超過 90 天"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"自動偵測"</item>
+    <item msgid="773943026484148895">"設定為按用量收費"</item>
+    <item msgid="1008268820118852416">"設定為非按用量收費"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"使用隨機 MAC (預設)"</item>
+    <item msgid="214234417308375326">"使用 MAC 裝置"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"否"</item>
+    <item msgid="1930581185557754880">"是"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"深色"</item>
+    <item msgid="5079453644557603349">"淺色"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"關閉"</item>
+    <item msgid="4072198137051566919">"偵錯"</item>
+    <item msgid="2473005316958868509">"詳細"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"僅限住宅電話"</item>
+    <item msgid="1161026694891024702">"自動"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"首選 GSM/WCDMA"</item>
+    <item msgid="7581481130337402578">"只限 GSM"</item>
+    <item msgid="8579197487913425819">"只限 WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA 自動切換"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo 自動切換"</item>
+    <item msgid="4219607161971472471">"CDMA (沒有 EvDo)"</item>
+    <item msgid="7278975240951052041">"只限 EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"全球"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"只限 TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"全球"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
index 839b0a5..96b8fef 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
@@ -390,7 +390,7 @@
     <string name="security_passwords_title" msgid="6853942836045862315">"私隱權"</string>
     <string name="disabled_by_administrator_summary" msgid="6099821045360491127">"已由管理員停用"</string>
     <string name="security_status_title" msgid="1261960357751754428">"安全性狀態"</string>
-    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"螢幕鎖定, 臉容解鎖"</string>
+    <string name="security_dashboard_summary_face" msgid="2536136110153593745">"螢幕鎖定, 臉孔解鎖"</string>
     <string name="security_dashboard_summary" msgid="4048877125766167227">"螢幕鎖定、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8861903321053490658">"螢幕鎖定"</string>
     <string name="security_settings_face_preference_summary" msgid="4437701024542221434">"已加入臉孔"</string>
@@ -427,7 +427,7 @@
     <string name="security_settings_face_settings_remove_face_data" msgid="2821359954483136239">"移除臉容資料"</string>
     <string name="security_settings_face_settings_footer" msgid="4627175759990550715">"您的臉容可以用來解鎖裝置和存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="5675319895815271094">"是否刪除臉容資料？"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"臉容解鎖功能記錄的資料將以安全方式永久刪除。移除後，您將需使用 PIN、圖案或密碼解鎖手機、登入應用程式及確認付款。"</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3754494807169276107">"臉孔解鎖功能記錄的資料將以安全方式永久刪除。移除後，您將需使用 PIN、圖案或密碼解鎖手機、登入應用程式及確認付款。"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="4177132225930582928">"指紋"</string>
     <string name="fingerprint_manage_category_title" msgid="1463406696801542090">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="7298369141954599706">"使用指紋"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"使用螢幕鎖定選項保護您的平板電腦，這樣即使平板電腦丟失或遭竊，其他人亦無法使用。您亦需要螢幕鎖定選項來設定臉孔驗證。輕按 [取消]，然後設定 PIN，或者選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"使用螢幕鎖定選項保護您的裝置，這樣即使裝置丟失或遭竊，其他人亦無法使用。您亦需要螢幕鎖定選項來設定臉孔驗證。輕按 [取消]，然後設定 PIN，或者選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"使用螢幕鎖定選項保護您的手機，這樣即使手機丟失或遭竊，其他人亦無法使用。您亦需要螢幕鎖定選項來設定臉孔驗證。輕按 [取消]，然後設定 PIN，或者選擇其他螢幕鎖定選項。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"要略過 PIN 設定嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"要略過密碼設定嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"要略過圖案設定嗎？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"設定螢幕鎖定"</string>
@@ -845,7 +844,7 @@
     <string name="wifi_error" msgid="5605801874484465557">"錯誤"</string>
     <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"此國家/地區無法使用 5 GHz 頻譜"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"處於飛行模式"</string>
-    <string name="wifi_notify_open_networks" msgid="4782239203624619655">"開啟網絡通知"</string>
+    <string name="wifi_notify_open_networks" msgid="4782239203624619655">"開放網絡通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"有高品質的公共網絡時通知我"</string>
     <string name="wifi_wakeup" msgid="4963732992164721548">"自動開啟 Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="1152699417411690">"附近有已儲存的高品質網絡 (例如家用網絡) 時會開啟 Wi-Fi"</string>
@@ -1069,7 +1068,7 @@
     <string name="wifi_hotspot_footer_info_regular" msgid="3876006922622827363">"使用熱點為其他裝置建立 Wi-Fi 網絡。熱點會使用流動數據連線提供互聯網服務。可能需要支付額外流動數據費用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3339582350894639261">"應用程式可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7416022590415189590">"自動關閉熱點"</string>
-    <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"如果未連接任何裝置，Wi‑Fi 熱點將會關閉"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="3866769400624802105">"當沒有連接任何裝置時，Wi‑Fi 熱點就會關閉"</string>
     <string name="wifi_tether_starting" msgid="7676952148471297900">"正在開啟熱點…"</string>
     <string name="wifi_tether_stopping" msgid="7478561853791953349">"正在關閉熱點…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7534760116478734006">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"流動網絡"</item>
+    <item msgid="6007360612667098926">"只限 Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1203,7 +1205,7 @@
     <string name="adaptive_sleep_summary_off" msgid="2891586225954973431">"關閉"</string>
     <string name="adaptive_sleep_description" msgid="812673735459170009">"防止在您望向螢幕時螢幕關閉。"</string>
     <string name="adaptive_sleep_privacy" msgid="5706802215479902623">"螢幕意識利用前置鏡頭偵測使用者是否正望向螢幕。此功能只在裝置上使用，同時圖片不會被儲存或傳送至 Google。"</string>
-    <string name="night_display_title" msgid="1305002424893349814">"夜燈模式"</string>
+    <string name="night_display_title" msgid="1305002424893349814">"夜間模式"</string>
     <string name="night_display_text" msgid="5330502493684652527">"「夜燈模式」會將螢幕調校至橙黃色，在光線昏暗的環境下看螢幕或閱讀時就更舒適，並讓您更易入睡。"</string>
     <string name="night_display_auto_mode_title" msgid="8493573087102481588">"設定時間"</string>
     <string name="night_display_auto_mode_never" msgid="2897444637217807088">"無"</string>
@@ -1223,8 +1225,8 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"將會在日出時自動關閉"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"立即開啟"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"立即關閉"</string>
-    <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"保持開啟狀態，直至日出"</string>
-    <string name="night_display_activation_off_twilight" msgid="6846727701281556110">"保持關閉狀態，直至日落"</string>
+    <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"開啟，直至日出"</string>
+    <string name="night_display_activation_off_twilight" msgid="6846727701281556110">"關閉，直至日落"</string>
     <string name="night_display_activation_on_custom" msgid="4761140206778957611">"開啟 (直至<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="night_display_activation_off_custom" msgid="4207238846687792731">"保持關閉狀態，直至<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_not_currently_on" msgid="1436588493764429281">"目前沒有開啟「夜燈模式」"</string>
@@ -1656,9 +1658,9 @@
     <string name="location_low_battery_use" msgid="5030448574501435888">"低耗電量"</string>
     <string name="location_scanning_screen_title" msgid="7663329319689413454">"Wi‑Fi 和藍牙掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6750542206763112172">"Wi-Fi 掃瞄"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="4956048135941851712">"允許應用程式和服務隨時掃瞄 Wi-Fi 網絡 (即使 Wi-Fi 已關閉)。此操作可用來改善適地性功能和服務。"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="4956048135941851712">"允許應用程式和服務隨時掃瞄 Wi-Fi 網絡 (即使 Wi-Fi 已關閉)。用途包括改善適地性功能和服務。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="196241746742607453">"藍牙掃瞄"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="3796673798637848690">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。用途包括改善適地性功能和服務。"</string>
     <string name="managed_profile_location_services" msgid="224925483299159541">"工作用定位服務"</string>
     <string name="location_network_based" msgid="1535812159327454835">"Wi-Fi 和流動網絡位置"</string>
     <string name="location_neighborhood_level" msgid="8459352741296587916">"允許應用程式使用 Google 的定位服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
@@ -2024,7 +2026,7 @@
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="1185486443615658430">"永遠允許「<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>」建立小工具並存取其資料"</string>
     <string name="usage_stats_label" msgid="3128999956478977035">"用量統計資料"</string>
     <string name="testing_usage_stats" msgid="704965692323956976">"用量統計資料"</string>
-    <string name="display_order_text" msgid="2973620313510295873">"排序依據："</string>
+    <string name="display_order_text" msgid="2973620313510295873">"排序方式："</string>
     <string name="app_name_label" msgid="2258469951312794816">"應用程式"</string>
     <string name="last_time_used_label" msgid="1119322667349666930">"上次使用時間"</string>
     <string name="usage_time_label" msgid="5615725415876461039">"使用時間"</string>
@@ -3383,7 +3385,7 @@
     <string name="picture_in_picture_keywords" msgid="7326958702002259262">"pip 畫中畫"</string>
     <string name="picture_in_picture_app_detail_title" msgid="3916189052657425936">"畫中畫"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="747422998967185418">"允許畫中畫"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"允許此應用程式在開啟時或您離開後 (例如繼續觀看影片) 建立畫中畫視窗。該視窗會在您目前使用的其他應用程式上層顯示。"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="918632751775525347">"當您離開正運作中的應用程式時，允許該應用程式建立畫中畫視窗 (例如方便您繼續觀看影片)。該視窗會顯示在您目前使用的其他應用程式上層。"</string>
     <string name="manage_zen_access_title" msgid="3058206309728524196">"「請勿騷擾」權限"</string>
     <string name="zen_access_detail_switch" msgid="8706332327904974500">"允許請勿騷擾權限"</string>
     <string name="zen_access_empty_text" msgid="7667538993781607731">"沒有已安裝的應用程式要求存取「請勿騷擾」。"</string>
@@ -3524,7 +3526,7 @@
     <string name="zen_mode_when_every_night" msgid="3942151668791426194">"每天晚上"</string>
     <string name="zen_mode_when_weeknights" msgid="2412709309122408474">"星期一至星期五晚"</string>
     <string name="zen_mode_start_time" msgid="5979122139937561731">"開始時間"</string>
-    <string name="zen_mode_end_time" msgid="3188578493250909972">"完結時間"</string>
+    <string name="zen_mode_end_time" msgid="3188578493250909972">"結束時間"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="1598612215612648214">"翌日<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2470936648971337656">"變更為永遠只允許鬧鐘"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="7192429395424304796">
@@ -3639,7 +3641,7 @@
     <string name="advanced_apps" msgid="6643869089344883537">"進階"</string>
     <string name="configure_apps" msgid="4066683118857400943">"設定應用程式"</string>
     <string name="unknown_app" msgid="2312052973570376877">"不明應用程式"</string>
-    <string name="app_permissions" msgid="3215958256821756086">"權限管理員"</string>
+    <string name="app_permissions" msgid="3215958256821756086">"權限管理工具"</string>
     <string name="app_permissions_summary" msgid="8785798165776061594">"使用<xliff:g id="APPS">%1$s</xliff:g>的應用程式"</string>
     <string name="tap_to_wake" msgid="1902991239401652323">"輕按以喚醒"</string>
     <string name="tap_to_wake_summary" msgid="8485222120721006793">"在螢幕上任何地方連按兩下即可喚醒裝置"</string>
@@ -3672,7 +3674,7 @@
     <string name="system_app" msgid="4111402206594443265">"(系統)"</string>
     <string name="system_default_app" msgid="1454719098589351197">"(系統預設)"</string>
     <string name="apps_storage" msgid="5658466038269046038">"應用程式儲存空間"</string>
-    <string name="usage_access" msgid="2023443456361489516">"使用情況存取權"</string>
+    <string name="usage_access" msgid="2023443456361489516">"使用紀錄存取權"</string>
     <string name="permit_usage_access" msgid="3321727608629752758">"允許使用記錄存取權"</string>
     <string name="app_usage_preference" msgid="5691545073101551727">"應用程式使用喜好"</string>
     <string name="time_spent_in_app_pref_title" msgid="2803186835902798451">"裝置使用時間"</string>
@@ -4273,6 +4275,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"此功能會減慢這部手機的運作速度"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"強制啟用完整的 GNSS 測量資料"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"切換使用者時顯示偵錯資訊"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"切換使用者時顯示詳細偵錯資訊"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"允許啟動背景活動"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"允許啟動所有背景活動"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"一律顯示當機對話框"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rTW-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rTW-nokeys/strings.xml
new file mode 100644
index 0000000..10ea868
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"管理應用程式"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml b/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml
new file mode 100644
index 0000000..7901b7d
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"美國"</item>
+    <item msgid="4791956477275129121">"歐洲"</item>
+    <item msgid="3812126832016254559">"非洲"</item>
+    <item msgid="2765816300353408280">"亞洲"</item>
+    <item msgid="6683489385344409742">"澳大利亞"</item>
+    <item msgid="5194868215515664953">"太平洋"</item>
+    <item msgid="7044520255415007865">"全部"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 秒"</item>
+    <item msgid="772029947136115322">"30 秒"</item>
+    <item msgid="8743663928349474087">"1 分鐘"</item>
+    <item msgid="1506508631223164814">"2 分鐘"</item>
+    <item msgid="8664703938127907662">"5 分鐘"</item>
+    <item msgid="5827960506924849753">"10 分鐘"</item>
+    <item msgid="6677424950124253938">"30 分鐘"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"永遠不要"</item>
+    <item msgid="2517785806387977252">"15 秒"</item>
+    <item msgid="6347954399441173672">"30 秒"</item>
+    <item msgid="4858305253279921789">"1 分鐘"</item>
+    <item msgid="8109273437140044073">"2 分鐘"</item>
+    <item msgid="2788593551142462622">"5 分鐘"</item>
+    <item msgid="8012672183888404961">"10 分鐘"</item>
+    <item msgid="8271452751594598661">"30 分鐘"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"0 秒"</item>
+    <item msgid="2038544972632026612">"5 秒"</item>
+    <item msgid="5558060663472279597">"15 秒"</item>
+    <item msgid="45341168505452037">"30 秒"</item>
+    <item msgid="227647485917789272">"1 分鐘"</item>
+    <item msgid="3367011891231217504">"2 分鐘"</item>
+    <item msgid="4376575879222393045">"5 分鐘"</item>
+    <item msgid="811192536981678974">"10 分鐘"</item>
+    <item msgid="7258394417241706272">"30 分鐘"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"小"</item>
+    <item msgid="591935967183159581">"預設"</item>
+    <item msgid="1714184661981538355">"大"</item>
+    <item msgid="6195563047686707484">"最大"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"掃描中…"</item>
+    <item msgid="5597394826455877834">"連線中…"</item>
+    <item msgid="5848277343965362748">"驗證中…"</item>
+    <item msgid="3391238031431440676">"正在取得 IP 位址…"</item>
+    <item msgid="5257597310494000224">"已連線"</item>
+    <item msgid="8472497592913050396">"待命"</item>
+    <item msgid="1228072488815999109">"正在中斷連線…"</item>
+    <item msgid="7253087004422991731">"連線中斷"</item>
+    <item msgid="4169850917304751227">"失敗"</item>
+    <item msgid="6266658166690831131">"已封鎖"</item>
+    <item msgid="4517230805854909775">"目前正暫時避開品質不佳的連線"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"掃描中…"</item>
+    <item msgid="8058143476674427024">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7547609081339573756">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
+    <item msgid="5145158315060185414">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
+    <item msgid="3283243151651124831">"已連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"待命"</item>
+    <item msgid="4133290864821295785">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線…"</item>
+    <item msgid="3980154971187953257">"連線中斷"</item>
+    <item msgid="2847316776634969068">"失敗"</item>
+    <item msgid="4390990424746035383">"已封鎖"</item>
+    <item msgid="3618248791367063949">"目前正暫時避開品質不佳的連線"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"按鈕"</item>
+    <item msgid="7401896200768713930">"來自對端裝置的 PIN"</item>
+    <item msgid="4526848028011846710">"從這個裝置產生 PIN"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"已連線"</item>
+    <item msgid="983792611851499732">"已邀請"</item>
+    <item msgid="5438273405428201793">"失敗"</item>
+    <item msgid="4646663015449312554">"有可用的 SIM 卡"</item>
+    <item msgid="3230556734162006146">"超出範圍"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 分鐘"</item>
+    <item msgid="2759776603549270587">"5 分鐘"</item>
+    <item msgid="167772676068860015">"1 小時"</item>
+    <item msgid="5985477119043628504">"無時限"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"使用系統預設值：<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"差"</item>
+    <item msgid="7882129634982603782">"差"</item>
+    <item msgid="6457357501905996224">"一般"</item>
+    <item msgid="405271628162918841">"良好"</item>
+    <item msgid="999948812884919584">"優"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"最近 30 天"</item>
+    <item msgid="3211287705232736964">"設定用量週期..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"使用時間"</item>
+    <item msgid="2784401352592276015">"上次使用時間"</item>
+    <item msgid="249854287216326349">"應用程式名稱"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"PEAP"</item>
+    <item msgid="336771389015263226">"TLS"</item>
+    <item msgid="2124951724092063376">"TTLS"</item>
+    <item msgid="7427377376024106344">"PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"都不套用"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"無"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"都不套用"</item>
+    <item msgid="7901133332272818442">"PAP"</item>
+    <item msgid="8549879045980332977">"MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"DHCP"</item>
+    <item msgid="4377002609760712163">"靜態"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"都不套用"</item>
+    <item msgid="1464741437353223198">"說明書"</item>
+    <item msgid="5793600062487886090">"Proxy 自動設定"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"都不套用"</item>
+    <item msgid="1950796738039490374">"PAP"</item>
+    <item msgid="8166687999538788787">"CHAP"</item>
+    <item msgid="1276004657191968988">"PAP 或 CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"未指定"</item>
+    <item msgid="2740477081395679090">"LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"HSPA"</item>
+    <item msgid="4152166097223929133">"HSUPA"</item>
+    <item msgid="5134662517319988296">"HSDPA"</item>
+    <item msgid="4997539146036732961">"UMTS"</item>
+    <item msgid="4910169712073083585">"EDGE"</item>
+    <item msgid="3505904588897578792">"GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"無"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"內部裝置儲存空間"</item>
+    <item msgid="3186681694079967527">"卸除式 SD 卡"</item>
+    <item msgid="6902033473986647035">"讓系統決定"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"定位"</item>
+    <item msgid="6842381562497597649">"個人"</item>
+    <item msgid="3966700236695683444">"簡訊"</item>
+    <item msgid="8563996233342430477">"媒體"</item>
+    <item msgid="5323851085993963783">"裝置"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"約略位置"</item>
+    <item msgid="1830619568689922920">"精確位置"</item>
+    <item msgid="3317274469481923141">"GPS"</item>
+    <item msgid="8931785990160383356">"震動"</item>
+    <item msgid="8632513128515114092">"讀取聯絡人資料"</item>
+    <item msgid="3741042113569620272">"修改聯絡人資料"</item>
+    <item msgid="4204420969709009931">"讀取通話記錄"</item>
+    <item msgid="2260380357119423209">"修改通話記錄"</item>
+    <item msgid="6550710385014530934">"讀取日曆"</item>
+    <item msgid="3575906174264853951">"修改日曆"</item>
+    <item msgid="4319843242568057174">"Wi-Fi 掃描"</item>
+    <item msgid="2981791890467303819">"通知"</item>
+    <item msgid="6617825156152476692">"手機掃描"</item>
+    <item msgid="8865260890611559753">"撥打電話"</item>
+    <item msgid="3254999273961542982">"讀取 SMS"</item>
+    <item msgid="7711446453028825171">"撰寫 SMS"</item>
+    <item msgid="6123238544099198034">"接收簡訊"</item>
+    <item msgid="838342167431596036">"接收緊急 SMS"</item>
+    <item msgid="8554432731560956686">"接收 MMS"</item>
+    <item msgid="7464863464299515059">"接收 WAP PUSH 簡訊"</item>
+    <item msgid="310463075729606765">"傳送 SMS"</item>
+    <item msgid="7338021933527689514">"讀取 ICC SMS"</item>
+    <item msgid="6130369335466613036">"撰寫 ICC SMS"</item>
+    <item msgid="6536865581421670942">"修改設定"</item>
+    <item msgid="4547203129183558973">"在最上層繪圖"</item>
+    <item msgid="9080347512916542840">"存取通知"</item>
+    <item msgid="5332718516635907742">"相機"</item>
+    <item msgid="6098422447246167852">"錄音"</item>
+    <item msgid="9182794235292595296">"播放音訊"</item>
+    <item msgid="8760743229597702019">"讀取剪貼簿"</item>
+    <item msgid="2266923698240538544">"修改剪貼簿"</item>
+    <item msgid="1801619438618539275">"媒體按鈕"</item>
+    <item msgid="31588119965784465">"音訊焦點"</item>
+    <item msgid="7565226799008076833">"主音量"</item>
+    <item msgid="5420704980305018295">"語音音量"</item>
+    <item msgid="5797363115508970204">"鈴聲音量"</item>
+    <item msgid="8233154098550715999">"媒體音量"</item>
+    <item msgid="5196715605078153950">"鬧鐘音量"</item>
+    <item msgid="394030698764284577">"通知音量"</item>
+    <item msgid="8952898972491680178">"藍牙音量"</item>
+    <item msgid="8506227454543690851">"停用休眠"</item>
+    <item msgid="1108160036049727420">"監控位置"</item>
+    <item msgid="1496205959751719491">"監控高耗電定位功能"</item>
+    <item msgid="3776296279910987380">"取得使用統計資料"</item>
+    <item msgid="8827100324471975602">"關閉/開啟麥克風"</item>
+    <item msgid="6880736730520126864">"顯示浮動式訊息"</item>
+    <item msgid="4933375960222609935">"投影媒體"</item>
+    <item msgid="8357907018938895462">"啟用 VPN"</item>
+    <item msgid="8143812849911310973">"寫入桌布"</item>
+    <item msgid="6266277260961066535">"輔助結構"</item>
+    <item msgid="7715498149883482300">"輔助螢幕截圖"</item>
+    <item msgid="4046679376726313293">"讀取手機狀態"</item>
+    <item msgid="6329507266039719587">"新增語音留言"</item>
+    <item msgid="7692440726415391408">"使用 SIP"</item>
+    <item msgid="8572453398128326267">"處理撥出電話"</item>
+    <item msgid="7775674394089376306">"指紋"</item>
+    <item msgid="3182815133441738779">"人體感測器"</item>
+    <item msgid="2793100005496829513">"讀取區域廣播"</item>
+    <item msgid="2633626056029384366">"模擬位置"</item>
+    <item msgid="8356842191824684631">"讀取儲存空間"</item>
+    <item msgid="5671906070163291500">"寫入儲存空間"</item>
+    <item msgid="2791955098549340418">"開啟螢幕"</item>
+    <item msgid="5599435119609178367">"取得帳戶"</item>
+    <item msgid="1165623660533024666">"在背景執行"</item>
+    <item msgid="6423861043647911030">"無障礙工具音量"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"定位"</item>
+    <item msgid="6656077694190491067">"定位"</item>
+    <item msgid="8790228218278477369">"定位"</item>
+    <item msgid="7836406246005211990">"震動"</item>
+    <item msgid="3951439024549922598">"讀取聯絡人資料"</item>
+    <item msgid="8802152411647068">"修改聯絡人資料"</item>
+    <item msgid="229544934599698735">"讀取通話記錄"</item>
+    <item msgid="7396102294405899613">"修改通話記錄"</item>
+    <item msgid="3597797992398484655">"讀取日曆"</item>
+    <item msgid="2705975774250907343">"修改日曆"</item>
+    <item msgid="4668747371441932697">"定位"</item>
+    <item msgid="1487578921720243646">"發布通知"</item>
+    <item msgid="4636080349724146638">"位置"</item>
+    <item msgid="673510900286463926">"撥打電話"</item>
+    <item msgid="542083422784609790">"讀取簡訊/MMS"</item>
+    <item msgid="1033780373029588436">"寫入簡訊/MMS"</item>
+    <item msgid="5647111115517787488">"接收 SMS/MMS"</item>
+    <item msgid="8591105601108455893">"接收 SMS/MMS"</item>
+    <item msgid="7730995008517841903">"接收 SMS/MMS"</item>
+    <item msgid="2613033109026626086">"接收 SMS/MMS"</item>
+    <item msgid="3037159047591081136">"傳送 SMS/MMS"</item>
+    <item msgid="4726682243833913568">"讀取簡訊/MMS"</item>
+    <item msgid="6555678522277865572">"寫入簡訊/MMS"</item>
+    <item msgid="6981734935578130884">"修改設定"</item>
+    <item msgid="8705854389991425629">"在最上層繪圖"</item>
+    <item msgid="5861356020344153651">"存取通知"</item>
+    <item msgid="78432174621628659">"相機"</item>
+    <item msgid="3986116419882154794">"錄音"</item>
+    <item msgid="4516840825756409490">"播放音訊"</item>
+    <item msgid="6811712502798183957">"讀取剪貼簿"</item>
+    <item msgid="2780369012602289114">"修改剪貼簿"</item>
+    <item msgid="2331359440170850868">"媒體按鈕"</item>
+    <item msgid="6133599737122751231">"音訊焦點"</item>
+    <item msgid="6844485713404805301">"主音量"</item>
+    <item msgid="1600379420669104929">"語音音量"</item>
+    <item msgid="6296768210470214866">"鈴聲音量"</item>
+    <item msgid="510690696071629241">"媒體音量"</item>
+    <item msgid="406861638631430109">"鬧鐘音量"</item>
+    <item msgid="4715864795872233884">"通知音量"</item>
+    <item msgid="2311478519251301183">"藍牙音量"</item>
+    <item msgid="5133991377896747027">"停用休眠"</item>
+    <item msgid="2464189519136248621">"位置"</item>
+    <item msgid="2062677934050803037">"定位"</item>
+    <item msgid="1735171933192715957">"取得使用統計資料"</item>
+    <item msgid="1014093788778383554">"關閉/開啟麥克風"</item>
+    <item msgid="4199297950608622850">"顯示浮動式訊息"</item>
+    <item msgid="2527962435313398821">"投影媒體"</item>
+    <item msgid="5117506254221861929">"啟用 VPN"</item>
+    <item msgid="8291198322681891160">"寫入桌布"</item>
+    <item msgid="7106921284621230961">"輔助結構"</item>
+    <item msgid="4496533640894624799">"輔助螢幕截圖"</item>
+    <item msgid="2598847264853993611">"讀取手機狀態"</item>
+    <item msgid="9215610846802973353">"新增語音留言"</item>
+    <item msgid="9186411956086478261">"使用 SIP"</item>
+    <item msgid="6884763100104539558">"處理撥出電話"</item>
+    <item msgid="125513972170580692">"指紋"</item>
+    <item msgid="2556071024281275619">"人體感測器"</item>
+    <item msgid="617168514928339387">"讀取區域廣播"</item>
+    <item msgid="7134693570516523585">"模擬位置"</item>
+    <item msgid="7224489175375229399">"讀取儲存空間"</item>
+    <item msgid="8472735063903258202">"寫入儲存空間"</item>
+    <item msgid="4069276819909595110">"開啟螢幕"</item>
+    <item msgid="1228338896751121025">"取得帳戶"</item>
+    <item msgid="3181581793459233672">"在背景執行"</item>
+    <item msgid="2340936043025374076">"無障礙工具音量"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"短"</item>
+    <item msgid="4816511817309094890">"中"</item>
+    <item msgid="8305084671259331134">"長"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"預設"</item>
+    <item msgid="4147246073737933622">"Sans-serif"</item>
+    <item msgid="3117680749167407907">"Sans-serif condensed"</item>
+    <item msgid="6529379119163117545">"Sans-serif 等寬字型"</item>
+    <item msgid="1487203730637617924">"Serif"</item>
+    <item msgid="4937790671987480464">"Serif 等寬字型"</item>
+    <item msgid="4448481989108928248">"隨性"</item>
+    <item msgid="4627069151979553527">"草寫"</item>
+    <item msgid="6896773537705206194">"小型大寫字母"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"最小"</item>
+    <item msgid="5091603983404027034">"小"</item>
+    <item msgid="176844712416932112">"一般"</item>
+    <item msgid="2784236342175159295">"大"</item>
+    <item msgid="218913203203160606">"最大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"預設"</item>
+    <item msgid="6488643537808152001">"都不套用"</item>
+    <item msgid="552332815156010137">"外框"</item>
+    <item msgid="7187891159463789272">"陰影"</item>
+    <item msgid="8019330250538856521">"浮凸"</item>
+    <item msgid="8987385315647049787">"內凹"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"使用應用程式預設值"</item>
+    <item msgid="8611890312638868524">"黑底白字"</item>
+    <item msgid="5891360837786277638">"白底黑字"</item>
+    <item msgid="2798457065945456853">"黑底黃字"</item>
+    <item msgid="5799049811524553967">"藍底黃字"</item>
+    <item msgid="3673930830658169860">"自訂"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"L2TP/IPSec VPN (預先共用金鑰)"</item>
+    <item msgid="6128519070545038358">"L2TP/IPSec VPN (憑證)"</item>
+    <item msgid="312397853907741968">"IPSec VPN (預先共用金鑰和 Xauth 驗證)"</item>
+    <item msgid="3319427315593649917">"IPSec VPN (憑證和 Xauth 驗證)"</item>
+    <item msgid="8258927774145391041">"IPSec VPN (憑證和混合驗證)"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"無"</item>
+    <item msgid="1157046369795346308">"說明書"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"連線中斷"</item>
+    <item msgid="8754480102834556765">"初始中…"</item>
+    <item msgid="3351334355574270250">"連線中…"</item>
+    <item msgid="8303882153995748352">"已連線"</item>
+    <item msgid="9135049670787351881">"逾時"</item>
+    <item msgid="2124868417182583926">"失敗"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"詢問"</item>
+    <item msgid="7718817231348607934">"一律不允許"</item>
+    <item msgid="8184570120217958741">"一律允許"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"持續"</item>
+    <item msgid="167418068739176448">"重大活動"</item>
+    <item msgid="4760813290195199773">"重要 (前景)"</item>
+    <item msgid="2328684826817647595">"重要 (背景)"</item>
+    <item msgid="7746406490652867365">"備份"</item>
+    <item msgid="5597404364389196754">"高負載"</item>
+    <item msgid="1290888779300174556">"服務 (執行中)"</item>
+    <item msgid="7241098542073939046">"服務 (重新啟動中)"</item>
+    <item msgid="6610439017684111046">"接收器"</item>
+    <item msgid="7367606086319921117">"主螢幕"</item>
+    <item msgid="3344660712396741826">"最近活動"</item>
+    <item msgid="5006559348883303865">"快取 (活動)"</item>
+    <item msgid="8633480732468137525">"快取 (活動用戶端)"</item>
+    <item msgid="6248998242443333892">"快取 (清空)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"藍綠色"</item>
+    <item msgid="3228505970082457852">"藍色"</item>
+    <item msgid="6590260735734795647">"靛藍色"</item>
+    <item msgid="3521763377357218577">"紫色"</item>
+    <item msgid="5932337981182999919">"粉紅色"</item>
+    <item msgid="5642914536624000094">"紅色"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"超過 30 天"</item>
+    <item msgid="8699273238891265610">"超過 60 天"</item>
+    <item msgid="8346279419423837266">"超過 90 天"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"自動偵測"</item>
+    <item msgid="773943026484148895">"視為計量付費"</item>
+    <item msgid="1008268820118852416">"視為非計量付費"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"使用隨機化 MAC (預設)"</item>
+    <item msgid="214234417308375326">"使用裝置 MAC"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"否"</item>
+    <item msgid="1930581185557754880">"是"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"深色"</item>
+    <item msgid="5079453644557603349">"淺色"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"已關閉"</item>
+    <item msgid="4072198137051566919">"偵錯"</item>
+    <item msgid="2473005316958868509">"詳細"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"僅限家用網路"</item>
+    <item msgid="1161026694891024702">"自動"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"GSM/WCDMA 優先"</item>
+    <item msgid="7581481130337402578">"僅限 GSM"</item>
+    <item msgid="8579197487913425819">"僅限 WCDMA"</item>
+    <item msgid="8465243227505412498">"GSM/WCDMA 自動切換"</item>
+    <item msgid="9107479914166352132">"CDMA/EvDo 自動切換"</item>
+    <item msgid="4219607161971472471">"CDMA (不具 EvDo)"</item>
+    <item msgid="7278975240951052041">"僅限 EvDo"</item>
+    <item msgid="2295969832276827854">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"通用"</item>
+    <item msgid="5713723042183940349">"LTE"</item>
+    <item msgid="8600184258612405670">"LTE/WCDMA"</item>
+    <item msgid="5638632460322750180">"僅限 TDSCDMA"</item>
+    <item msgid="4346392996298714633">"TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"通用"</item>
+    <item msgid="7893851358184700811">"LTE/CDMA"</item>
+    <item msgid="1779116915491192719">"LTE/GSM/UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
index 24abb0a..b61af3b 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
@@ -349,7 +349,7 @@
     <string name="time_picker_title" msgid="1596400307061268660">"時間"</string>
     <string name="lock_after_timeout" msgid="7755520959071097304">"自動鎖定"</string>
     <string name="lock_after_timeout_summary" msgid="3160517585613694740">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"休眠後立即鎖定 (<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> 讓螢幕保持解鎖狀態時除外)"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="6442552135409347556">"休眠後立即鎖定 (由「<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>」維持解鎖狀態時除外)"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="7218267834086717545">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (由「<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>」維持解鎖狀態時除外)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="4510756693837171575">"在鎖定畫面上顯示擁有者資訊"</string>
     <string name="owner_info_settings_title" msgid="2537966178998339896">"鎖定螢幕訊息"</string>
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"建議你設定螢幕鎖定選項保護你的平板電腦。這樣一來，即使平板電腦遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定臉孔驗證。請輕觸 [取消]，然後設定 PIN 碼或選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"建議你設定螢幕鎖定選項保護你的裝置。這樣一來，即使裝置遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定臉孔驗證。請輕觸 [取消]，然後設定 PIN 碼或選擇其他螢幕鎖定選項。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"建議你設定螢幕鎖定選項保護你的手機。這樣一來，即使手機遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定臉孔驗證。請輕觸 [取消]，然後設定 PIN 碼或選擇其他螢幕鎖定選項。"</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"要略過 PIN 碼設定程序嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"要略過密碼設定程序嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"要略過解鎖圖案設定程序嗎？"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"設定螢幕鎖定"</string>
@@ -845,7 +844,7 @@
     <string name="wifi_error" msgid="5605801874484465557">"錯誤"</string>
     <string name="wifi_sap_no_channel_error" msgid="6881796988574851628">"5 GHz 頻帶在這個國家/地區不受支援"</string>
     <string name="wifi_in_airplane_mode" msgid="4729571191578262246">"處於飛行模式時"</string>
-    <string name="wifi_notify_open_networks" msgid="4782239203624619655">"開啟網路通知"</string>
+    <string name="wifi_notify_open_networks" msgid="4782239203624619655">"開放式網路通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="1383681260705466715">"有高品質的公用網路時通知我"</string>
     <string name="wifi_wakeup" msgid="4963732992164721548">"自動開啟 Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="1152699417411690">"位於已儲存的高品質 Wi‑Fi 網路範圍內 (例如家用網路) 時自動重新開啟 Wi‑Fi"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"Wi-Fi"</item>
+    <item msgid="4421333712484542489">"行動網路"</item>
+    <item msgid="6007360612667098926">"僅限 Wi-Fi"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -1223,8 +1225,8 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8386769601369289561">"將於日出時自動關閉"</string>
     <string name="night_display_activation_on_manual" msgid="8379477527072027346">"立即開啟"</string>
     <string name="night_display_activation_off_manual" msgid="7776082151269794201">"立即關閉"</string>
-    <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"保持開啟狀態，直到日出"</string>
-    <string name="night_display_activation_off_twilight" msgid="6846727701281556110">"保持關閉狀態，直到日落"</string>
+    <string name="night_display_activation_on_twilight" msgid="5610294051700287249">"開啟，直到日出"</string>
+    <string name="night_display_activation_off_twilight" msgid="6846727701281556110">"關閉，直到日落"</string>
     <string name="night_display_activation_on_custom" msgid="4761140206778957611">"保持開啟狀態，直到<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_activation_off_custom" msgid="4207238846687792731">"保持關閉狀態，直到<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_not_currently_on" msgid="1436588493764429281">"夜燈模式目前已關閉"</string>
@@ -2075,7 +2077,7 @@
     <string name="accessibility_timeout_1min" msgid="5019003178551730551">"1 分鐘"</string>
     <string name="accessibility_timeout_2mins" msgid="4124259290444829477">"2 分鐘"</string>
     <string name="accessibility_content_timeout_preference_title" msgid="5160746882250939464">"可閱讀的時間"</string>
-    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"可進行操作的時間"</string>
+    <string name="accessibility_control_timeout_preference_title" msgid="2771808346038759474">"操作等待時間"</string>
     <string name="accessibility_content_timeout_preference_summary" msgid="853829064617918179">"選擇你需要閱讀的訊息會暫時顯示多久。\n\n只有部分應用程式支援這項設定。"</string>
     <string name="accessibility_control_timeout_preference_summary" msgid="8582212299606932160">"選擇提示你進行操作的訊息會暫時顯示多久。\n\n只有部分應用程式支援這項設定。"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5029685114164868477">"輕觸並按住的延遲時間"</string>
@@ -3297,7 +3299,7 @@
     <string name="asst_capabilities_actions_replies_title" msgid="3929395108744251338">"智慧操作和回覆"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="5647029698181357902">"自動將內容通知操作和快速回覆新增至通知"</string>
     <string name="hide_silent_icons_title" msgid="1070905516921542662">"隱藏無聲通知狀態圖示"</string>
-    <string name="hide_silent_icons_summary" msgid="2624346914488256888">"在狀態列隱藏無聲通知圖示"</string>
+    <string name="hide_silent_icons_summary" msgid="2624346914488256888">"在狀態列隱藏靜音通知圖示"</string>
     <string name="notification_badging_title" msgid="6311699476970264712">"允許使用通知圓點"</string>
     <string name="notification_bubbles_title" msgid="9196562435741861317">"泡泡"</string>
     <string name="notification_bubbles_summary" msgid="4624512775901949578">"使用浮動快速鍵，隨時隨地快速存取應用程式內容"</string>
@@ -3396,7 +3398,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個類別</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個類別</item>
     </plurals>
-    <string name="no_channels" msgid="8884254729302501652">"這個應用程式未發佈任何通知"</string>
+    <string name="no_channels" msgid="8884254729302501652">"這個應用程式未發布任何通知"</string>
     <string name="app_settings_link" msgid="8465287765715790984">"應用程式中的其他設定"</string>
     <string name="app_notification_listing_summary_zero" msgid="4047782719487686699">"已針對所有應用程式開啟這項設定"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1161774065480666519">
@@ -3753,10 +3755,10 @@
     <string name="background_check_title" msgid="4136736684290307970">"完整背景存取權"</string>
     <string name="assist_access_context_title" msgid="2274614501747710439">"使用畫面中的文字"</string>
     <string name="assist_access_context_summary" msgid="5867997494395842785">"允許小幫手應用程式存取畫面中的文字內容"</string>
-    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"使用螢幕擷取畫面"</string>
+    <string name="assist_access_screenshot_title" msgid="1991014038776117688">"使用螢幕截圖"</string>
     <string name="assist_access_screenshot_summary" msgid="3010943864000489424">"允許小幫手應用程式存取畫面擷圖"</string>
     <string name="assist_flash_title" msgid="8852484250748551092">"閃爍螢幕"</string>
-    <string name="assist_flash_summary" msgid="6697095786317559129">"小幫手應用程式存取螢幕或螢幕擷取畫面中的文字時，螢幕邊緣會閃爍"</string>
+    <string name="assist_flash_summary" msgid="6697095786317559129">"小幫手應用程式存取螢幕或螢幕截圖中的文字時，螢幕邊緣會閃爍"</string>
     <string name="assist_footer" msgid="7030121180457472165">"小幫手應用程式可根據你目前瀏覽的畫面資訊，為你提供協助。部分應用程式同時支援啟動器和語音輸入服務，為你提供更完善的服務。"</string>
     <string name="average_memory_use" msgid="5333366040118953945">"記憶體平均用量"</string>
     <string name="maximum_memory_use" msgid="6509872438499846077">"記憶體最高用量"</string>
@@ -4272,6 +4274,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"這會減慢這支手機的速度"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"強制啟用完整的 GNSS 測量資料"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"在切換使用者時顯示偵錯資訊"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"在切換使用者時顯示詳細資訊"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"允許系統執行背景活動"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"允許系統執行所有背景活動"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"一律顯示當機對話方塊"</string>
diff --git a/tests/CarDeveloperOptions/res/values-zu-nokeys/strings.xml b/tests/CarDeveloperOptions/res/values-zu-nokeys/strings.xml
new file mode 100644
index 0000000..9d821ab
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zu-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="1051076839604862240">"Phatha izinhlelo zokusebenza"</string>
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zu/arrays.xml b/tests/CarDeveloperOptions/res/values-zu/arrays.xml
new file mode 100644
index 0000000..60b6f45
--- /dev/null
+++ b/tests/CarDeveloperOptions/res/values-zu/arrays.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2019 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="3431380197378148950">"i-America"</item>
+    <item msgid="4791956477275129121">"i-Europe"</item>
+    <item msgid="3812126832016254559">"i-Afrika"</item>
+    <item msgid="2765816300353408280">"i-Asia"</item>
+    <item msgid="6683489385344409742">"i-Australia"</item>
+    <item msgid="5194868215515664953">"Iphasifiki"</item>
+    <item msgid="7044520255415007865">"Konke"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="8596143519087753804">"15 amasekhondi"</item>
+    <item msgid="772029947136115322">"30 amasekhondi"</item>
+    <item msgid="8743663928349474087">"1 iminithi"</item>
+    <item msgid="1506508631223164814">"2 amaminithi"</item>
+    <item msgid="8664703938127907662">"5 amaminithi"</item>
+    <item msgid="5827960506924849753">"10 amaminithi"</item>
+    <item msgid="6677424950124253938">"30 amaminithi"</item>
+  </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="6487043225269853023">"Akusoze"</item>
+    <item msgid="2517785806387977252">"15 amasekhondi"</item>
+    <item msgid="6347954399441173672">"30 amasekhondi"</item>
+    <item msgid="4858305253279921789">"1 iminithi"</item>
+    <item msgid="8109273437140044073">"2 amaminithi"</item>
+    <item msgid="2788593551142462622">"5 amaminithi"</item>
+    <item msgid="8012672183888404961">"10 amaminithi"</item>
+    <item msgid="8271452751594598661">"30 amaminithi"</item>
+  </string-array>
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="2232921187970351881">"Ngokushesha"</item>
+    <item msgid="2038544972632026612">"5 amasekhondi"</item>
+    <item msgid="5558060663472279597">"15 amasekhondi"</item>
+    <item msgid="45341168505452037">"30 amasekhondi"</item>
+    <item msgid="227647485917789272">"1 iminithi"</item>
+    <item msgid="3367011891231217504">"2 amaminithi"</item>
+    <item msgid="4376575879222393045">"5 amaminithi"</item>
+    <item msgid="811192536981678974">"10 amaminithi"</item>
+    <item msgid="7258394417241706272">"30 amaminithi"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2340391964816059553">"Ncane"</item>
+    <item msgid="591935967183159581">"Okuzenzakalelayo"</item>
+    <item msgid="1714184661981538355">"Okukhulu"</item>
+    <item msgid="6195563047686707484">"Okukhulu kakhulu"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1304883790721412351"></item>
+    <item msgid="4157625910392775808">"Iyathwebula..."</item>
+    <item msgid="5597394826455877834">"Iyaxhuma kwi-inthanethi..."</item>
+    <item msgid="5848277343965362748">"Iyaqinisekisa..."</item>
+    <item msgid="3391238031431440676">"Ithola ikheli le-IP..."</item>
+    <item msgid="5257597310494000224">"Ixhunyiwe"</item>
+    <item msgid="8472497592913050396">"Kumiswe okwesikhashana"</item>
+    <item msgid="1228072488815999109">"Inqamula uxhumano kwi-inthanethi..."</item>
+    <item msgid="7253087004422991731">"Ayixhunyiwe kwi-inthanethi"</item>
+    <item msgid="4169850917304751227">"Akuphumelelanga"</item>
+    <item msgid="6266658166690831131">"Ivinjelwe"</item>
+    <item msgid="4517230805854909775">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="4853670665485437464"></item>
+    <item msgid="6816207058895999545">"Iyaskena..."</item>
+    <item msgid="8058143476674427024">"Ixhuma ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7547609081339573756">"Iqinisekisa nge <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="5145158315060185414">"Ithola ikheli le-IP kusuka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="3283243151651124831">"Ixhumeke ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="6600156231416890902">"Kumiswe okwesikhashana"</item>
+    <item msgid="4133290864821295785">"Inqamula kusuka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="3980154971187953257">"Ayixhunyiwe kwi-inthanethi"</item>
+    <item msgid="2847316776634969068">"Akuphumelelanga"</item>
+    <item msgid="4390990424746035383">"Ivinjelwe"</item>
+    <item msgid="3618248791367063949">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
+  </string-array>
+    <!-- no translation found for wifi_tether_security:0 (5586343370515598801) -->
+    <!-- no translation found for wifi_tether_security:1 (6136336549994615745) -->
+  <string-array name="wifi_p2p_wps_setup">
+    <item msgid="5390235347963255303">"Cindezela inkinobho"</item>
+    <item msgid="7401896200768713930">"Iphinikhodi kusuka kudivaysisi yabangani"</item>
+    <item msgid="4526848028011846710">"Iphinilkhodi kusuka kuledivaysi"</item>
+  </string-array>
+  <string-array name="wifi_p2p_status">
+    <item msgid="8741947238021758201">"Ixhunyiwe"</item>
+    <item msgid="983792611851499732">"Menyiwe"</item>
+    <item msgid="5438273405428201793">"Akuphumelelanga"</item>
+    <item msgid="4646663015449312554">"Iyatholakala"</item>
+    <item msgid="3230556734162006146">"Ikude nebanga"</item>
+  </string-array>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="8247986727324120082">"2 amaminithi"</item>
+    <item msgid="2759776603549270587">"5 amaminithi"</item>
+    <item msgid="167772676068860015">"1 ihora"</item>
+    <item msgid="5985477119043628504">"Ayiphelelwa isikhathi"</item>
+  </string-array>
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="3800257971619063588">"Sebenzisa okuzenzakalelayo kwesistimu: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="8572230405241423895">"1"</item>
+    <item msgid="5318020123964299318">"2"</item>
+    <item msgid="6429260054182662738">"3"</item>
+    <item msgid="1644506614010085798">"4"</item>
+    <item msgid="3132506679404897150">"5"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="1709949377823900951">"Akukuhle"</item>
+    <item msgid="7882129634982603782">"Akukuhle"</item>
+    <item msgid="6457357501905996224">"Kulungile"</item>
+    <item msgid="405271628162918841">"Kuhle"</item>
+    <item msgid="999948812884919584">"Kuhle kakhulu"</item>
+  </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="8986775481492954015">"Izinsuku zokugcina ezingu-30"</item>
+    <item msgid="3211287705232736964">"Isetha umjikelezo wokusebenzisa..."</item>
+  </string-array>
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="1266031014388516303">"Isikhathi sokusetshenziswa"</item>
+    <item msgid="2784401352592276015">"Isikhathi sokugcina ukusetshenziswa"</item>
+    <item msgid="249854287216326349">"Igama lohlelo lokusebenza"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="5538816743897530343">"I-PEAP"</item>
+    <item msgid="336771389015263226">"I-TLS"</item>
+    <item msgid="2124951724092063376">"I-TTLS"</item>
+    <item msgid="7427377376024106344">"I-PWD"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="8934819312374410084">"Lutho"</item>
+    <item msgid="8655686691660180616">"MSCHAPV2"</item>
+    <item msgid="1354245862267605928">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="7122038588318037831">"Lutho"</item>
+    <item msgid="212906109313512425">"MSCHAPV2"</item>
+    <item msgid="6333849991499980140">"GTC"</item>
+    <item msgid="6226796534844879034">"SIM"</item>
+    <item msgid="4600011056049114926">"AKA"</item>
+    <item msgid="5244120184217604552">"AKA\'"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="5865367433072785952">"Lutho"</item>
+    <item msgid="7901133332272818442">"I-PAP"</item>
+    <item msgid="8549879045980332977">"I-MSCHAP"</item>
+    <item msgid="7330627471456865502">"MSCHAPV2"</item>
+    <item msgid="6255179395132581882">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="2717196390555072244">"i-DHCP"</item>
+    <item msgid="4377002609760712163">"Kumile"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="9032900195127165132">"Lutho"</item>
+    <item msgid="1464741437353223198">"Ngokulawulwa"</item>
+    <item msgid="5793600062487886090">"Ukulungiselela ngokuzenzakalela kwephroksi"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="7099647881902405997">"Lutho"</item>
+    <item msgid="1950796738039490374">"I-PAP"</item>
+    <item msgid="8166687999538788787">"I-CHAP"</item>
+    <item msgid="1276004657191968988">"I-PAP noma i-CHAP"</item>
+  </string-array>
+  <string-array name="apn_protocol_entries">
+    <item msgid="4179023087537182757">"IPv4"</item>
+    <item msgid="9148582221081416020">"IPv6"</item>
+    <item msgid="4094895508821270572">"IPv4/IPv6"</item>
+  </string-array>
+  <string-array name="bearer_entries">
+    <item msgid="5231094118929435723">"(okungacacisiwe)"</item>
+    <item msgid="2740477081395679090">"I-LTE"</item>
+    <item msgid="1807866878276630064">"HSPAP"</item>
+    <item msgid="7945352669463358624">"I-HSPA"</item>
+    <item msgid="4152166097223929133">"I-HSUPA"</item>
+    <item msgid="5134662517319988296">"I-HSDPA"</item>
+    <item msgid="4997539146036732961">"I-UMTS"</item>
+    <item msgid="4910169712073083585">"I-EDGE"</item>
+    <item msgid="3505904588897578792">"I-GPRS"</item>
+    <item msgid="7246853278334311652">"eHRPD"</item>
+    <item msgid="7037248100126710307">"EVDO_B"</item>
+    <item msgid="3440758673769932256">"EVDO_A"</item>
+    <item msgid="1782525731958596741">"EVDO_0"</item>
+    <item msgid="1819765960790884441">"1xRTT"</item>
+    <item msgid="3148192102183107944">"IS95B"</item>
+    <item msgid="3778273775365258534">"IS95A"</item>
+  </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="6984770764726663331">"Lutho"</item>
+    <item msgid="1469208769491004112">"SPN"</item>
+    <item msgid="7556656048009090524">"IMSI"</item>
+    <item msgid="8636516530542473799">"GID"</item>
+  </string-array>
+  <string-array name="app_install_location_entries">
+    <item msgid="6621866711026016227">"Isitoreji sedivaysi yangaphakathi"</item>
+    <item msgid="3186681694079967527">"Khipha ikhadi le-SD"</item>
+    <item msgid="6902033473986647035">"Vumela isistimu inqume"</item>
+  </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="1102693344156734891">"Indawo"</item>
+    <item msgid="6842381562497597649">"Okomuntu siqu"</item>
+    <item msgid="3966700236695683444">"Imilayezo"</item>
+    <item msgid="8563996233342430477">"Imidiya"</item>
+    <item msgid="5323851085993963783">"Idivayisi"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="2585253854462134715">"indawo emaholoholo"</item>
+    <item msgid="1830619568689922920">"indawo elungile"</item>
+    <item msgid="3317274469481923141">"I-GPS"</item>
+    <item msgid="8931785990160383356">"dlidliza"</item>
+    <item msgid="8632513128515114092">"funda oxhumana nabo"</item>
+    <item msgid="3741042113569620272">"shintsha oxhumana nabo"</item>
+    <item msgid="4204420969709009931">"funda irekhodi lwamakholi"</item>
+    <item msgid="2260380357119423209">"shintsha irekhodi lwamakholi"</item>
+    <item msgid="6550710385014530934">"funda ikhalenda"</item>
+    <item msgid="3575906174264853951">"shintsha ikhalenda"</item>
+    <item msgid="4319843242568057174">"isikeni se-Wi-Fi"</item>
+    <item msgid="2981791890467303819">"isaziso"</item>
+    <item msgid="6617825156152476692">"ukuskena iseli"</item>
+    <item msgid="8865260890611559753">"shayela ifoni"</item>
+    <item msgid="3254999273961542982">"funda i-SMS"</item>
+    <item msgid="7711446453028825171">"bhala i-SMS"</item>
+    <item msgid="6123238544099198034">"thola i-SMS"</item>
+    <item msgid="838342167431596036">"thola i-SMS yezimo eziphuthumayo"</item>
+    <item msgid="8554432731560956686">"thola i-MMS"</item>
+    <item msgid="7464863464299515059">"thola ukuphushwa kwe-WAP"</item>
+    <item msgid="310463075729606765">"Thumela i-SMS"</item>
+    <item msgid="7338021933527689514">"Funda i-ICC SMS"</item>
+    <item msgid="6130369335466613036">"bhala i-ICC SMS"</item>
+    <item msgid="6536865581421670942">"shintsha izilungiselelo"</item>
+    <item msgid="4547203129183558973">"dweba ngaphezulu"</item>
+    <item msgid="9080347512916542840">"finyelela kuzaziso"</item>
+    <item msgid="5332718516635907742">"ikhamera"</item>
+    <item msgid="6098422447246167852">"qopha umsindo"</item>
+    <item msgid="9182794235292595296">"dlala umsindo"</item>
+    <item msgid="8760743229597702019">"funda ibhodi lokunamathisela"</item>
+    <item msgid="2266923698240538544">"shintsha ibhodi lokunamathisela"</item>
+    <item msgid="1801619438618539275">"izinkinobho zabezindaba"</item>
+    <item msgid="31588119965784465">"ukugxila komsindo"</item>
+    <item msgid="7565226799008076833">"ivolumu kangqo"</item>
+    <item msgid="5420704980305018295">"ivolumu yezwi"</item>
+    <item msgid="5797363115508970204">"ivolumu yokukhala"</item>
+    <item msgid="8233154098550715999">"ivolumu yabezindaba"</item>
+    <item msgid="5196715605078153950">"ivolumu ye-alamu"</item>
+    <item msgid="394030698764284577">"ivolumu yesaziso"</item>
+    <item msgid="8952898972491680178">"ivolumu ye-bluetooth"</item>
+    <item msgid="8506227454543690851">"gcina kuphapheme"</item>
+    <item msgid="1108160036049727420">"ngamela indawo"</item>
+    <item msgid="1496205959751719491">"yongamela indawo yamandla aphezulu"</item>
+    <item msgid="3776296279910987380">"thola izibalo zokusebenzisa"</item>
+    <item msgid="8827100324471975602">"thulisa/yekisa ukuthulisa imakrofoni"</item>
+    <item msgid="6880736730520126864">"bonisa i-toast"</item>
+    <item msgid="4933375960222609935">"imidiya yephrojekthi"</item>
+    <item msgid="8357907018938895462">"sebenzisa i-VPN"</item>
+    <item msgid="8143812849911310973">"bhala isithombe-skrini"</item>
+    <item msgid="6266277260961066535">"ukulekelela ukwakheka"</item>
+    <item msgid="7715498149883482300">"ukulekelela isithombe-skrini"</item>
+    <item msgid="4046679376726313293">"funda isimo sefoni"</item>
+    <item msgid="6329507266039719587">"engeza ivoyisimeyili"</item>
+    <item msgid="7692440726415391408">"sebenzisa i-sip"</item>
+    <item msgid="8572453398128326267">"cubungula ikholi ephumayo"</item>
+    <item msgid="7775674394089376306">"izigxivizo zeminwe"</item>
+    <item msgid="3182815133441738779">"izinzwa zomzimba"</item>
+    <item msgid="2793100005496829513">"funda ukusakaza kweseli"</item>
+    <item msgid="2633626056029384366">"hlekisa ngendawo"</item>
+    <item msgid="8356842191824684631">"funda isitoreji"</item>
+    <item msgid="5671906070163291500">"bhala isitoreji"</item>
+    <item msgid="2791955098549340418">"vula isikrini"</item>
+    <item msgid="5599435119609178367">"thola ama-akhawunti"</item>
+    <item msgid="1165623660533024666">"sebenzisa emuva"</item>
+    <item msgid="6423861043647911030">"ivolumu yokufinyeleleka"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="7892361636570580123">"Indawo"</item>
+    <item msgid="6656077694190491067">"Indawo"</item>
+    <item msgid="8790228218278477369">"Indawo"</item>
+    <item msgid="7836406246005211990">"Dlidliza"</item>
+    <item msgid="3951439024549922598">"Funda oxhumana nabo"</item>
+    <item msgid="8802152411647068">"Shintsha oxhumana nabo"</item>
+    <item msgid="229544934599698735">"Funda irekhodi lwamakholi"</item>
+    <item msgid="7396102294405899613">"Shintsha irekhodi lwamakholi"</item>
+    <item msgid="3597797992398484655">"Funda ikhalenda"</item>
+    <item msgid="2705975774250907343">"Shintsha ikhalenda"</item>
+    <item msgid="4668747371441932697">"Indawo"</item>
+    <item msgid="1487578921720243646">"Isaziso sokuthunyelwe"</item>
+    <item msgid="4636080349724146638">"Indawo"</item>
+    <item msgid="673510900286463926">"Shayela ifoni"</item>
+    <item msgid="542083422784609790">"Funda i-SMS/MMS"</item>
+    <item msgid="1033780373029588436">"Bhala i-SMS/MMS"</item>
+    <item msgid="5647111115517787488">"Thola i-SMS/MMS"</item>
+    <item msgid="8591105601108455893">"Thola i-SMS/MMS"</item>
+    <item msgid="7730995008517841903">"Thola i-SMS/MMS"</item>
+    <item msgid="2613033109026626086">"Thola i-SMS/MMS"</item>
+    <item msgid="3037159047591081136">"Thumela i-SMS/MMS"</item>
+    <item msgid="4726682243833913568">"Funda i-SMS/MMS"</item>
+    <item msgid="6555678522277865572">"Bhala i-SMS/MMS"</item>
+    <item msgid="6981734935578130884">"Shintsha izilungiselelo"</item>
+    <item msgid="8705854389991425629">"Dweba ngaphezulu"</item>
+    <item msgid="5861356020344153651">"Finyelela kuzaziso"</item>
+    <item msgid="78432174621628659">"Ikhamera"</item>
+    <item msgid="3986116419882154794">"Qopha umsindo"</item>
+    <item msgid="4516840825756409490">"Dlala umsindo"</item>
+    <item msgid="6811712502798183957">"Funda ibhodi lokunamathisela"</item>
+    <item msgid="2780369012602289114">"Shintsha ibhodi lokunamathisela"</item>
+    <item msgid="2331359440170850868">"Izinkinobho zabezindaba"</item>
+    <item msgid="6133599737122751231">"Ukugxila komsindo"</item>
+    <item msgid="6844485713404805301">"Ivolumu kangqo"</item>
+    <item msgid="1600379420669104929">"Ivolumu yezwi"</item>
+    <item msgid="6296768210470214866">"Ivolumu yokukhala"</item>
+    <item msgid="510690696071629241">"Ivolumu yabezindaba"</item>
+    <item msgid="406861638631430109">"Ivolumu ye-alamu"</item>
+    <item msgid="4715864795872233884">"Ivolumu yesaziso"</item>
+    <item msgid="2311478519251301183">"Ivolumu ye-Bluetooth"</item>
+    <item msgid="5133991377896747027">"Gcina kuphapheme"</item>
+    <item msgid="2464189519136248621">"Indawo"</item>
+    <item msgid="2062677934050803037">"Indawo"</item>
+    <item msgid="1735171933192715957">"Thola izibalo zokusebenzisa"</item>
+    <item msgid="1014093788778383554">"Thulisa/yekisa ukuthulisa imakrofoni"</item>
+    <item msgid="4199297950608622850">"Bonisa i-toast"</item>
+    <item msgid="2527962435313398821">"Imidiya yephrojekthi"</item>
+    <item msgid="5117506254221861929">"Sebenzisa i-VPN"</item>
+    <item msgid="8291198322681891160">"Bhala isithombe sangemuva"</item>
+    <item msgid="7106921284621230961">"Ukulekelela ukwakheka"</item>
+    <item msgid="4496533640894624799">"Ukulekelela isithombe-skrini"</item>
+    <item msgid="2598847264853993611">"Funda isimo sefoni"</item>
+    <item msgid="9215610846802973353">"Engeza ivoyisimeyili"</item>
+    <item msgid="9186411956086478261">"Sebenzisa i-sip"</item>
+    <item msgid="6884763100104539558">"Cubungula ikholi ephumayo"</item>
+    <item msgid="125513972170580692">"Izigxivizo zeminwe"</item>
+    <item msgid="2556071024281275619">"Izinzwa zomzimba"</item>
+    <item msgid="617168514928339387">"Funda ukusakaza kweselula"</item>
+    <item msgid="7134693570516523585">"Hlekisa ngendawo"</item>
+    <item msgid="7224489175375229399">"Funda isitoreji"</item>
+    <item msgid="8472735063903258202">"Bhala isitoreji"</item>
+    <item msgid="4069276819909595110">"Vula isikrini"</item>
+    <item msgid="1228338896751121025">"Thola ama-akhawunti"</item>
+    <item msgid="3181581793459233672">"Sebenzisa emuva"</item>
+    <item msgid="2340936043025374076">"Ivolumu yokufinyeleleka"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="8950313530602254787">"Kufushane"</item>
+    <item msgid="4816511817309094890">"Okumaphakathi"</item>
+    <item msgid="8305084671259331134">"Kude"</item>
+  </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="6928465258504250174">"Okuzenzakalelayo"</item>
+    <item msgid="4147246073737933622">"I-Sans Serif"</item>
+    <item msgid="3117680749167407907">"I-Sans-serif ejiyisiwe"</item>
+    <item msgid="6529379119163117545">"Sans-serif monospace"</item>
+    <item msgid="1487203730637617924">"I-Serif"</item>
+    <item msgid="4937790671987480464">"I-Serif monospace"</item>
+    <item msgid="4448481989108928248">"Okuvamile"</item>
+    <item msgid="4627069151979553527">"Ngokutshekile"</item>
+    <item msgid="6896773537705206194">"Izinhlamvukazi ezincane"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="1680223634161592855">"Kuncane kakhulu"</item>
+    <item msgid="5091603983404027034">"Kuncane"</item>
+    <item msgid="176844712416932112">"Jwayelekile"</item>
+    <item msgid="2784236342175159295">"Okukhulu"</item>
+    <item msgid="218913203203160606">"Kukhulu kakhulu"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="3865198759294188069">"Okuzenzakalelayo"</item>
+    <item msgid="6488643537808152001">"Lutho"</item>
+    <item msgid="552332815156010137">"Uhlaka"</item>
+    <item msgid="7187891159463789272">"Yehlisa amafu"</item>
+    <item msgid="8019330250538856521">"Kukhushuliwe"</item>
+    <item msgid="8987385315647049787">"Icindezelwe phansi"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="313003243371588365">"25%"</item>
+    <item msgid="4665048002584838262">"50%"</item>
+    <item msgid="1874668269931014581">"75%"</item>
+    <item msgid="6462911487571123954">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="326819345272910536">"Sebenzisa okuzenzakalelayo kohlelo lokusebenza"</item>
+    <item msgid="8611890312638868524">"Okumhlophe kokumnyama"</item>
+    <item msgid="5891360837786277638">"Okumnyama kokumhlophe"</item>
+    <item msgid="2798457065945456853">"Okuliphuzi kokumnyama"</item>
+    <item msgid="5799049811524553967">"Okuliphuzi kokuluhlaza"</item>
+    <item msgid="3673930830658169860">"Okwezifiso"</item>
+  </string-array>
+  <string-array name="vpn_types_long">
+    <item msgid="6566768880689730097">"PPTP VPN"</item>
+    <item msgid="1349760781118368659">"i-L2TP/IPSec VPN nokhiye okwabeliswaniwa ngabo"</item>
+    <item msgid="6128519070545038358">"i-L2TP/IPSec VPN ngezitifiketi"</item>
+    <item msgid="312397853907741968">"i-IPSec VPN nokhiye ababelanwe ngabo nokufakazela ubuqiniso be-Xauth"</item>
+    <item msgid="3319427315593649917">"i-IPSec VPN kanye nezitifiketi nokufakazela ubuqiniso be-Xauth"</item>
+    <item msgid="8258927774145391041">"i-IPSec VPN nezitifiketi nokufakazela ubuqiniso nge-hybrid"</item>
+  </string-array>
+  <string-array name="vpn_proxy_settings">
+    <item msgid="2958623927055120839">"Lutho"</item>
+    <item msgid="1157046369795346308">"Ngokulawulwa"</item>
+  </string-array>
+  <string-array name="vpn_states">
+    <item msgid="5408915841694583740">"Ayixhunyiwe kwi-inthanethi"</item>
+    <item msgid="8754480102834556765">"Iyaqalisa..."</item>
+    <item msgid="3351334355574270250">"Iyaxhuma kwi-inthanethi..."</item>
+    <item msgid="8303882153995748352">"Ixhunyiwe"</item>
+    <item msgid="9135049670787351881">"Isikhathi siphelile"</item>
+    <item msgid="2124868417182583926">"Akuphumelelanga"</item>
+  </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="1164265643455394443">"Buza"</item>
+    <item msgid="7718817231348607934">"Ungavumeli"</item>
+    <item msgid="8184570120217958741">"Vumela njalo?"</item>
+  </string-array>
+    <!-- no translation found for ram_states:0 (708247372474061274) -->
+    <!-- no translation found for ram_states:4 (1567326459340152525) -->
+    <!-- no translation found for proc_stats_memory_states:3 (8577246509202964244) -->
+  <string-array name="proc_stats_process_states">
+    <item msgid="7560955722349181440">"Qhubekayo"</item>
+    <item msgid="167418068739176448">"Umsebenzi ophezulu"</item>
+    <item msgid="4760813290195199773">"Kubalulekile (okungaphambili)"</item>
+    <item msgid="2328684826817647595">"Kubalulekile (okungemuva)"</item>
+    <item msgid="7746406490652867365">"Sekela ngokulondoloza"</item>
+    <item msgid="5597404364389196754">"Isisindo esikhulu"</item>
+    <item msgid="1290888779300174556">"Isevisi (iyenzakala)"</item>
+    <item msgid="7241098542073939046">"Isevisi (iqala kabusha)"</item>
+    <item msgid="6610439017684111046">"Isamukeli"</item>
+    <item msgid="7367606086319921117">"Ikhaya"</item>
+    <item msgid="3344660712396741826">"Umsebenzi wokugcina"</item>
+    <item msgid="5006559348883303865">"Kulondoloziwe (umsebenzi)"</item>
+    <item msgid="8633480732468137525">"Kulondoloziwe (iklayenti lomsebenzi)"</item>
+    <item msgid="6248998242443333892">"Kulondoloziwe (lutho)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="3151827842194201728">"Okuluhlaza ngokujiyile"</item>
+    <item msgid="3228505970082457852">"Okuluhlaza okwesibhakabhaka"</item>
+    <item msgid="6590260735734795647">"I-Indigo"</item>
+    <item msgid="3521763377357218577">"Phephuli"</item>
+    <item msgid="5932337981182999919">"Ophinki"</item>
+    <item msgid="5642914536624000094">"Okubomvu"</item>
+  </string-array>
+  <string-array name="automatic_storage_management_days">
+    <item msgid="2860293514533486236">"Ngaphezulu kobudala obuyizinsuku ezingu-30"</item>
+    <item msgid="8699273238891265610">"Ngaphezulu kobudala obuyizinsuku ezingu-60"</item>
+    <item msgid="8346279419423837266">"Ngaphezulu kobudala obuyizinsuku ezingu-90"</item>
+  </string-array>
+    <!-- no translation found for swipe_direction_titles:0 (6583090603341402282) -->
+    <!-- no translation found for swipe_direction_titles:1 (4965730704403236310) -->
+  <string-array name="swipe_direction_values">
+    <item msgid="5298569105095026382">"1"</item>
+    <item msgid="3118234477029486741">"0"</item>
+  </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="4329206416008519163">"Thola ngokuzenzakalela"</item>
+    <item msgid="773943026484148895">"Phatha njengokulinganisiwe"</item>
+    <item msgid="1008268820118852416">"Phatha njengokungalinganisiwe"</item>
+  </string-array>
+  <string-array name="wifi_privacy_entries">
+    <item msgid="6545683814310036454">"Sebenzisa i-MAC engahleliwe (okuzenzakalelayo)"</item>
+    <item msgid="214234417308375326">"Sebenzisa i-MAC yedivayisi"</item>
+  </string-array>
+  <string-array name="wifi_hidden_entries">
+    <item msgid="7426878022650940844">"Cha"</item>
+    <item msgid="1930581185557754880">"Yebo"</item>
+  </string-array>
+  <string-array name="dark_ui_mode_entries">
+    <item msgid="699295711155561081">"Emnyama"</item>
+    <item msgid="5079453644557603349">"Ukukhanya"</item>
+  </string-array>
+  <string-array name="autofill_logging_level_entries">
+    <item msgid="6882729786516723474">"Valiwe"</item>
+    <item msgid="4072198137051566919">"Susa iphutha"</item>
+    <item msgid="2473005316958868509">"I-Verbose"</item>
+  </string-array>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="8444727359525554695">"Ekhaya kuphela"</item>
+    <item msgid="1161026694891024702">"Okuzenzakalelayo"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="1823884522189328861">"Okukhethwayo kwe-GSM / WCDMA"</item>
+    <item msgid="7581481130337402578">"I-GSM kuphela"</item>
+    <item msgid="8579197487913425819">"I-WCDMA kuphela"</item>
+    <item msgid="8465243227505412498">"Okuzenzakalelayo kwe-GSM /WCDMA"</item>
+    <item msgid="9107479914166352132">"I-CDMA / EvDo ezenzakalelayo"</item>
+    <item msgid="4219607161971472471">"I-CDMA w/o EvDo"</item>
+    <item msgid="7278975240951052041">"I-EvDo kuphela"</item>
+    <item msgid="2295969832276827854">"I-CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="9059227943989034424">"I-CDMA + LTE/EvDo"</item>
+    <item msgid="463168068025354541">"I-GSM/WCDMA/LTE"</item>
+    <item msgid="1770755308983338311">"Okomhlaba jikelele"</item>
+    <item msgid="5713723042183940349">"i-LTE"</item>
+    <item msgid="8600184258612405670">"I-LTE / WCDMA"</item>
+    <item msgid="5638632460322750180">"I-TDSCDMA kuphela"</item>
+    <item msgid="4346392996298714633">"I-TDSCDMA/WCDMA"</item>
+    <item msgid="5004811216708487615">"I-LTE/TDSCDMA"</item>
+    <item msgid="9191730167201068525">"I-TDSCDMA/GSM"</item>
+    <item msgid="5874623229495009031">"I-LTE/TDSCDMA/GSM"</item>
+    <item msgid="5096480046347789213">"I-TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2075445917638134012">"I-LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3353351554070857366">"I-LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="2067289929099567494">"I-TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4959483620561891661">"I-LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="7691437408632563841">"I-RUIM/SIM"</item>
+    <item msgid="6219184455685527822">"NV"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="5675987537637081766">"Okomhlaba jikelele"</item>
+    <item msgid="7893851358184700811">"I-LTE / CDMA"</item>
+    <item msgid="1779116915491192719">"I-LTE / GSM / UMTS"</item>
+  </string-array>
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4760531919194480665) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (7912365765185450743) -->
+    <!-- no translation found for enhanced_4g_lte_mode_title_variant:2 (2104740586531949003) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:0 (852926015619722843) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:1 (3792510685855718883) -->
+    <!-- no translation found for enhanced_4g_lte_mode_sumary_variant:2 (1377977453734193662) -->
+</resources>
diff --git a/tests/CarDeveloperOptions/res/values-zu/strings.xml b/tests/CarDeveloperOptions/res/values-zu/strings.xml
index 3fbc30f..6aec398 100644
--- a/tests/CarDeveloperOptions/res/values-zu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zu/strings.xml
@@ -481,8 +481,7 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="2998863111689476550">"Vikela ithebulethi yakho ngenketho yokukhiya isikrini ukuze kungabikho muntu ozokwazi ukuyisebenzisa uma ilahlekile noma itshontshiwe. Futhi udinga inketho yokukhiya isikrini ukusetha ukugunyaza kobuso. Thepha okuthi Khansela, bese setha i-PIN noma khetha enye inketho yokukhiya isikrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="6780557259734235952">"Vikela idivayisi yakho ngenketho yokukhiya isikrini ukuze kungabikho muntu ozokwazi ukuyisebenzisa uma ilahlekile noma itshontshiwe. Futhi udinga inketho yokukhiya isikrini ukusetha ukugunyaza kobuso. Thepha okuthi Khansela, bese setha i-PIN noma khetha enye inketho yokukhiya isikrini."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="8541640018478926775">"Vikela ifoni yakho ngenketho yokukhiya isikrini ukuze kungabikho muntu ozokwazi ukuyisebenzisa uma ilahlekile noma itshontshiwe. Futhi udinga inketho yokukhiya isikrini ukusetha ukugunyaza kobuso. Thepha okuthi Khansela, bese setha i-PIN noma khetha enye inketho yokukhiya isikrini."</string>
-    <!-- no translation found for lock_screen_pin_skip_title (8217519439213393785) -->
-    <skip />
+    <string name="lock_screen_pin_skip_title" msgid="8217519439213393785">"Yeqa ukusetha i-PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="3725788215672959827">"Yeqa ukusetha iphasiwedi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="4237030500353932005">"Yeqa ukusetha iphethini?"</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="9036983528330627756">"Hlela ukuvala isikrini"</string>
@@ -1092,8 +1091,11 @@
     <item msgid="2552412793005571845">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
     <item msgid="742811521969300868">"@*android:string/wfc_mode_wifi_only_summary"</item>
   </string-array>
-    <!-- no translation found for wifi_calling_mode_choices_v2:0 (9149346657812979257) -->
-    <!-- no translation found for wifi_calling_mode_choices_v2:2 (6007360612667098926) -->
+  <string-array name="wifi_calling_mode_choices_v2">
+    <item msgid="9149346657812979257">"I-Wi-Fi"</item>
+    <item msgid="4421333712484542489">"Iselula"</item>
+    <item msgid="6007360612667098926">"I-Wi-Fi kuphela"</item>
+  </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="3658897985297386665">"@*android:string/wfc_mode_wifi_preferred_summary"</item>
     <item msgid="4191802193352447215">"@*android:string/wfc_mode_cellular_preferred_summary"</item>
@@ -4273,6 +4275,8 @@
     <string name="disabled_feature_reason_slow_down_phone" msgid="1819157849156814583">"Izokwehlisa le foni"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="3397182995626655581">"Phoqa izikali ezigcwele ze-GNSS"</string>
     <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="2469305990718976105">"Landelela onke ama-constellation nezimvamisa ngomjikelezo ongenawo umsebenzi"</string>
+    <string name="enable_user_switch_message" msgid="8613014373053051092">"Susa iphutha lokushintsha umsebenzisi"</string>
+    <string name="enable_user_switch_message_summary" msgid="3354160264601132060">"Bonisa ukwaziswa okuningiliziwe phakathi nokushintsha umsebenzisi"</string>
     <string name="allow_background_activity_starts" msgid="6754016668813082728">"Vumela ukuqala komsebenzi ongemuva"</string>
     <string name="allow_background_activity_starts_summary" msgid="8170749270869606692">"Ivumela konke ukuqala komsebenzi ongemuva"</string>
     <string name="show_first_crash_dialog" msgid="3682063068903692710">"Njalo bonisa ibhokisi lokusaphazeka"</string>
diff --git a/tests/CarDeveloperOptions/res/values/strings.xml b/tests/CarDeveloperOptions/res/values/strings.xml
index b605aec..130cfb9 100644
--- a/tests/CarDeveloperOptions/res/values/strings.xml
+++ b/tests/CarDeveloperOptions/res/values/strings.xml
@@ -10401,6 +10401,11 @@
     <!-- UI debug setting: preference summary - describes the behavior of forcing full raw GNSS satellite measurements [CHAR LIMIT=NONE] -->
     <string name="enable_gnss_raw_meas_full_tracking_summary">Track all GNSS constellations and frequencies with no duty cycling</string>
 
+    <!-- UI debug setting: preference title - switch to enable extra debug information when switching user [CHAR LIMIT=60] -->
+    <string name="enable_user_switch_message">Debug user switch</string>
+    <!-- UI debug setting: preference summary - describes the behavior of showing detailed information during user switch [CHAR LIMIT=NONE] -->
+    <string name="enable_user_switch_message_summary">Show detailed information during user switch</string>
+
     <!-- UI debug setting: preference title - allow background activity starts [CHAR LIMIT=60] -->
     <string name="allow_background_activity_starts">Allow background activity starts</string>
     <!-- UI debug setting: preference summary - describes the behavior of allowing background activity starts [CHAR LIMIT=NONE] -->
diff --git a/tests/CarDeveloperOptions/res/xml/development_settings.xml b/tests/CarDeveloperOptions/res/xml/development_settings.xml
index 9ed1285..26ffe3d 100644
--- a/tests/CarDeveloperOptions/res/xml/development_settings.xml
+++ b/tests/CarDeveloperOptions/res/xml/development_settings.xml
@@ -30,11 +30,6 @@
             android:summary="@string/summary_placeholder"
             android:fragment="com.android.car.developeroptions.applications.ProcessStatsSummary" />
 
-        <com.android.car.developeroptions.BugreportPreference
-            android:key="bugreport"
-            android:title="@*android:string/bugreport_title"
-            android:dialogTitle="@*android:string/bugreport_title" />
-
         <Preference
             android:key="system_server_heap_dump"
             android:title="@string/capture_system_heap_dump_title" />
@@ -151,11 +146,6 @@
             android:summary="@string/enable_terminal_summary" />
 
         <SwitchPreference
-            android:key="bugreport_in_power"
-            android:title="@string/bugreport_in_power"
-            android:summary="@string/bugreport_in_power_summary" />
-
-        <SwitchPreference
             android:key="automatic_system_server_heap_dumps"
             android:title="@string/automatic_system_heap_dump_title"
             android:summary="@string/automatic_system_heap_dump_summary" />
@@ -169,6 +159,11 @@
             android:summary="@string/enable_gnss_raw_meas_full_tracking_summary" />
 
         <SwitchPreference
+            android:key="enable_user_switch_message"
+            android:title="@string/enable_user_switch_message"
+            android:summary="@string/enable_user_switch_message_summary" />
+
+        <SwitchPreference
             android:key="debug_view_attributes"
             android:title="@string/debug_view_attributes" />
 
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/BugreportPreference.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/BugreportPreference.java
deleted file mode 100644
index 6acef70..0000000
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/BugreportPreference.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.developeroptions;
-
-import android.app.ActivityManager;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.RemoteException;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.CheckedTextView;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AlertDialog.Builder;
-
-import com.android.car.developeroptions.overlay.FeatureFactory;
-import com.android.settingslib.CustomDialogPreferenceCompat;
-
-public class BugreportPreference extends CustomDialogPreferenceCompat {
-
-    private static final String TAG = "BugreportPreference";
-
-    private CheckedTextView mInteractiveTitle;
-    private TextView mInteractiveSummary;
-    private CheckedTextView mFullTitle;
-    private TextView mFullSummary;
-
-    public BugreportPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(Builder builder, DialogInterface.OnClickListener listener) {
-        super.onPrepareDialogBuilder(builder, listener);
-
-        final View dialogView = View.inflate(getContext(), R.layout.bugreport_options_dialog, null);
-        mInteractiveTitle = (CheckedTextView) dialogView.findViewById(R.id.bugreport_option_interactive_title);
-        mInteractiveSummary = (TextView) dialogView.findViewById(R.id.bugreport_option_interactive_summary);
-        mFullTitle = (CheckedTextView) dialogView.findViewById(R.id.bugreport_option_full_title);
-        mFullSummary = (TextView) dialogView.findViewById(R.id.bugreport_option_full_summary);
-        final View.OnClickListener l = new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                if (v == mFullTitle || v == mFullSummary) {
-                    mInteractiveTitle.setChecked(false);
-                    mFullTitle.setChecked(true);
-                }
-                if (v == mInteractiveTitle || v == mInteractiveSummary) {
-                    mInteractiveTitle.setChecked(true);
-                    mFullTitle.setChecked(false);
-                }
-            }
-        };
-        mInteractiveTitle.setOnClickListener(l);
-        mFullTitle.setOnClickListener(l);
-        mInteractiveSummary.setOnClickListener(l);
-        mFullSummary.setOnClickListener(l);
-
-        builder.setPositiveButton(com.android.internal.R.string.report, listener);
-        builder.setView(dialogView);
-    }
-
-    @Override
-    protected void onClick(DialogInterface dialog, int which) {
-        if (which == DialogInterface.BUTTON_POSITIVE) {
-
-            final Context context = getContext();
-            if (mFullTitle.isChecked()) {
-                Log.v(TAG, "Taking full bugreport right away");
-                FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
-                        SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
-                takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL);
-            } else {
-                Log.v(TAG, "Taking interactive bugreport right away");
-                FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
-                        SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);
-                takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);
-            }
-        }
-    }
-
-    private void takeBugreport(int bugreportType) {
-        try {
-            ActivityManager.getService().requestBugReport(bugreportType);
-        } catch (RemoteException e) {
-            Log.e(TAG, "error taking bugreport (bugreportType=" + bugreportType + ")", e);
-        }
-    }
-}
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceEnrollSidecar.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceEnrollSidecar.java
index a0520e4..a082029 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceEnrollSidecar.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceEnrollSidecar.java
@@ -52,7 +52,7 @@
             mFaceManager.setActiveUser(mUserId);
         }
 
-        mFaceManager.enroll(mToken, mEnrollmentCancel,
+        mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
                 mEnrollmentCallback, mDisabledFeatures);
     }
 
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceSettingsAttentionPreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceSettingsAttentionPreferenceController.java
index 19df0fe..a9b8ad0 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceSettingsAttentionPreferenceController.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/biometrics/face/FaceSettingsAttentionPreferenceController.java
@@ -95,7 +95,8 @@
         }
         // Set to disabled until we know the true value.
         mPreference.setEnabled(false);
-        mFaceManager.getFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, mGetFeatureCallback);
+        mFaceManager.getFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION,
+                mGetFeatureCallback);
 
         // Ideally returns a cached value.
         return true;
@@ -107,8 +108,8 @@
         mPreference.setEnabled(false);
         mPreference.setChecked(isChecked);
 
-        mFaceManager.setFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked, mToken,
-                mSetFeatureCallback);
+        mFaceManager.setFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked,
+                mToken, mSetFeatureCallback);
         return true;
     }
 
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datausage/DataSaverBackend.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datausage/DataSaverBackend.java
index 78d55e8..c10b2b2 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datausage/DataSaverBackend.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/datausage/DataSaverBackend.java
@@ -23,6 +23,7 @@
 import android.net.INetworkPolicyListener;
 import android.net.NetworkPolicyManager;
 import android.os.RemoteException;
+import android.telephony.SubscriptionPlan;
 import android.util.SparseIntArray;
 
 import com.android.car.developeroptions.overlay.FeatureFactory;
@@ -201,6 +202,10 @@
         @Override
         public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
         }
+
+        @Override
+        public void onSubscriptionPlansChanged(int subId, SubscriptionPlan[] plans) {
+        }
     };
 
     public interface Listener {
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/BugReportInPowerPreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/BugReportInPowerPreferenceController.java
deleted file mode 100644
index 1f22eb2..0000000
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/BugReportInPowerPreferenceController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.developeroptions.development;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.car.developeroptions.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class BugReportInPowerPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
-
-    private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";
-
-    @VisibleForTesting
-    static int SETTING_VALUE_ON = 1;
-    @VisibleForTesting
-    static int SETTING_VALUE_OFF = 0;
-
-    private final UserManager mUserManager;
-
-    public BugReportInPowerPreferenceController(Context context) {
-        super(context);
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_BUGREPORT_IN_POWER;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean isEnabled = (Boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Global.BUGREPORT_IN_POWER_MENU,
-                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
-        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
-        ((SwitchPreference) mPreference).setChecked(false);
-    }
-}
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/BugReportPreferenceController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/BugReportPreferenceController.java
deleted file mode 100644
index 28fb9b5..0000000
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/BugReportPreferenceController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.developeroptions.development;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import com.android.car.developeroptions.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class BugReportPreferenceController extends DeveloperOptionsPreferenceController implements
-        PreferenceControllerMixin {
-
-    private static final String KEY_BUGREPORT = "bugreport";
-
-    private final UserManager mUserManager;
-
-    public BugReportPreferenceController(Context context) {
-        super(context);
-
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_BUGREPORT;
-    }
-}
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java
index 95c8b6a..33bd3ca 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java
@@ -403,7 +403,6 @@
             BluetoothA2dpConfigStore bluetoothA2dpConfigStore) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new MemoryUsagePreferenceController(context));
-        controllers.add(new BugReportPreferenceController(context));
         controllers.add(new SystemServerHeapDumpPreferenceController(context));
         controllers.add(new LocalBackupPasswordPreferenceController(context));
         controllers.add(new StayAwakePreferenceController(context, lifecycle));
@@ -418,7 +417,6 @@
         controllers.add(new AdbPreferenceController(context, fragment));
         controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
         controllers.add(new LocalTerminalPreferenceController(context));
-        controllers.add(new BugReportInPowerPreferenceController(context));
         controllers.add(new AutomaticSystemServerHeapDumpPreferenceController(context));
         controllers.add(new MockLocationAppPreferenceController(context, fragment));
         controllers.add(new DebugViewAttributesPreferenceController(context));
@@ -481,6 +479,7 @@
         controllers.add(new DesktopModePreferenceController(context));
         controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
         controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
+        controllers.add(new EnableUserSwitchMessageController(context));
         controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
         controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
         controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/EnableUserSwitchMessageController.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/EnableUserSwitchMessageController.java
new file mode 100644
index 0000000..574aa4d
--- /dev/null
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/EnableUserSwitchMessageController.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.developeroptions.development;
+
+import static android.car.settings.CarSettings.Global.ENABLE_USER_SWITCH_DEVELOPER_MESSAGE;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.car.developeroptions.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public final class EnableUserSwitchMessageController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String ENABLE_USER_SWITCH_MESSAGE_KEY = "enable_user_switch_message";
+
+    private static final String SETTING_VALUE_ON = "true";
+    private static final String SETTING_VALUE_OFF = "false";
+
+    public EnableUserSwitchMessageController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ENABLE_USER_SWITCH_MESSAGE_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Global.putString(mContext.getContentResolver(),
+                ENABLE_USER_SWITCH_DEVELOPER_MESSAGE,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String enableUserSwitchDeveloperMessage = Settings.Global.getString(
+                mContext.getContentResolver(),
+                ENABLE_USER_SWITCH_DEVELOPER_MESSAGE);
+        ((SwitchPreference) mPreference)
+                .setChecked(SETTING_VALUE_ON.equals(enableUserSwitchDeveloperMessage));
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        Settings.Global.putString(mContext.getContentResolver(),
+                ENABLE_USER_SWITCH_DEVELOPER_MESSAGE, SETTING_VALUE_OFF);
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+}
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/wifi/NetworkRequestDialogFragment.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/wifi/NetworkRequestDialogFragment.java
index 6309b42..6c32f5c 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/wifi/NetworkRequestDialogFragment.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/wifi/NetworkRequestDialogFragment.java
@@ -310,7 +310,7 @@
         mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
 
         if (mFilterWifiTracker == null) {
-            mFilterWifiTracker = new FilterWifiTracker(getActivity(), getSettingsLifecycle());
+            mFilterWifiTracker = new FilterWifiTracker(getContext(), getSettingsLifecycle());
         }
         mFilterWifiTracker.onResume();
     }
@@ -473,11 +473,13 @@
     private final class FilterWifiTracker {
         private final List<String> mAccessPointKeys;
         private final WifiTracker mWifiTracker;
+        private final Context mContext;
 
         public FilterWifiTracker(Context context, Lifecycle lifecycle) {
             mWifiTracker = WifiTrackerFactory.create(context, mWifiListener,
                     lifecycle, /* includeSaved */ true, /* includeScans */ true);
             mAccessPointKeys = new ArrayList<>();
+            mContext = context;
         }
 
         /**
@@ -486,7 +488,7 @@
          */
         public void updateKeys(List<ScanResult> scanResults) {
             for (ScanResult scanResult : scanResults) {
-                final String key = AccessPoint.getKey(scanResult);
+                final String key = AccessPoint.getKey(mContext, scanResult);
                 if (!mAccessPointKeys.contains(key)) {
                     mAccessPointKeys.add(key);
                 }
diff --git a/tests/CarTrustAgentClientApp/Android.mk b/tests/CarTrustAgentClientApp/Android.mk
deleted file mode 100644
index 3504ff7..0000000
--- a/tests/CarTrustAgentClientApp/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := CarTrustAgentClient
-
-LOCAL_USE_AAPT2 := true
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.appcompat_appcompat \
-    androidx-constraintlayout_constraintlayout \
-    androidx.legacy_legacy-support-v4
-
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MIN_SDK_VERSION := 23
-LOCAL_SDK_VERSION := current
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_DEX_PREOPT := false
-
-include $(BUILD_PACKAGE)
diff --git a/tests/CarTrustAgentClientApp/AndroidManifest.xml b/tests/CarTrustAgentClientApp/AndroidManifest.xml
deleted file mode 100644
index e76485f..0000000
--- a/tests/CarTrustAgentClientApp/AndroidManifest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.car.trust.client">
-
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
-
-    <!-- Need Bluetooth LE -->
-    <uses-feature android:name="android.hardware.bluetooth_le"  android:required="true" />
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <!-- Needed to unlock user -->
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
-    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <application
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat">
-
-        <activity
-                android:name=".PhoneEnrolmentActivity"
-                android:label="@string/app_name"
-                android:exported="true"
-                android:screenOrientation="portrait"
-                android:launchMode="singleInstance">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/tests/CarTrustAgentClientApp/README.txt b/tests/CarTrustAgentClientApp/README.txt
deleted file mode 100644
index bf6c444..0000000
--- a/tests/CarTrustAgentClientApp/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-IMPORTANT NOTE: This is a reference app to smart unlock paired HU during development.
-Consider moving the functionality to a more proper place.
diff --git a/tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml b/tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml
deleted file mode 100644
index 7237dfa..0000000
--- a/tests/CarTrustAgentClientApp/res/layout/phone_enrolment_activity.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:weightSum="1">
-    <ScrollView
-        android:id="@+id/scroll"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:scrollbars="vertical"
-        android:layout_weight="0.80">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/output"/>
-    </ScrollView>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.10"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/enroll_scan"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:text="@string/enroll_scan"/>
-        <Button
-            android:id="@+id/enroll_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="3"
-            android:text="@string/enroll_button"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.10"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/unlock_scan"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:text="@string/unlock_scan"/>
-        <Button
-            android:id="@+id/unlock_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="3"
-            android:text="@string/unlock_button"/>
-    </LinearLayout>
-</LinearLayout>
diff --git a/tests/CarTrustAgentClientApp/res/values/strings.xml b/tests/CarTrustAgentClientApp/res/values/strings.xml
deleted file mode 100644
index 6e33a81..0000000
--- a/tests/CarTrustAgentClientApp/res/values/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <string name="app_name" translatable="false">CarTrustAgentClient</string>
-
-    <!-- service/characteristics uuid for unlocking a device -->
-    <string name="unlock_service_uuid" translatable="false">5e2a68a1-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="unlock_escrow_token_uiid" translatable="false">5e2a68a2-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="unlock_handle_uiid" translatable="false">5e2a68a3-27be-43f9-8d1e-4546976fabd7</string>
-
-    <!-- service/characteristics uuid for adding new escrow token -->
-    <string name="enrollment_service_uuid" translatable="false">5e2a68a4-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="enrollment_handle_uuid" translatable="false">5e2a68a5-27be-43f9-8d1e-4546976fabd7</string>
-    <string name="enrollment_token_uuid" translatable="false">5e2a68a6-27be-43f9-8d1e-4546976fabd7</string>
-
-    <string name="pref_key_token_handle" translatable="false">token-handle-key</string>
-    <string name="pref_key_escrow_token" translatable="false">escrow-token-key</string>
-
-    <string name="enroll_button" translatable="false">Enroll new token</string>
-    <string name="enroll_scan" translatable="false">Scan to enroll</string>
-    <string name="unlock_button" translatable="false">Unlock</string>
-    <string name="unlock_scan" translatable="false">Scan to unlock</string>
-</resources>
diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java
deleted file mode 100644
index 77ed7bb..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/BluetoothUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.trust.client;
-
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-
-import java.util.UUID;
-
-/**
- * A utility class holding methods related to Bluetooth.
- */
-public class BluetoothUtils {
-    private BluetoothUtils() {}
-
-    /**
-     * Returns a characteristic off the given {@link BluetoothGattService} mapped to the jUUID
-     * specified. If the given service has multiple characteristics of the same UUID, then the
-     * first instance is returned.
-     *
-     * @param  uuidRes The unique identifier for the characteristic.
-     * @param  service The {@link BluetoothGattService} that contains the characteristic.
-     * @param  context The current {@link Context}.
-     * @return A {@link BluetoothGattCharacteristic} with a UUID matching {@code uuidRes} or
-     * {@code null} if none exists.
-     *
-     * @see BluetoothGattService#getCharacteristic(UUID)
-     */
-    @Nullable
-    public static BluetoothGattCharacteristic getCharacteristic(@StringRes int uuidRes,
-            BluetoothGattService service, Context context) {
-        return service.getCharacteristic(UUID.fromString(context.getString(uuidRes)));
-    }
-}
diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java
deleted file mode 100644
index fd29624..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.trust.client;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-
-import androidx.fragment.app.FragmentActivity;
-
-/**
- * Activity to allow the user to add an escrow token to a remote device. <p/>
- *
- * For this to work properly, the correct permissions must be set in the system config.  In AOSP,
- * this config is in frameworks/base/core/res/res/values/config.xml <p/>
- *
- * The config must set config_allowEscrowTokenForTrustAgent to true.  For the desired car
- * experience, the config should also set config_strongAuthRequiredOnBoot to false.
- */
-public class PhoneEnrolmentActivity extends FragmentActivity {
-
-    private static final int FINE_LOCATION_REQUEST_CODE = 42;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.phone_enrolment_activity);
-
-        PhoneEnrolmentController enrolmentController = new PhoneEnrolmentController(this);
-        enrolmentController.bind(findViewById(R.id.output), findViewById(R.id.enroll_scan),
-                findViewById(R.id.enroll_button));
-
-        PhoneUnlockController unlockController = new PhoneUnlockController(this);
-        unlockController.bind(findViewById(R.id.output), findViewById(R.id.unlock_scan),
-                findViewById(R.id.unlock_button));
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            requestPermissions(
-                    new String[] { android.Manifest.permission.ACCESS_FINE_LOCATION },
-                    FINE_LOCATION_REQUEST_CODE);
-        }
-    }
-}
diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java
deleted file mode 100644
index 1d3f672..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneEnrolmentController.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.trust.client;
-
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.ParcelUuid;
-import android.preference.PreferenceManager;
-import android.util.Base64;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.nio.ByteBuffer;
-import java.util.Random;
-import java.util.UUID;
-
-/**
- * A controller that sets up a {@link SimpleBleClient} to connect to the BLE enrollment service.
- * It also binds the UI components to control the enrollment process.
- */
-public class PhoneEnrolmentController {
-    private static final String TAG = "PhoneEnrollmentCltr";
-
-    private final String mTokenHandleKey;
-    private final String mEscrowTokenKey;
-
-    private final ParcelUuid mEnrolmentServiceUuid;
-
-    private final SimpleBleClient mClient;
-    private final Context mContext;
-    private final Handler mHandler;
-
-    // BLE characteristics associated with the enrollment/add escrow token service.
-    private BluetoothGattCharacteristic mEnrolmentTokenHandle;
-    private BluetoothGattCharacteristic mEnrolmentEscrowToken;
-
-    private TextView mTextView;
-    private Button mEnrolButton;
-
-    public PhoneEnrolmentController(Context context) {
-        mContext = context;
-
-        mTokenHandleKey = context.getString(R.string.pref_key_token_handle);
-        mEscrowTokenKey = context.getString(R.string.pref_key_escrow_token);
-
-        mClient = new SimpleBleClient(context);
-        mEnrolmentServiceUuid = new ParcelUuid(
-                UUID.fromString(mContext.getString(R.string.enrollment_service_uuid)));
-        mClient.addCallback(mCallback /* callback */);
-
-        mHandler = new Handler(mContext.getMainLooper());
-    }
-
-    /**
-     * Binds the views to the actions that can be performed by this controller.
-     *
-     * @param textView    A text view used to display results from various BLE actions
-     * @param scanButton  Button used to start scanning for available BLE devices.
-     * @param enrolButton Button used to send new escrow token to remote device.
-     */
-    public void bind(TextView textView, Button scanButton, Button enrolButton) {
-        mTextView = textView;
-        mEnrolButton = enrolButton;
-
-        scanButton.setOnClickListener(v -> mClient.start(mEnrolmentServiceUuid));
-
-        mEnrolButton.setEnabled(false);
-        mEnrolButton.setAlpha(0.3f);
-        mEnrolButton.setOnClickListener(v -> {
-            appendOutputText("Sending new escrow token to remote device");
-
-            byte[] token = generateEscrowToken();
-            sendEnrolmentRequest(token);
-
-            // WARNING: Store the token so it can be used later for unlocking. This token
-            // should NEVER be stored on the device that is being unlocked. It should
-            // always be securely stored on a remote device that will trigger the unlock.
-            storeToken(token);
-        });
-    }
-
-    /**
-     * @return A random byte array that is used as the escrow token for remote device unlock.
-     */
-    private byte[] generateEscrowToken() {
-        Random random = new Random();
-        ByteBuffer buffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-        buffer.putLong(0, random.nextLong());
-        return buffer.array();
-    }
-
-    private void sendEnrolmentRequest(byte[] token) {
-        mEnrolmentEscrowToken.setValue(token);
-        mClient.writeCharacteristic(mEnrolmentEscrowToken);
-        storeToken(token);
-    }
-
-    private void storeHandle(long handle) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        prefs.edit().putLong(mTokenHandleKey, handle).apply();
-    }
-
-    private void storeToken(byte[] token) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        String byteArray = Base64.encodeToString(token, Base64.DEFAULT);
-        prefs.edit().putString(mEscrowTokenKey, byteArray).apply();
-    }
-
-    private void appendOutputText(final String text) {
-        mHandler.post(() -> mTextView.append("\n" + text));
-    }
-
-    private final SimpleBleClient.ClientCallback mCallback = new SimpleBleClient.ClientCallback() {
-        @Override
-        public void onDeviceConnected(BluetoothDevice device) {
-            appendOutputText("Device connected: " + device.getName()
-                    + " addr: " + device.getAddress());
-        }
-
-        @Override
-        public void onDeviceDisconnected() {
-            appendOutputText("Device disconnected");
-        }
-
-        @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onCharacteristicChanged: "
-                        + convertToLong(characteristic.getValue()));
-            }
-
-            if (characteristic.getUuid().equals(mEnrolmentTokenHandle.getUuid())) {
-                // Store the new token handle that the BLE server is sending us. This required
-                // to unlock the device.
-                long handle = convertToLong(characteristic.getValue());
-                storeHandle(handle);
-                appendOutputText("Token handle received: " + handle);
-            }
-        }
-
-        @Override
-        public void onServiceDiscovered(BluetoothGattService service) {
-            if (!service.getUuid().equals(mEnrolmentServiceUuid.getUuid())) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Service UUID: " + service.getUuid()
-                            + " does not match Enrolment UUID " + mEnrolmentServiceUuid.getUuid());
-                }
-                return;
-            }
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Enrolment Service # characteristics: "
-                        + service.getCharacteristics().size());
-            }
-
-            mEnrolmentEscrowToken = BluetoothUtils.getCharacteristic(
-                    R.string.enrollment_token_uuid, service, mContext);
-            mEnrolmentTokenHandle = BluetoothUtils.getCharacteristic(
-                    R.string.enrollment_handle_uuid, service, mContext);
-            mClient.setCharacteristicNotification(mEnrolmentTokenHandle, true /* enable */);
-            appendOutputText("Enrolment BLE client successfully connected");
-
-            mHandler.post(() -> {
-                // Services are now set up, allow users to enrol new escrow tokens.
-                mEnrolButton.setEnabled(true);
-                mEnrolButton.setAlpha(1.0f);
-            });
-        }
-
-        private long convertToLong(byte[] bytes) {
-            ByteBuffer buffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-            buffer.put(bytes);
-            buffer.flip();
-            return buffer.getLong();
-        }
-    };
-}
diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java
deleted file mode 100644
index 1296529..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/PhoneUnlockController.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.trust.client;
-
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.os.ParcelUuid;
-import android.preference.PreferenceManager;
-import android.util.Base64;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-/**
- * A controller that sets up a {@link SimpleBleClient} to connect to the BLE unlock service.
- */
-public class PhoneUnlockController {
-    private static final String TAG = "PhoneUnlockController";
-
-    private final String mTokenHandleKey;
-    private final String mEscrowTokenKey;
-
-    // BLE characteristics associated with the enrolment/add escrow token service.
-    private BluetoothGattCharacteristic mUnlockTokenHandle;
-    private BluetoothGattCharacteristic mUnlockEscrowToken;
-
-    private final ParcelUuid mUnlockServiceUuid;
-
-    private final SimpleBleClient mClient;
-    private final Context mContext;
-    private final Handler mHandler;
-
-    private TextView mTextView;
-    private Button mUnlockButton;
-
-    public PhoneUnlockController(Context context) {
-        mContext = context;
-
-        mTokenHandleKey = context.getString(R.string.pref_key_token_handle);
-        mEscrowTokenKey = context.getString(R.string.pref_key_escrow_token);
-
-        mClient = new SimpleBleClient(context);
-        mUnlockServiceUuid = new ParcelUuid(
-                UUID.fromString(mContext.getString(R.string.unlock_service_uuid)));
-        mClient.addCallback(mCallback /* callback */);
-
-        mHandler = new Handler(mContext.getMainLooper());
-    }
-
-    /**
-     * Binds the views to the actions that can be performed by this controller.
-     *
-     * @param textView    A text view used to display results from various BLE actions
-     * @param scanButton  Button used to start scanning for available BLE devices.
-     * @param enrolButton Button used to send new escrow token to remote device.
-     */
-    public void bind(TextView textView, Button scanButton, Button enrolButton) {
-        mTextView = textView;
-        mUnlockButton = enrolButton;
-
-        scanButton.setOnClickListener(v -> mClient.start(mUnlockServiceUuid));
-
-        mUnlockButton.setEnabled(false);
-        mUnlockButton.setAlpha(0.3f);
-        mUnlockButton.setOnClickListener(v -> {
-            appendOutputText("Sending unlock token and handle to remote device");
-            sendUnlockRequest();
-        });
-    }
-
-    private void sendUnlockRequest() {
-        // Retrieve stored token and handle and write to remote device.
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        long handle = prefs.getLong(mTokenHandleKey, -1);
-        byte[] token = Base64.decode(prefs.getString(mEscrowTokenKey, null), Base64.DEFAULT);
-
-        mUnlockEscrowToken.setValue(token);
-        mUnlockTokenHandle.setValue(convertToBytes(handle));
-
-        mClient.writeCharacteristic(mUnlockEscrowToken);
-        mClient.writeCharacteristic(mUnlockTokenHandle);
-    }
-
-    private void appendOutputText(String text) {
-        mHandler.post(() -> mTextView.append("\n" + text));
-    }
-
-    private static byte[] convertToBytes(long l) {
-        ByteBuffer buffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-        buffer.putLong(0, l);
-        return buffer.array();
-    }
-
-    private final SimpleBleClient.ClientCallback mCallback = new SimpleBleClient.ClientCallback() {
-        @Override
-        public void onDeviceConnected(BluetoothDevice device) {
-            appendOutputText("Device connected: " + device.getName()
-                    + " addr: " + device.getAddress());
-        }
-
-        @Override
-        public void onDeviceDisconnected() {
-            appendOutputText("Device disconnected");
-        }
-
-        @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic) {
-            // Not expecting any characteristics changes for the unlocking client.
-        }
-
-        @Override
-        public void onServiceDiscovered(BluetoothGattService service) {
-            if (!service.getUuid().equals(mUnlockServiceUuid.getUuid())) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Service UUID: " + service.getUuid()
-                            + " does not match Enrolment UUID " + mUnlockServiceUuid.getUuid());
-                }
-                return;
-            }
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Unlock Service # characteristics: "
-                        + service.getCharacteristics().size());
-            }
-
-            mUnlockEscrowToken = BluetoothUtils.getCharacteristic(
-                    R.string.unlock_escrow_token_uiid, service, mContext);
-            mUnlockTokenHandle = BluetoothUtils.getCharacteristic(
-                    R.string.unlock_handle_uiid, service, mContext);
-            appendOutputText("Unlock BLE client successfully connected");
-
-            mHandler.post(() -> {
-                // Services are now set up, allow users to enrol new escrow tokens.
-                mUnlockButton.setEnabled(true);
-                mUnlockButton.setAlpha(1.0f);
-            });
-        }
-    };
-}
diff --git a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java b/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java
deleted file mode 100644
index 3cce775..0000000
--- a/tests/CarTrustAgentClientApp/src/com/android/car/trust/client/SimpleBleClient.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.trust.client;
-
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCallback;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.bluetooth.BluetoothManager;
-import android.bluetooth.BluetoothProfile;
-import android.bluetooth.le.BluetoothLeScanner;
-import android.bluetooth.le.ScanCallback;
-import android.bluetooth.le.ScanFilter;
-import android.bluetooth.le.ScanResult;
-import android.bluetooth.le.ScanSettings;
-import android.content.Context;
-import android.os.Handler;
-import android.os.ParcelUuid;
-import android.util.Log;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A simple client that supports the scanning and connecting to available BLE devices. Should be
- * used along with {@link SimpleBleServer}.
- */
-public class SimpleBleClient {
-    private static final String TAG = "SimpleBleClient";
-    private static final long SCAN_TIME_MS = TimeUnit.SECONDS.toMillis(10);
-
-    private final Queue<BleAction> mBleActionQueue = new ConcurrentLinkedQueue<BleAction>();
-    private final List<ClientCallback> mCallbacks = new ArrayList<>();
-    private final Context mContext;
-    private final BluetoothLeScanner mScanner;
-
-    private BluetoothGatt mBtGatt;
-    private ParcelUuid mServiceUuid;
-
-    public SimpleBleClient(Context context) {
-        mContext = context;
-        BluetoothManager btManager = (BluetoothManager) mContext.getSystemService(
-                Context.BLUETOOTH_SERVICE);
-        mScanner = btManager.getAdapter().getBluetoothLeScanner();
-    }
-
-    /**
-     * Start scanning for a BLE devices with the specified service uuid.
-     *
-     * @param parcelUuid {@link ParcelUuid} used to identify the device that should be used for
-     *                   this client. This uuid should be the same as the one that is set in the
-     *                   {@link android.bluetooth.le.AdvertiseData.Builder} by the advertising
-     *                   device.
-     */
-    public void start(ParcelUuid parcelUuid) {
-        mServiceUuid = parcelUuid;
-
-        // We only want to scan for devices that have the correct uuid set in its advertise data.
-        List<ScanFilter> filters = new ArrayList<ScanFilter>();
-        ScanFilter.Builder serviceFilter = new ScanFilter.Builder();
-        serviceFilter.setServiceUuid(mServiceUuid);
-        filters.add(serviceFilter.build());
-
-        ScanSettings.Builder settings = new ScanSettings.Builder();
-        settings.setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY);
-
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Start scanning for uuid: " + mServiceUuid.getUuid());
-        }
-
-        mScanner.startScan(filters, settings.build(), mScanCallback);
-
-        Handler handler = new Handler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Stopping Scanner");
-                }
-                mScanner.stopScan(mScanCallback);
-            }
-        }, SCAN_TIME_MS);
-    }
-
-    private boolean hasServiceUuid(ScanResult result) {
-        if (result.getScanRecord() == null
-                || result.getScanRecord().getServiceUuids() == null
-                || result.getScanRecord().getServiceUuids().size() == 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Writes to a {@link BluetoothGattCharacteristic} if possible, or queues the action until
-     * other actions are complete.
-     *
-     * @param characteristic {@link BluetoothGattCharacteristic} to be written
-     */
-    public void writeCharacteristic(BluetoothGattCharacteristic characteristic) {
-        processAction(new BleAction(characteristic, BleAction.ACTION_WRITE));
-    }
-
-    /**
-     * Reads a {@link BluetoothGattCharacteristic} if possible, or queues the read action until
-     * other actions are complete.
-     *
-     * @param characteristic {@link BluetoothGattCharacteristic} to be read.
-     */
-    public void readCharacteristic(BluetoothGattCharacteristic characteristic) {
-        processAction(new BleAction(characteristic, BleAction.ACTION_READ));
-    }
-
-    /**
-     * Enable or disable notification for specified {@link BluetoothGattCharacteristic}.
-     *
-     * @param characteristic The {@link BluetoothGattCharacteristic} for which to enable
-     *                       notifications.
-     * @param enabled        True if notifications should be enabled, false otherwise.
-     */
-    public void setCharacteristicNotification(BluetoothGattCharacteristic characteristic,
-            boolean enabled) {
-        mBtGatt.setCharacteristicNotification(characteristic, enabled);
-    }
-
-    /**
-     * Add a {@link ClientCallback} to listen for updates from BLE components
-     */
-    public void addCallback(ClientCallback callback) {
-        mCallbacks.add(callback);
-    }
-
-    public void removeCallback(ClientCallback callback) {
-        mCallbacks.remove(callback);
-    }
-
-    private void processAction(BleAction action) {
-        // Only execute actions if the queue is empty.
-        if (mBleActionQueue.size() > 0) {
-            mBleActionQueue.add(action);
-            return;
-        }
-
-        mBleActionQueue.add(action);
-        executeAction(mBleActionQueue.peek());
-    }
-
-    private void processNextAction() {
-        mBleActionQueue.poll();
-        executeAction(mBleActionQueue.peek());
-    }
-
-    private void executeAction(@Nullable BleAction action) {
-        if (action == null) {
-            return;
-        }
-
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Executing BLE Action type: " + action.getAction());
-        }
-
-        switch (action.getAction()) {
-            case BleAction.ACTION_WRITE:
-                mBtGatt.writeCharacteristic(action.getCharacteristic());
-                break;
-            case BleAction.ACTION_READ:
-                mBtGatt.readCharacteristic(action.getCharacteristic());
-                break;
-            default:
-                Log.e(TAG, "Encountered unknown BlueAction: " + action.getAction());
-        }
-    }
-
-    private String getStatus(int status) {
-        switch (status) {
-            case BluetoothGatt.GATT_FAILURE:
-                return "Failure";
-            case BluetoothGatt.GATT_SUCCESS:
-                return "GATT_SUCCESS";
-            case BluetoothGatt.GATT_READ_NOT_PERMITTED:
-                return "GATT_READ_NOT_PERMITTED";
-            case BluetoothGatt.GATT_WRITE_NOT_PERMITTED:
-                return "GATT_WRITE_NOT_PERMITTED";
-            case BluetoothGatt.GATT_INSUFFICIENT_AUTHENTICATION:
-                return "GATT_INSUFFICIENT_AUTHENTICATION";
-            case BluetoothGatt.GATT_REQUEST_NOT_SUPPORTED:
-                return "GATT_REQUEST_NOT_SUPPORTED";
-            case BluetoothGatt.GATT_INVALID_OFFSET:
-                return "GATT_INVALID_OFFSET";
-            case BluetoothGatt.GATT_INVALID_ATTRIBUTE_LENGTH:
-                return "GATT_INVALID_ATTRIBUTE_LENGTH";
-            case BluetoothGatt.GATT_CONNECTION_CONGESTED:
-                return "GATT_CONNECTION_CONGESTED";
-            default:
-                return "unknown";
-        }
-    }
-
-    private ScanCallback mScanCallback = new ScanCallback() {
-        @Override
-        public void onScanResult(int callbackType, ScanResult result) {
-            BluetoothDevice device = result.getDevice();
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Scan result found: " + result.getScanRecord().getServiceUuids());
-            }
-
-            if (!hasServiceUuid(result)) {
-                return;
-            }
-
-            for (ParcelUuid uuid : result.getScanRecord().getServiceUuids()) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Scan result UUID: " + uuid);
-                }
-
-                if (uuid.equals(mServiceUuid)) {
-                    // This client only supports connecting to one service.
-                    // Once we find one, stop scanning and open a GATT connection to the device.
-                    mScanner.stopScan(mScanCallback);
-                    mBtGatt = device.connectGatt(mContext, /* autoConnect= */ false, mGattCallback);
-                    return;
-                }
-            }
-        }
-
-        @Override
-        public void onBatchScanResults(List<ScanResult> results) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                for (ScanResult r : results) {
-                    Log.d(TAG, "Batch scanResult: " + r.getDevice().getName()
-                            + " " + r.getDevice().getAddress());
-                }
-            }
-        }
-
-        @Override
-        public void onScanFailed(int errorCode) {
-            Log.e(TAG, "Scan failed: " + errorCode);
-        }
-    };
-
-    private BluetoothGattCallback mGattCallback = new BluetoothGattCallback() {
-        @Override
-        public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
-            super.onConnectionStateChange(gatt, status, newState);
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Gatt connection status: " + getStatus(status)
-                        + " newState: " + newState);
-            }
-
-            switch (newState) {
-                case BluetoothProfile.STATE_CONNECTED:
-                    mBtGatt.discoverServices();
-                    for (ClientCallback callback : mCallbacks) {
-                        callback.onDeviceConnected(gatt.getDevice());
-                    }
-                    break;
-
-                case BluetoothProfile.STATE_DISCONNECTED:
-                    for (ClientCallback callback : mCallbacks) {
-                        callback.onDeviceDisconnected();
-                    }
-                    break;
-
-                default:
-                    // Do nothing.
-            }
-        }
-
-        @Override
-        public void onServicesDiscovered(BluetoothGatt gatt, int status) {
-            super.onServicesDiscovered(gatt, status);
-
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onServicesDiscovered: " + status);
-            }
-
-            List<BluetoothGattService> services = gatt.getServices();
-            if (services == null || services.size() <= 0) {
-                return;
-            }
-
-            // Notify clients of newly discovered services.
-            for (BluetoothGattService service : mBtGatt.getServices()) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Found service: " + service.getUuid() + " notifying clients");
-                }
-
-                for (ClientCallback callback : mCallbacks) {
-                    callback.onServiceDiscovered(service);
-                }
-            }
-        }
-
-        @Override
-        public void onCharacteristicWrite(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic, int status) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onCharacteristicWrite: " + status);
-            }
-
-            processNextAction();
-        }
-
-        @Override
-        public void onCharacteristicRead(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic, int status) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "onCharacteristicRead:" + new String(characteristic.getValue()));
-            }
-
-            processNextAction();
-        }
-
-        @Override
-        public void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic) {
-            for (ClientCallback callback : mCallbacks) {
-                callback.onCharacteristicChanged(gatt, characteristic);
-            }
-            processNextAction();
-        }
-    };
-
-    /**
-     * Wrapper class to allow queuing of BLE actions. The BLE stack allows only one action to be
-     * executed at a time.
-     */
-    private static class BleAction {
-        public static final int ACTION_WRITE = 0;
-        public static final int ACTION_READ = 1;
-
-        @IntDef({ ACTION_WRITE, ACTION_READ })
-        public @interface ActionType {}
-
-        private final int mAction;
-        private final BluetoothGattCharacteristic mCharacteristic;
-
-        BleAction(BluetoothGattCharacteristic characteristic, @ActionType int action) {
-            mAction = action;
-            mCharacteristic = characteristic;
-        }
-
-        @ActionType
-        public int getAction() {
-            return mAction;
-        }
-
-        public BluetoothGattCharacteristic getCharacteristic() {
-            return mCharacteristic;
-        }
-    }
-
-    /**
-     * Callback for classes that wish to be notified of BLE updates.
-     */
-    public interface ClientCallback {
-        /**
-         * Called when a device that has a matching service UUID is found.
-         **/
-        void onDeviceConnected(BluetoothDevice device);
-
-        /** Called when the currently connected device has been disconnected. */
-        void onDeviceDisconnected();
-
-        /**
-         * Called when a characteristic has been changed.
-         *
-         * @param gatt The GATT client the characteristic is associated with.
-         * @param characteristic The characteristic that has been changed.
-         */
-        void onCharacteristicChanged(BluetoothGatt gatt,
-                BluetoothGattCharacteristic characteristic);
-
-        /**
-         * Called for each {@link BluetoothGattService} that is discovered on the
-         * {@link BluetoothDevice} after a matching scan result and connection.
-         *
-         * @param service {@link BluetoothGattService} that has been discovered.
-         */
-        void onServiceDiscovered(BluetoothGattService service);
-    }
-}
diff --git a/tests/CarVoiceServiceTriggerApp/Android.mk b/tests/CarVoiceServiceTriggerApp/Android.mk
new file mode 100644
index 0000000..b492e1d
--- /dev/null
+++ b/tests/CarVoiceServiceTriggerApp/Android.mk
@@ -0,0 +1,50 @@
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+ifneq ($(TARGET_BUILD_PDK),true)
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_USE_AAPT2 := true
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CarVoiceTriggerApp
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_CERTIFICATE := platform
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
+
+include $(BUILD_MULTI_PREBUILT)
+
+include $(CLEAR_VARS)
+
+endif #TARGET_BUILD_PDK
diff --git a/tests/CarVoiceServiceTriggerApp/AndroidManifest.xml b/tests/CarVoiceServiceTriggerApp/AndroidManifest.xml
new file mode 100644
index 0000000..0e43fa7
--- /dev/null
+++ b/tests/CarVoiceServiceTriggerApp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.voicetrigger">
+
+    <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE"/>
+
+    <application android:label="@string/app_title">
+        <receiver android:name=".VoiceTriggerReceiver" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VOICE_ASSIST"/>
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
+
diff --git a/tests/CarVoiceServiceTriggerApp/res/values/strings.xml b/tests/CarVoiceServiceTriggerApp/res/values/strings.xml
new file mode 100644
index 0000000..3edaf54
--- /dev/null
+++ b/tests/CarVoiceServiceTriggerApp/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_title" translatable="false">Voice Service Trigger</string>
+</resources>
diff --git a/tests/CarVoiceServiceTriggerApp/src/com/android/voicetrigger/VoiceTriggerReceiver.java b/tests/CarVoiceServiceTriggerApp/src/com/android/voicetrigger/VoiceTriggerReceiver.java
new file mode 100644
index 0000000..f022fb1
--- /dev/null
+++ b/tests/CarVoiceServiceTriggerApp/src/com/android/voicetrigger/VoiceTriggerReceiver.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.voicetrigger;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionSession;
+
+import com.android.internal.app.AssistUtils;
+
+/**
+ * The exported {@link BroadcastReceiver} which receives an Intent to trigger the current active
+ * voice service. The voice service will be triggered as if the assistant button in the system UI
+ * is clicked.
+ *
+ * Run adb shell am broadcast -a android.intent.action.VOICE_ASSIST -n
+ * com.android.voicetrigger/.VoiceTriggerReceiver to use.
+ */
+public class VoiceTriggerReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        AssistUtils assistUtils = new AssistUtils(context);
+        assistUtils.showSessionForActiveService(new Bundle(),
+                VoiceInteractionSession.SHOW_SOURCE_AUTOMOTIVE_SYSTEM_UI, null, null);
+    }
+}
diff --git a/tests/DefaultStorageMonitoringCompanionApp/Android.mk b/tests/DefaultStorageMonitoringCompanionApp/Android.mk
index ff28cf6..66c04c3 100644
--- a/tests/DefaultStorageMonitoringCompanionApp/Android.mk
+++ b/tests/DefaultStorageMonitoringCompanionApp/Android.mk
@@ -23,7 +23,8 @@
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := DefaultStorageMonitoringCompanionApp
-LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_SDK_VERSION := system_current
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 
@@ -35,6 +36,6 @@
 
 LOCAL_DEX_PREOPT := false
 
-LOCAL_JAVA_LIBRARIES += android.car
+LOCAL_JAVA_LIBRARIES += android.car-system-stubs
 
 include $(BUILD_PACKAGE)
diff --git a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
index a8b8356..5612807 100644
--- a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
+++ b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
@@ -108,11 +108,34 @@
                  android:exported="false" android:directBootAware="true">
         </service>
 
+        <service android:name=".UserNoiticeDemoUiService" android:directBootAware="true" />
+
         <!-- Content provider for images -->
         <provider android:name=".cluster.ClusterContentProvider"
                   android:authorities="com.google.android.car.kitchensink.cluster.clustercontentprovider"
                   android:grantUriPermissions="true"
                   android:exported="true" />
 
+        <activity android:name=".AlwaysCrashingActivity"
+                  android:label="@string/always_crashing_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".NoCrashActivity"
+                  android:label="@string/no_crash_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".EmptyActivity"
+                  android:label="@string/empty_activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/carapi.xml b/tests/EmbeddedKitchenSinkApp/res/layout/carapi.xml
new file mode 100644
index 0000000..9cb733e
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/carapi.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          android:layout_width="match_parent"
+                          android:layout_height="match_parent"
+                          android:orientation="horizontal" >
+                <Button
+                    android:id="@+id/button_carapi_createandconnect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/createandconnect" />
+                <Button
+                    android:id="@+id/button_carapi_disconnect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/disconnect" />
+                <TextView
+                    android:id="@+id/carapi_createandconnect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/empty"
+                    android:layout_weight="1" />
+            </LinearLayout>
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          android:layout_width="match_parent"
+                          android:layout_height="match_parent"
+                          android:orientation="horizontal" >
+                <Button
+                    android:id="@+id/button_carapi_createcar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/createcar" />
+                <TextView
+                    android:id="@+id/carapi_createcar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/empty"
+                    android:layout_weight="1" />
+            </LinearLayout>
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          android:layout_width="match_parent"
+                          android:layout_height="match_parent"
+                          android:orientation="horizontal" >
+                <Button
+                    android:id="@+id/button_carapi_createcar_with_status_change"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/createcar_with_status_change" />
+                <TextView
+                    android:id="@+id/carapi_createcar_with_status_change"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/empty"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+        </LinearLayout>
+     </ScrollView>
+</LinearLayout>
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/dialer_test.xml b/tests/EmbeddedKitchenSinkApp/res/layout/dialer_test.xml
new file mode 100644
index 0000000..ef8ecee
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/dialer_test.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/bind_btn"
+                android:layout_width="400dp"
+                android:layout_height="80dp"
+                android:text="BIND">
+            </Button>
+
+            <Button
+                android:id="@+id/bring_to_front_btn"
+                android:layout_width="400dp"
+                android:layout_height="80dp"
+                android:text="onBringToFront">
+            </Button>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml b/tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml
new file mode 100644
index 0000000..5312fee
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/empty_activity.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/empty_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/empty_activity"
+        android:layout_weight="1" />
+</LinearLayout>
diff --git a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
index 4efec4d..0d56369 100644
--- a/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/values/strings.xml
@@ -321,4 +321,20 @@
 
     <!-- Users -->
     <string name="users_apply_button" translatable="false">Apply</string>
+
+    <!-- carapi -->
+    <string name="createandconnect" translatable="false">createCarAndConnect</string>
+    <string name="disconnect" translatable="false">disconnect</string>
+    <string name="createcar" translatable="false">createCar</string>
+    <string name="createcar_with_status_change" translatable="false">createCarWithStatusChange</string>
+
+    <!-- UserNoiticeDemoUiService -->
+    <string name="usernotice" translatable="false">This screen is for showing initial user notice and is not for product. Plz change config_userNoticeUiService in CarService before shipping.</string>
+    <string name="dismiss_now" translatable="false">Dismiss for now</string>
+    <string name="dismiss_forever" translatable="false">Do not show again</string>
+
+    <!-- [AlwaysCrashing|NoCrash|Empty]Activity -->
+    <string name="always_crashing_activity" translatable="false">Always Crash Activity</string>
+    <string name="no_crash_activity" translatable="false">No Crash Activity</string>
+    <string name="empty_activity" translatable="false">Empty Activity</string>
 </resources>
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java
new file mode 100644
index 0000000..05529b2
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/AlwaysCrashingActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.kitchensink;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Activity for testing purpose. This one always crashes inside onCreate.
+ */
+public class AlwaysCrashingActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        throw new RuntimeException("Intended crash for testing");
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/CarApiTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/CarApiTestFragment.java
new file mode 100644
index 0000000..3e594f5
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/CarApiTestFragment.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.kitchensink;
+
+import android.car.Car;
+import android.content.ComponentName;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+public class CarApiTestFragment extends Fragment {
+
+    private static final String TAG = CarApiTestFragment.class.getSimpleName();
+
+    private Car mCarForCreateAndConnect;
+    private Car mCarForCreateCar;
+    private Car mCarForStatusChange;
+
+    private TextView mTextForCreateAndConnect;
+    private TextView mTextForCreateCar;
+    private TextView mTextForCreateCarWithStatusChangeListener;
+
+    private int mConnectCountForStatusChange = 0;
+
+    private final ServiceConnection mServiceConnectionForCreateAndConnect =
+            new ServiceConnection() {
+
+                private int mConnectCount = 0;
+
+                @Override
+                public void onServiceConnected(ComponentName name, IBinder service) {
+                    mConnectCount++;
+                    mTextForCreateAndConnect.setText("bound service connected, isConnected:"
+                            + mCarForCreateAndConnect.isConnected()
+                            + " connect count:" + mConnectCount);
+                }
+
+                @Override
+                public void onServiceDisconnected(ComponentName name) {
+                    mTextForCreateAndConnect.setText("bound service disconnected, isConnected:"
+                            + mCarForCreateAndConnect.isConnected());
+                }
+            };
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+        View view = inflater.inflate(R.layout.carapi, container, false);
+        mTextForCreateAndConnect = view.findViewById(R.id.carapi_createandconnect);
+        mTextForCreateCar = view.findViewById(R.id.carapi_createcar);
+        mTextForCreateCarWithStatusChangeListener = view.findViewById(
+                R.id.carapi_createcar_with_status_change);
+        view.findViewById(R.id.button_carapi_createandconnect).setOnClickListener(
+                (View v) -> {
+                    mCarForCreateAndConnect = Car.createCar(getContext(),
+                            mServiceConnectionForCreateAndConnect);
+                    mCarForCreateAndConnect.connect();
+                });
+        view.findViewById(R.id.button_carapi_createcar).setOnClickListener(
+                (View v) -> {
+                    mCarForCreateCar = Car.createCar(getContext());
+                    mTextForCreateCar.setText("isConnected:" + mCarForCreateCar.isConnected());
+                });
+        view.findViewById(R.id.button_carapi_createcar_with_status_change).setOnClickListener(
+                (View v) -> {
+                    mCarForStatusChange = Car.createCar(getContext(), null,
+                            Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER,
+                            (Car car, boolean ready) -> {
+                                if (ready) {
+                                    mConnectCountForStatusChange++;
+                                    mTextForCreateCarWithStatusChangeListener.setText(
+                                            "service ready, isConnected:"
+                                                    + car.isConnected()
+                                                    + " connect count:"
+                                                    + mConnectCountForStatusChange);
+                                } else {
+                                    mTextForCreateCarWithStatusChangeListener.setText(
+                                            "bound service crashed, isConnected:"
+                                                    + car.isConnected());
+                                }
+                            });
+                });
+        return view;
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java
new file mode 100644
index 0000000..aad25cb
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/EmptyActivity.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.kitchensink;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class EmptyActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.empty_activity);
+    }
+
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index 1448ede..e667964 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -23,15 +23,12 @@
 import android.car.hardware.hvac.CarHvacManager;
 import android.car.hardware.power.CarPowerManager;
 import android.car.hardware.property.CarPropertyManager;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.IBinder;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -55,6 +52,7 @@
 import com.google.android.car.kitchensink.connectivity.ConnectivityFragment;
 import com.google.android.car.kitchensink.cube.CubesTestFragment;
 import com.google.android.car.kitchensink.diagnostic.DiagnosticTestFragment;
+import com.google.android.car.kitchensink.dialer.DialerTestFragment;
 import com.google.android.car.kitchensink.displayinfo.DisplayInfoFragment;
 import com.google.android.car.kitchensink.hvac.HvacTestFragment;
 import com.google.android.car.kitchensink.input.InputTestFragment;
@@ -167,10 +165,12 @@
             new FragmentMenuEntry("audio", AudioTestFragment.class),
             new FragmentMenuEntry("bluetooth headset", BluetoothHeadsetFragment.class),
             new FragmentMenuEntry("bluetooth messaging test", MapMceTestFragment.class),
+            new FragmentMenuEntry("carapi", CarApiTestFragment.class),
             new FragmentMenuEntry("carboard", KeyboardTestFragment.class),
             new FragmentMenuEntry("connectivity", ConnectivityFragment.class),
             new FragmentMenuEntry("cubes test", CubesTestFragment.class),
             new FragmentMenuEntry("diagnostic", DiagnosticTestFragment.class),
+            new FragmentMenuEntry("dialer incallservice", DialerTestFragment.class),
             new FragmentMenuEntry("display info", DisplayInfoFragment.class),
             new FragmentMenuEntry("hvac", HvacTestFragment.class),
             new FragmentMenuEntry("inst cluster", InstrumentClusterFragment.class),
@@ -285,8 +285,12 @@
             mCarApi.disconnect();
             mCarApi = null;
         }
-        mCarApi = Car.createCar(this, mServiceConnection);
-        mCarApi.connect();
+        mCarApi = Car.createCar(this, null, Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER,
+                (Car car, boolean ready) -> {
+                    if (ready) {
+                        initManagers(car);
+                    }
+                });
     }
 
     @Override
@@ -340,32 +344,23 @@
                 .commit();
     }
 
-    private final ServiceConnection mServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            Log.d(TAG, "Connected to Car Service");
-            synchronized (mPropertyManagerReady) {
-                mHvacManager = (CarHvacManager) mCarApi.getCarManager(
-                        android.car.Car.HVAC_SERVICE);
-                mPowerManager = (CarPowerManager) mCarApi.getCarManager(
-                        android.car.Car.POWER_SERVICE);
-                mPropertyManager = (CarPropertyManager) mCarApi.getCarManager(
-                        android.car.Car.PROPERTY_SERVICE);
-                mSensorManager = (CarSensorManager) mCarApi.getCarManager(
-                        android.car.Car.SENSOR_SERVICE);
-                mCarAppFocusManager =
-                        (CarAppFocusManager) mCarApi.getCarManager(Car.APP_FOCUS_SERVICE);
-                mCarProjectionManager =
-                        (CarProjectionManager) mCarApi.getCarManager(Car.PROJECTION_SERVICE);
-                mPropertyManagerReady.notifyAll();
-            }
+    private void initManagers(Car car) {
+        synchronized (mPropertyManagerReady) {
+            mHvacManager = (CarHvacManager) car.getCarManager(
+                    android.car.Car.HVAC_SERVICE);
+            mPowerManager = (CarPowerManager) car.getCarManager(
+                    android.car.Car.POWER_SERVICE);
+            mPropertyManager = (CarPropertyManager) car.getCarManager(
+                    android.car.Car.PROPERTY_SERVICE);
+            mSensorManager = (CarSensorManager) car.getCarManager(
+                    android.car.Car.SENSOR_SERVICE);
+            mCarAppFocusManager =
+                    (CarAppFocusManager) car.getCarManager(Car.APP_FOCUS_SERVICE);
+            mCarProjectionManager =
+                    (CarProjectionManager) car.getCarManager(Car.PROJECTION_SERVICE);
+            mPropertyManagerReady.notifyAll();
         }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            Log.d(TAG, "Disconnect from Car Service");
-        }
-    };
+    }
 
     public Car getCar() {
         return mCarApi;
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java
new file mode 100644
index 0000000..f10e1db
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/NoCrashActivity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.kitchensink;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class NoCrashActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.empty_activity);
+        TextView text = findViewById(R.id.empty_text);
+        text.setText(R.string.no_crash_activity);
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/UserNoiticeDemoUiService.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/UserNoiticeDemoUiService.java
new file mode 100644
index 0000000..dfe18dc
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/UserNoiticeDemoUiService.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.kitchensink;
+
+import android.app.AlertDialog;
+import android.app.Service;
+import android.car.settings.CarSettings;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.WindowManager;
+
+import com.android.internal.annotations.GuardedBy;
+
+/**
+ * Example service of implementing UserNoticeUI.
+ * <p>IUserNotice and IUserNoticeUI are intentionally accessed / implemented without using the
+ * generated code from aidl so that this can be done without accessing hidden API.
+ */
+public class UserNoiticeDemoUiService extends Service {
+
+    private static final String TAG = UserNoiticeDemoUiService.class.getSimpleName();
+
+    private static final String IUSER_NOTICE_BINDER_DESCRIPTOR = "android.car.user.IUserNotice";
+    private static final int IUSER_NOTICE_TR_ON_DIALOG_DISMISSED =
+            android.os.IBinder.FIRST_CALL_TRANSACTION;
+
+    private static final String IUSER_NOTICE_UI_BINDER_DESCRIPTOR =
+            "android.car.user.IUserNoticeUI";
+    private static final int IUSER_NOTICE_UI_BINDER_TR_SET_CALLBACK =
+            android.os.IBinder.FIRST_CALL_TRANSACTION;
+
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
+
+    private final Object mLock = new Object();
+
+    // Do not use IUserNoticeUI class intentionally to show how it can be
+    // implemented without accessing the hidden API.
+    private IBinder mIUserNoticeUiBinder = new Binder() {
+        @Override
+        protected boolean onTransact(int code, Parcel data, Parcel reply, int flags)
+                throws RemoteException {
+            switch (code) {
+                case IUSER_NOTICE_UI_BINDER_TR_SET_CALLBACK:
+                    data.enforceInterface(IUSER_NOTICE_UI_BINDER_DESCRIPTOR);
+                    IBinder binder = data.readStrongBinder();
+                    onSetCallbackBinder(binder);
+                    return true;
+                default:
+                    return super.onTransact(code, data, reply, flags);
+            }
+        }
+    };
+
+    @GuardedBy("mLock")
+    private IBinder mIUserNoticeService;
+
+    @GuardedBy("mLock")
+    private AlertDialog mDialog;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mIUserNoticeUiBinder;
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        stopDialog(true);
+        return false;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        stopDialog(true);
+    }
+
+    private void onSetCallbackBinder(IBinder binder) {
+        if (binder == null) {
+            Log.wtf(TAG, "No binder set in onSetCallbackBinder call", new RuntimeException());
+            return;
+        }
+        mMainHandler.post(() -> {
+            synchronized (mLock) {
+                mIUserNoticeService = binder;
+            }
+            startDialog();
+        });
+    }
+
+    private void startDialog() {
+        synchronized (mLock) {
+            if (mDialog != null) {
+                Log.wtf(TAG, "Dialog already created", new RuntimeException());
+                return;
+            }
+            mDialog = createDialog();
+            // Necessary permission is auto-granted by car service before starting this.
+            mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
+            mDialog.setCancelable(false);
+        }
+        mDialog.show();
+    }
+
+    private void stopDialog(boolean dismiss) {
+        IBinder userNotice;
+        AlertDialog dialog;
+        synchronized (mLock) {
+            userNotice = mIUserNoticeService;
+            dialog = mDialog;
+            mDialog = null;
+            mIUserNoticeService = null;
+        }
+        if (userNotice != null) {
+            sendOnDialogDismissedToCarService(userNotice);
+        }
+        if (dialog != null && dismiss) {
+            dialog.dismiss();
+        }
+        stopSelf();
+    }
+
+    private void sendOnDialogDismissedToCarService(IBinder userNotice) {
+        Parcel data = Parcel.obtain();
+        data.writeInterfaceToken(IUSER_NOTICE_BINDER_DESCRIPTOR);
+        try {
+            userNotice.transact(IUSER_NOTICE_TR_ON_DIALOG_DISMISSED, data, null, 0);
+        } catch (RemoteException e) {
+            Log.w(TAG, "CarService crashed, finish now");
+            stopSelf();
+        }
+    }
+
+    private AlertDialog createDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        AlertDialog dialog = builder.setMessage(R.string.usernotice)
+                .setPositiveButton(R.string.dismiss_now, (DialogInterface d, int w) -> {
+                    stopDialog(true);
+                })
+                .setNegativeButton(R.string.dismiss_forever, (DialogInterface d, int w) -> {
+                    Settings.Secure.putInt(getContentResolver(),
+                            CarSettings.Secure.KEY_ENABLE_INITIAL_NOTICE_SCREEN_TO_USER,
+                            /* enable= */ 0);
+                    stopDialog(true);
+                })
+                .setOnDismissListener((DialogInterface d) -> {
+                    stopDialog(false);
+                })
+                .create();
+        return dialog;
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
index b03e320..84b6bcf 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
@@ -21,9 +21,7 @@
 import android.car.CarAppFocusManager.OnAppFocusChangedListener;
 import android.car.CarAppFocusManager.OnAppFocusOwnershipCallback;
 import android.car.media.CarAudioManager;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.ServiceConnection;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.hardware.display.DisplayManager;
@@ -34,7 +32,6 @@
 import android.media.HwAudioSource;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.IBinder;
 import android.os.Looper;
 import android.util.Log;
 import android.view.Display;
@@ -124,41 +121,39 @@
     private void connectCar() {
         mContext = getContext();
         mHandler = new Handler(Looper.getMainLooper());
-        mCar = Car.createCar(mContext, new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                mAppFocusManager =
-                        (CarAppFocusManager) mCar.getCarManager(Car.APP_FOCUS_SERVICE);
-                OnAppFocusChangedListener listener = new OnAppFocusChangedListener() {
-                    @Override
-                    public void onAppFocusChanged(int appType, boolean active) {
+        mCar = Car.createCar(mContext, /* handler= */ null,
+                Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, (car, ready) -> {
+                    if (!ready) {
+                        return;
                     }
-                };
-                mAppFocusManager.addFocusListener(listener,
-                        CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
-                mAppFocusManager.addFocusListener(listener,
-                        CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+                    mAppFocusManager =
+                            (CarAppFocusManager) car.getCarManager(Car.APP_FOCUS_SERVICE);
+                    OnAppFocusChangedListener listener = new OnAppFocusChangedListener() {
+                        @Override
+                        public void onAppFocusChanged(int appType, boolean active) {
+                        }
+                    };
+                    mAppFocusManager.addFocusListener(listener,
+                            CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+                    mAppFocusManager.addFocusListener(listener,
+                            CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
 
-                mCarAudioManager = (CarAudioManager) mCar.getCarManager(Car.AUDIO_SERVICE);
+                    mCarAudioManager = (CarAudioManager) car.getCarManager(Car.AUDIO_SERVICE);
 
-                //take care of zone selection
-                int[] zoneList = mCarAudioManager.getAudioZoneIds();
-                Integer[] zoneArray = Arrays.stream(zoneList).boxed().toArray(Integer[]::new);
-                mZoneAdapter = new ArrayAdapter<>(mContext,
-                        android.R.layout.simple_spinner_item, zoneArray);
-                mZoneAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-                mZoneSpinner.setAdapter(mZoneAdapter);
-                mZoneSpinner.setEnabled(true);
+                    //take care of zone selection
+                    int[] zoneList = mCarAudioManager.getAudioZoneIds();
+                    Integer[] zoneArray = Arrays.stream(zoneList).boxed().toArray(Integer[]::new);
+                    mZoneAdapter = new ArrayAdapter<>(mContext,
+                            android.R.layout.simple_spinner_item, zoneArray);
+                    mZoneAdapter.setDropDownViewResource(
+                            android.R.layout.simple_spinner_dropdown_item);
+                    mZoneSpinner.setAdapter(mZoneAdapter);
+                    mZoneSpinner.setEnabled(true);
 
-                if (mCarAudioManager.isDynamicRoutingEnabled()) {
-                    setUpDisplayPlayer();
-                }
-            }
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-            }
-            });
-        mCar.connect();
+                    if (mCarAudioManager.isDynamicRoutingEnabled()) {
+                        setUpDisplayPlayer();
+                    }
+                });
     }
 
     private void initializePlayers() {
@@ -217,9 +212,16 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
         Log.i(TAG, "onCreateView");
+        View view = inflater.inflate(R.layout.audio, container, false);
+        //Zone Spinner
+        setUpZoneSpinnerView(view);
+
+        //Display layout
+        setUpDisplayLayoutView(view);
+
         connectCar();
         initializePlayers();
-        View view = inflater.inflate(R.layout.audio, container, false);
+
         mAudioManager = (AudioManager) mContext.getSystemService(
                 Context.AUDIO_SERVICE);
         mAudioFocusHandler = new FocusHandler(
@@ -331,35 +333,6 @@
             }
         });
 
-        //Zone Spinner
-        mZoneSpinner = view.findViewById(R.id.zone_spinner);
-        mZoneSpinner.setEnabled(false);
-        mZoneSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
-                handleZoneSelection();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-
-
-        mDisplayLayout = view.findViewById(R.id.audio_display_layout);
-
-        mDisplaySpinner = view.findViewById(R.id.display_spinner);
-        mDisplaySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
-                handleDisplaySelection();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-
         // Manage buttons for audio player for displays
         view.findViewById(R.id.button_display_media_play_start).setOnClickListener(v -> {
             startDisplayAudio();
@@ -375,6 +348,37 @@
         return view;
     }
 
+    private void setUpDisplayLayoutView(View view) {
+        mDisplayLayout = view.findViewById(R.id.audio_display_layout);
+
+        mDisplaySpinner = view.findViewById(R.id.display_spinner);
+        mDisplaySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+                handleDisplaySelection();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
+    }
+
+    private void setUpZoneSpinnerView(View view) {
+        mZoneSpinner = view.findViewById(R.id.zone_spinner);
+        mZoneSpinner.setEnabled(false);
+        mZoneSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+                handleZoneSelection();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
+    }
+
     public void handleZoneSelection() {
         int position = mZoneSpinner.getSelectedItemPosition();
         int zone = mZoneAdapter.getItem(position);
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
index 7657c38..8886913 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
@@ -17,6 +17,7 @@
 
 import android.annotation.Nullable;
 import android.car.Car;
+import android.car.Car.CarServiceLifecycleListener;
 import android.car.CarAppFocusManager;
 import android.car.CarNotConnectedException;
 import android.car.cluster.navigation.NavigationState;
@@ -33,11 +34,8 @@
 import android.car.cluster.navigation.NavigationState.Step;
 import android.car.cluster.navigation.NavigationState.Timestamp;
 import android.car.navigation.CarNavigationStatusManager;
-import android.content.ComponentName;
-import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -73,19 +71,19 @@
     private NavigationStateProto[] mNavStateData;
     private Button mTurnByTurnButton;
 
-    private ServiceConnection mCarServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            Log.d(TAG, "Connected to Car Service");
-            mCarNavigationStatusManager = (CarNavigationStatusManager) mCarApi
-                    .getCarManager(Car.CAR_NAVIGATION_SERVICE);
-            mCarAppFocusManager = (CarAppFocusManager) mCarApi
-                    .getCarManager(Car.APP_FOCUS_SERVICE);
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
+    private CarServiceLifecycleListener mCarServiceLifecycleListener = (car, ready) -> {
+        if (!ready) {
             Log.d(TAG, "Disconnect from Car Service");
+            return;
+        }
+        Log.d(TAG, "Connected to Car Service");
+        try {
+            mCarNavigationStatusManager = (CarNavigationStatusManager) car.getCarManager(
+                    Car.CAR_NAVIGATION_SERVICE);
+            mCarAppFocusManager = (CarAppFocusManager) car.getCarManager(
+                    Car.APP_FOCUS_SERVICE);
+        } catch (CarNotConnectedException e) {
+            Log.e(TAG, "Car is not connected!", e);
         }
     };
 
@@ -117,13 +115,8 @@
 
 
     private void initCarApi() {
-        if (mCarApi != null && mCarApi.isConnected()) {
-            mCarApi.disconnect();
-            mCarApi = null;
-        }
-
-        mCarApi = Car.createCar(getContext(), mCarServiceConnection);
-        mCarApi.connect();
+        mCarApi = Car.createCar(getContext(), /* handler= */ null,
+                Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, mCarServiceLifecycleListener);
     }
 
     @NonNull
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/dialer/DialerTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/dialer/DialerTestFragment.java
new file mode 100644
index 0000000..8443c8a
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/dialer/DialerTestFragment.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.google.android.car.kitchensink.dialer;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.telecom.TelecomManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.android.internal.telecom.IInCallService;
+
+import com.google.android.car.kitchensink.R;
+
+/**
+ * Test CarDialerApp and InCallService implementations
+ */
+public class DialerTestFragment extends Fragment {
+    private static final String TAG = "DialerTestFragment";
+    private IInCallService mService;
+
+    private ServiceConnection mConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            Log.d(TAG, "connected");
+            mService = IInCallService.Stub.asInterface(service);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            Log.d(TAG, "disconnected");
+            mService = null;
+        }
+    };
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.dialer_test, container, false);
+
+        // OnClick: Binds kitchensink to InCallService
+        Button bindButton = view.findViewById(R.id.bind_btn);
+        bindButton.setOnClickListener((v) -> {
+            try {
+                Log.d(TAG, "bind");
+                Intent intent = new Intent("android.telecom.InCallService");
+                intent.setPackage("com.android.car.dialer");
+                getActivity().bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+            } catch (Exception e) {
+                Log.e(TAG, e.toString());
+            }
+        });
+
+        // OnClick: Trigger InCallService#onBringToFront
+        Button bringToFrontButton = view.findViewById(R.id.bring_to_front_btn);
+        bringToFrontButton.setOnClickListener((v) -> {
+            Log.d(TAG, "bringToFront");
+            TelecomManager manager = (TelecomManager) getContext().getSystemService(
+                    Context.TELECOM_SERVICE);
+            manager.showInCallScreen(true);
+        });
+
+        return view;
+    }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java
index 73e3798..f753efe 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java
@@ -16,14 +16,12 @@
 package com.google.android.car.kitchensink.volume;
 
 import android.car.Car;
+import android.car.Car.CarServiceLifecycleListener;
 import android.car.media.CarAudioManager;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.ServiceConnection;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.IBinder;
 import android.os.Message;
 import android.util.Log;
 import android.util.SparseIntArray;
@@ -112,20 +110,15 @@
         public boolean mHasFocus;
     }
 
-    private final ServiceConnection mCarConnectionCallback =
-            new ServiceConnection() {
-                @Override
-                public void onServiceConnected(ComponentName name, IBinder binder) {
-                    Log.d(TAG, "Connected to Car Service");
-                    mCarAudioManager = (CarAudioManager) mCar.getCarManager(Car.AUDIO_SERVICE);
-                    initVolumeInfo();
-                }
-
-                @Override
-                public void onServiceDisconnected(ComponentName name) {
-                    Log.d(TAG, "Disconnect from Car Service");
-                }
-            };
+    private CarServiceLifecycleListener mCarServiceLifecycleListener = (car, ready) -> {
+        if (!ready) {
+            Log.d(TAG, "Disconnect from Car Service");
+            return;
+        }
+        Log.d(TAG, "Connected to Car Service");
+        mCarAudioManager = (CarAudioManager) car.getCarManager(Car.AUDIO_SERVICE);
+        initVolumeInfo();
+    };
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@@ -161,8 +154,8 @@
         mBalance = v.findViewById(R.id.balance_bar);
         mBalance.setOnSeekBarChangeListener(seekListener);
 
-        mCar = Car.createCar(getActivity(), mCarConnectionCallback);
-        mCar.connect();
+        mCar = Car.createCar(getActivity(), /* handler= */ null,
+                Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, mCarServiceLifecycleListener);
         return v;
     }
 
@@ -210,12 +203,4 @@
         }
         mAdapter.refreshVolumes(mVolumeInfos);
     }
-
-    @Override
-    public void onDestroy() {
-        if (mCar != null) {
-            mCar.disconnect();
-        }
-        super.onDestroy();
-    }
 }
diff --git a/tests/GarageModeTestApp/res/layout/offcar_testing.xml b/tests/GarageModeTestApp/res/layout/offcar_testing.xml
index c14aa07..1b12752 100644
--- a/tests/GarageModeTestApp/res/layout/offcar_testing.xml
+++ b/tests/GarageModeTestApp/res/layout/offcar_testing.xml
@@ -90,22 +90,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1">
-                <LinearLayout
+                <CheckBox
+                    style="@style/Checkbox"
+                    android:id="@+id/requireIdlenessCheckbox"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
-                    <TextView
-                        style="@style/SpinnerLabel"
-                        android:text="@string/spinner_label_network_type"/>
-                    <LinearLayout
-                        style="@style/SectionContainer"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent">
-                        <Spinner
-                            style="@style/Spinner"
-                            android:id="@+id/networkType"/>
-                    </LinearLayout>
-                </LinearLayout>
+                    android:layout_weight="1"
+                    android:checked="true"
+                    android:text="@string/checkbox_require_idleness"/>
                 <CheckBox
                     style="@style/Checkbox"
                     android:id="@+id/requirePersistedCheckbox"
@@ -121,13 +113,6 @@
                 android:weightSum="2">
                 <CheckBox
                     style="@style/Checkbox"
-                    android:id="@+id/requireIdlenessCheckbox"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text="@string/checkbox_require_idleness"/>
-                <CheckBox
-                    style="@style/Checkbox"
                     android:id="@+id/requireChargingCheckbox"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -137,6 +122,22 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_weight="1">
+                <TextView
+                    style="@style/SpinnerLabel"
+                    android:text="@string/spinner_label_network_type"/>
+                <LinearLayout
+                    style="@style/SectionContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent">
+                    <Spinner
+                        style="@style/Spinner"
+                        android:id="@+id/networkType"/>
+                </LinearLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:orientation="horizontal">
                 <TextView
@@ -176,4 +177,4 @@
                 android:focusable="false"/>
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/tests/GarageModeTestApp/src/com/google/android/car/garagemode/testapp/JobSchedulerWrapper.java b/tests/GarageModeTestApp/src/com/google/android/car/garagemode/testapp/JobSchedulerWrapper.java
index 0a38d7f..5908ed9 100644
--- a/tests/GarageModeTestApp/src/com/google/android/car/garagemode/testapp/JobSchedulerWrapper.java
+++ b/tests/GarageModeTestApp/src/com/google/android/car/garagemode/testapp/JobSchedulerWrapper.java
@@ -48,8 +48,8 @@
     private static final int MAX_SECONDS_PER_JOB = 9 * 60; // 9 minutes
     private static final int JOB_OVERLAP_SECONDS = 10;
 
-    @GuardedBy("sExtendedJobInfoMap")
-    private static final Map<Integer, ExtendedJobInfo> sExtendedJobInfoMap = new HashMap<>();
+    @GuardedBy("mExtendedJobInfoMap")
+    private final Map<Integer, ExtendedJobInfo> mExtendedJobInfoMap = new HashMap<>();
 
     private JobScheduler mJobScheduler;
     private Context mContext;
@@ -57,6 +57,7 @@
     private Handler mHandler;
     private Watchdog mWatchdog;
     private Runnable mRefreshWorker;
+    private boolean mStopWhenFinished = false;
 
     private List<JobInfo> mLastJobsList;
     private List<JobInfo> mNewJobs;
@@ -99,18 +100,36 @@
         LOG.d("Starting JobSchedulerWrapper");
         mHandler = new Handler();
         mRefreshWorker = () -> {
-            refresh();
-            mHandler.postDelayed(mRefreshWorker, 1000);
+            refresh(); // Could nullify mHandler
+            if (mHandler != null) {
+                mHandler.postDelayed(mRefreshWorker, 1000);
+            }
         };
         mHandler.postDelayed(mRefreshWorker, 1000);
     }
 
     public void stop() {
+        boolean canStopNow;
+        synchronized (mExtendedJobInfoMap) {
+            canStopNow = mExtendedJobInfoMap.isEmpty();
+        }
+        if (canStopNow) {
+            stopNow();
+        } else {
+            // There are continuing jobs that we need to schedule
+            // in the future, so don't stop now. We'll stop when
+            // we have scheduled those future jobs.
+            mStopWhenFinished = true;
+        }
+    }
+
+    private void stopNow() {
         LOG.d("Stopping JobSchedulerWrapper");
         mHandler.removeCallbacks(mRefreshWorker);
         mRefreshWorker = null;
         mHandler = null;
         mWatchdog = null;
+        mStopWhenFinished = false;
     }
 
     public void scheduleAJob(
@@ -157,12 +176,10 @@
         editor.putInt(PREFS_NEXT_JOB_ID, jobId + 1);
         editor.commit();
 
-        refresh();
-
         if (extraSeconds > 0) {
             // Remember to schedule another job when this one ends
-            synchronized (sExtendedJobInfoMap) {
-                sExtendedJobInfoMap.put(jobId,
+            synchronized (mExtendedJobInfoMap) {
+                mExtendedJobInfoMap.put(jobId,
                                         new ExtendedJobInfo(extraSeconds,
                                                             networkType,
                                                             isChargingRequired,
@@ -179,6 +196,7 @@
                          isChargingRequired,
                          isIdleRequired);
         }
+        refresh();
     }
 
     private void updateListView() {
@@ -254,8 +272,8 @@
         // extension for any of the newly-completed jobs.
         for (JobInfo completedJobInfo : completedJobsList) {
             ExtendedJobInfo extensionInfo;
-            synchronized (sExtendedJobInfoMap) {
-                extensionInfo = sExtendedJobInfoMap.remove(completedJobInfo.getId());
+            synchronized (mExtendedJobInfoMap) {
+                extensionInfo = mExtendedJobInfoMap.remove(completedJobInfo.getId());
             }
             if (extensionInfo != null) {
                 scheduleAJob(extensionInfo.jobLengthSeconds,
@@ -264,6 +282,17 @@
                              extensionInfo.idleRequired);
             }
         }
+        if (mStopWhenFinished) {
+            boolean canStopNow;
+            synchronized (mExtendedJobInfoMap) {
+                canStopNow = mExtendedJobInfoMap.isEmpty();
+            }
+            if (canStopNow) {
+                // We were asked to stop earlier, but we had more
+                // work to do. That work is now done, so stop now.
+                stopNow();
+            }
+        }
         return completedJobsList;
     }
 
diff --git a/tests/MultiDisplayTest/Android.mk b/tests/MultiDisplayTest/Android.mk
index c5c7ce0..779c646 100644
--- a/tests/MultiDisplayTest/Android.mk
+++ b/tests/MultiDisplayTest/Android.mk
@@ -24,10 +24,12 @@
 
 LOCAL_PACKAGE_NAME := MultiDisplayTest
 
-LOCAL_SDK_VERSION := current
-
 LOCAL_DEX_PREOPT := false
 
+LOCAL_JAVA_LIBRARIES += android.car
+
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
 LOCAL_STATIC_ANDROID_LIBRARIES += \
     androidx.lifecycle_lifecycle-livedata \
     androidx.lifecycle_lifecycle-viewmodel \
diff --git a/tests/MultiDisplayTest/res/values-ar/strings.xml b/tests/MultiDisplayTest/res/values-ar/strings.xml
index 310a066..d36c86e 100644
--- a/tests/MultiDisplayTest/res/values-ar/strings.xml
+++ b/tests/MultiDisplayTest/res/values-ar/strings.xml
@@ -20,5 +20,5 @@
     <string name="presentation_info_button" msgid="3138993281071284633">"معلومات"</string>
     <string name="presentation_display_id_text" msgid="4094870216265474973">"الشاشة #%1$d: %2$s"</string>
     <string name="presentation_alert_info_text" msgid="8826889501417145349">"معلومات عن الشاشة #%1$d"</string>
-    <string name="presentation_alert_dismiss_text" msgid="9001797425513629072">"موافق"</string>
+    <string name="presentation_alert_dismiss_text" msgid="9001797425513629072">"حسنًا"</string>
 </resources>
diff --git a/tests/MultiDisplayTest/src/com/google/android/car/multidisplaytest/MDTest.java b/tests/MultiDisplayTest/src/com/google/android/car/multidisplaytest/MDTest.java
index a665772..b93283e 100644
--- a/tests/MultiDisplayTest/src/com/google/android/car/multidisplaytest/MDTest.java
+++ b/tests/MultiDisplayTest/src/com/google/android/car/multidisplaytest/MDTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.car.multidisplaytest;
 
+import android.car.Car;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
@@ -47,6 +48,7 @@
     private Button mMenuButton;
     private RecyclerView mMenu;
     private View mMenuContent;
+    private Car mCar;
 
     private interface ClickHandler {
         void onClick();
@@ -129,6 +131,14 @@
         Log.i(TAG, "Creating MDTest activity view");
         mFragmentManager = MDTest.this.getSupportFragmentManager();
         onNewIntent(getIntent());
+        mCar = Car.createCar(this, null, Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER,
+                (Car car, boolean ready) -> {
+                    if (ready) {
+                        Log.i(TAG, "car ready");
+                    } else {
+                        Log.i(TAG, "car not ready");
+                    }
+                });
     }
 
     private void toggleMenuVisibility() {
diff --git a/tests/UxRestrictionsSample/src/com/google/android/car/uxr/sample/MainActivity.java b/tests/UxRestrictionsSample/src/com/google/android/car/uxr/sample/MainActivity.java
index 89f3349..f4eff56 100644
--- a/tests/UxRestrictionsSample/src/com/google/android/car/uxr/sample/MainActivity.java
+++ b/tests/UxRestrictionsSample/src/com/google/android/car/uxr/sample/MainActivity.java
@@ -19,7 +19,6 @@
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_MOVING;
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_PARKED;
 import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_BASELINE;
-import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_PASSENGER;
 
 import android.app.AlertDialog;
 import android.car.Car;
@@ -50,6 +49,7 @@
     public static final String TAG = "UxRDemo";
 
     private static final String DIALOG_FRAGMENT_TAG = "dialog_fragment_tag";
+    private static final String UX_RESTRICTION_MODE_PASSENGER = "passenger";
 
     private Car mCar;
     private CarDrivingStateManager mCarDrivingStateManager;
@@ -187,7 +187,7 @@
             return;
         }
 
-        int mode = mCarUxRestrictionsManager.getRestrictionMode();
+        String mode = mCarUxRestrictionsManager.getRestrictionMode();
         switch (mode) {
             case UX_RESTRICTION_MODE_BASELINE:
                 mCarUxRestrictionsManager.setRestrictionMode(UX_RESTRICTION_MODE_PASSENGER);
@@ -218,7 +218,7 @@
                                 .setRestrictions(baseline))
                 .setUxRestrictions(DRIVING_STATE_MOVING,
                         new DrivingStateRestrictions()
-                                .setMode(CarUxRestrictionsManager.UX_RESTRICTION_MODE_PASSENGER)
+                                .setMode(UX_RESTRICTION_MODE_PASSENGER)
                                 .setDistractionOptimizationRequired(passenger != 0)
                                 .setRestrictions(passenger))
                 .setUxRestrictions(DRIVING_STATE_IDLING,
@@ -227,7 +227,7 @@
                                 .setRestrictions(baseline))
                 .setUxRestrictions(DRIVING_STATE_IDLING,
                         new DrivingStateRestrictions()
-                                .setMode(CarUxRestrictionsManager.UX_RESTRICTION_MODE_PASSENGER)
+                                .setMode(UX_RESTRICTION_MODE_PASSENGER)
                                 .setDistractionOptimizationRequired(passenger != 0)
                                 .setRestrictions(passenger))
                 .build();
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java b/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java
index a040442..030b133 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarUxRestrictionsConfigurationTest.java
@@ -19,12 +19,12 @@
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_IDLING;
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_MOVING;
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_PARKED;
+import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_UNKNOWN;
 import static android.car.drivingstate.CarUxRestrictions.UX_RESTRICTIONS_BASELINE;
 import static android.car.drivingstate.CarUxRestrictions.UX_RESTRICTIONS_FULLY_RESTRICTED;
 import static android.car.drivingstate.CarUxRestrictions.UX_RESTRICTIONS_NO_VIDEO;
 import static android.car.drivingstate.CarUxRestrictionsConfiguration.Builder.SpeedRange.MAX_SPEED;
 import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_BASELINE;
-import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_PASSENGER;
 
 import android.car.drivingstate.CarUxRestrictions;
 import android.car.drivingstate.CarUxRestrictionsConfiguration;
@@ -38,11 +38,14 @@
 
 import junit.framework.TestCase;
 
+import org.junit.Test;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.StringReader;
 
 /**
  * Unit test for UXR config and its subclasses.
@@ -50,6 +53,9 @@
 @SmallTest
 public class CarUxRestrictionsConfigurationTest extends TestCase {
 
+    private static final String UX_RESTRICTION_MODE_PASSENGER = "passenger";
+
+    @Test
     // This test verifies the expected way to build config would succeed.
     public void testConstruction() {
         new Builder().build();
@@ -124,13 +130,13 @@
     public void testBuilderValidation_PassengerModeNoSpeedRangeOverlap() {
         Builder builder = new Builder();
         builder.setUxRestrictions(DRIVING_STATE_MOVING, new DrivingStateRestrictions()
-                    .setDistractionOptimizationRequired(true)
-                    .setRestrictions(UX_RESTRICTIONS_FULLY_RESTRICTED)
-                    .setSpeedRange(new Builder.SpeedRange(1f, 2f)));
+                .setDistractionOptimizationRequired(true)
+                .setRestrictions(UX_RESTRICTIONS_FULLY_RESTRICTED)
+                .setSpeedRange(new Builder.SpeedRange(1f, 2f)));
         builder.setUxRestrictions(DRIVING_STATE_MOVING, new DrivingStateRestrictions()
-                    .setDistractionOptimizationRequired(true)
-                    .setRestrictions(UX_RESTRICTIONS_FULLY_RESTRICTED)
-                    .setSpeedRange(new Builder.SpeedRange(1f)));
+                .setDistractionOptimizationRequired(true)
+                .setRestrictions(UX_RESTRICTIONS_FULLY_RESTRICTED)
+                .setSpeedRange(new Builder.SpeedRange(1f)));
         try {
             builder.build();
             fail();
@@ -294,7 +300,7 @@
                 new Builder.SpeedRange(1f);
         Builder.SpeedRange s2 =
                 new Builder.SpeedRange(1f);
-        assertTrue(s1.compareTo(s2) == 0);
+        assertEquals(0, s1.compareTo(s2));
     }
 
     public void testSpeedRangeComparison_SameMinDifferentMax() {
@@ -319,20 +325,20 @@
         Builder.SpeedRange s1, s2;
 
         s1 = new Builder.SpeedRange(0f);
-        assertTrue(s1.equals(s1));
+        assertEquals(s1, s1);
 
         s1 = new Builder.SpeedRange(1f);
         s2 = new Builder.SpeedRange(1f);
-        assertTrue(s1.compareTo(s2) == 0);
-        assertTrue(s1.equals(s2));
+        assertEquals(0, s1.compareTo(s2));
+        assertEquals(s1, s2);
 
         s1 = new Builder.SpeedRange(0f, 1f);
         s2 = new Builder.SpeedRange(0f, 1f);
-        assertTrue(s1.equals(s2));
+        assertEquals(s1, s2);
 
         s1 = new Builder.SpeedRange(0f, MAX_SPEED);
         s2 = new Builder.SpeedRange(0f, MAX_SPEED);
-        assertTrue(s1.equals(s2));
+        assertEquals(s1, s2);
 
         s1 = new Builder.SpeedRange(0f);
         s2 = new Builder.SpeedRange(1f);
@@ -347,7 +353,7 @@
         CarUxRestrictionsConfiguration config =
                 new Builder().build();
 
-        verifyConfigThroughJsonSerialization(config);
+        verifyConfigThroughJsonSerialization(config, /* schemaVersion= */ 2);
     }
 
     public void testJsonSerialization_RestrictionParameters() {
@@ -357,7 +363,7 @@
                 .setMaxContentDepth(1)
                 .build();
 
-        verifyConfigThroughJsonSerialization(config);
+        verifyConfigThroughJsonSerialization(config, /* schemaVersion= */ 2);
     }
 
     public void testJsonSerialization_NonMovingStateRestrictions() {
@@ -365,7 +371,7 @@
                 .setUxRestrictions(DRIVING_STATE_PARKED, false, UX_RESTRICTIONS_BASELINE)
                 .build();
 
-        verifyConfigThroughJsonSerialization(config);
+        verifyConfigThroughJsonSerialization(config, /* schemaVersion= */ 2);
     }
 
     public void testJsonSerialization_MovingStateNoSpeedRange() {
@@ -373,7 +379,7 @@
                 .setUxRestrictions(DRIVING_STATE_MOVING, true, UX_RESTRICTIONS_FULLY_RESTRICTED)
                 .build();
 
-        verifyConfigThroughJsonSerialization(config);
+        verifyConfigThroughJsonSerialization(config, /* schemaVersion= */ 2);
     }
 
     public void testJsonSerialization_MovingStateWithSpeedRange() {
@@ -388,7 +394,7 @@
                         .setSpeedRange(new Builder.SpeedRange(5f, MAX_SPEED)))
                 .build();
 
-        verifyConfigThroughJsonSerialization(config);
+        verifyConfigThroughJsonSerialization(config, /* schemaVersion= */ 2);
     }
 
     public void testJsonSerialization_UxRestrictionMode() {
@@ -409,11 +415,79 @@
                         .setRestrictions(UX_RESTRICTIONS_NO_VIDEO))
                 .build();
 
-        verifyConfigThroughJsonSerialization(config);
+        verifyConfigThroughJsonSerialization(config, /* schemaVersion= */ 2);
+    }
+
+    @Test
+    public void testJsonSerialization_ReadsV1() throws Exception {
+        String v1LegacyJsonFormat = "{\"physical_port\":1,\"max_content_depth\":2,"
+                + "\"max_cumulative_content_items\":20,\"max_string_length\":21,"
+                + "\"parked_restrictions\":[{\"req_opt\":false,\"restrictions\":0}],"
+                + "\"idling_restrictions\":[{\"req_opt\":true,\"restrictions\":7}],"
+                + "\"moving_restrictions\":[{\"req_opt\":true,\"restrictions\":8}],"
+                + "\"unknown_restrictions\":[{\"req_opt\":true,\"restrictions\":511}],"
+                + "\"passenger_parked_restrictions\":[{\"req_opt\":false,\"restrictions\":0}],"
+                + "\"passenger_idling_restrictions\":[{\"req_opt\":true,\"restrictions\":56}],"
+                + "\"passenger_moving_restrictions\":[{\"req_opt\":true,\"restrictions\":57}],"
+                + "\"passenger_unknown_restrictions\":[{\"req_opt\":true,\"restrictions\":510}]}";
+        CarUxRestrictionsConfiguration expectedConfig = new Builder()
+                .setPhysicalPort((byte) 1)
+                .setMaxContentDepth(2)
+                .setMaxCumulativeContentItems(20)
+                .setMaxStringLength(21)
+                .setUxRestrictions(DRIVING_STATE_PARKED, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(false)
+                        .setRestrictions(UX_RESTRICTIONS_BASELINE)
+                        .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_IDLING, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(7)
+                        .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_MOVING, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(8)
+                        .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_UNKNOWN, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(511)
+                        .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_PARKED, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(false)
+                        .setRestrictions(UX_RESTRICTIONS_BASELINE)
+                        .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .setUxRestrictions(DRIVING_STATE_IDLING, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(56)
+                        .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .setUxRestrictions(DRIVING_STATE_MOVING, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(57)
+                        .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .setUxRestrictions(DRIVING_STATE_UNKNOWN, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(510)
+                        .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .build();
+
+        CarUxRestrictionsConfiguration deserialized = CarUxRestrictionsConfiguration.readJson(
+                new JsonReader(new StringReader(v1LegacyJsonFormat)), /* schemaVersion= */ 1);
+        assertEquals(expectedConfig, deserialized);
+    }
+
+
+    @Test
+    public void testJsonSerialization_ReadUnsupportedVersion_ThrowsException() throws Exception {
+        int unsupportedVersion = -1;
+        try {
+            CarUxRestrictionsConfiguration deserialized = CarUxRestrictionsConfiguration.readJson(
+                    new JsonReader(new StringReader("")), unsupportedVersion);
+        } catch (IllegalArgumentException e) {
+            // expected exception
+        }
     }
 
     public void testDump() {
-        CarUxRestrictionsConfiguration[] configs = new CarUxRestrictionsConfiguration[] {
+        CarUxRestrictionsConfiguration[] configs = new CarUxRestrictionsConfiguration[]{
                 // Driving state with no speed range
                 new Builder()
                         .setUxRestrictions(DRIVING_STATE_PARKED, false, UX_RESTRICTIONS_BASELINE)
@@ -490,8 +564,8 @@
         assertTrue(dump.contains("Speed Range"));
         assertTrue(dump.contains("Requires DO?"));
         assertTrue(dump.contains("Restrictions"));
-        assertTrue(dump.contains("Passenger mode"));
-        assertTrue(dump.contains("Baseline mode"));
+        assertTrue(dump.contains("passenger mode"));
+        assertTrue(dump.contains("baseline mode"));
     }
 
     public void testSetUxRestrictions_UnspecifiedModeDefaultsToBaseline() {
@@ -506,7 +580,7 @@
         assertEquals(UX_RESTRICTIONS_NO_VIDEO, restrictions.getActiveRestrictions());
 
         assertTrue(restrictions.isSameRestrictions(
-                config.getUxRestrictions(DRIVING_STATE_PARKED, 0f, UX_RESTRICTIONS_BASELINE)));
+                config.getUxRestrictions(DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_BASELINE)));
     }
 
     public void testSetUxRestrictions_PassengerMode() {
@@ -530,7 +604,41 @@
         assertEquals(UX_RESTRICTIONS_NO_VIDEO, baseline.getActiveRestrictions());
     }
 
-    public void testPassengerModeFallbackToBaseline() {
+    @Test
+    public void testGetUxRestrictions_WithUndefinedMode_FallbackToBaseline() {
+        CarUxRestrictionsConfiguration config = new Builder()
+                .setUxRestrictions(DRIVING_STATE_PARKED, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(UX_RESTRICTIONS_NO_VIDEO))
+                .build();
+
+        CarUxRestrictions passenger = config.getUxRestrictions(
+                DRIVING_STATE_PARKED, 0f, UX_RESTRICTION_MODE_PASSENGER);
+        assertTrue(passenger.isRequiresDistractionOptimization());
+        assertEquals(UX_RESTRICTIONS_NO_VIDEO, passenger.getActiveRestrictions());
+    }
+
+    @Test
+    public void testPassengerMode_GetMovingWhenNotDefined_FallbackToBaseline() {
+        CarUxRestrictionsConfiguration config = new Builder()
+                .setUxRestrictions(DRIVING_STATE_MOVING, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(true)
+                        .setRestrictions(UX_RESTRICTIONS_NO_VIDEO))
+                .setUxRestrictions(DRIVING_STATE_PARKED, new DrivingStateRestrictions()
+                        .setDistractionOptimizationRequired(false)
+                        .setRestrictions(UX_RESTRICTIONS_BASELINE)
+                        .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .build();
+
+        // Retrieve with passenger mode for a moving state
+        CarUxRestrictions passenger = config.getUxRestrictions(
+                DRIVING_STATE_MOVING, 1f, UX_RESTRICTION_MODE_PASSENGER);
+        assertTrue(passenger.isRequiresDistractionOptimization());
+        assertEquals(UX_RESTRICTIONS_NO_VIDEO, passenger.getActiveRestrictions());
+    }
+
+    @Test
+    public void testPassengerMode_GetSpeedOutsideDefinedRange_FallbackToBaseline() {
         CarUxRestrictionsConfiguration config = new Builder()
                 .setUxRestrictions(DRIVING_STATE_MOVING, new DrivingStateRestrictions()
                         .setDistractionOptimizationRequired(true)
@@ -605,8 +713,8 @@
                         new DrivingStateRestrictions().setRestrictions(UX_RESTRICTIONS_NO_VIDEO))
                 .build();
 
-        assertTrue(one.equals(other));
-        assertTrue(one.hashCode() == other.hashCode());
+        assertEquals(one, other);
+        assertEquals(one.hashCode(), other.hashCode());
     }
 
     public void testConfigurationEquals_DifferentRestrictions() {
@@ -681,14 +789,15 @@
         CarUxRestrictionsConfiguration deserialized =
                 CarUxRestrictionsConfiguration.CREATOR.createFromParcel(parcel);
         assertEquals(deserialized, config);
-        assertTrue(deserialized.getPhysicalPort() == null);
+        assertNull(deserialized.getPhysicalPort());
     }
 
     /**
      * Writes input config as json, then reads a config out of json.
      * Asserts the deserialized config is the same as input.
      */
-    private void verifyConfigThroughJsonSerialization(CarUxRestrictionsConfiguration config) {
+    private void verifyConfigThroughJsonSerialization(CarUxRestrictionsConfiguration config,
+            int schemaVersion) {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         try (JsonWriter writer = new JsonWriter(new OutputStreamWriter(out))) {
             config.writeJson(writer);
@@ -700,8 +809,8 @@
         ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
         try (JsonReader reader = new JsonReader(new InputStreamReader(in))) {
             CarUxRestrictionsConfiguration deserialized = CarUxRestrictionsConfiguration.readJson(
-                    reader);
-            assertTrue(config.equals(deserialized));
+                    reader, schemaVersion);
+            assertEquals(config, deserialized);
         } catch (Exception e) {
             e.printStackTrace();
             fail();
diff --git a/tests/carservice_test/src/com/android/car/CarPowerManagementTest.java b/tests/carservice_test/src/com/android/car/CarPowerManagementTest.java
index 58bf088..0ae1e1f 100644
--- a/tests/carservice_test/src/com/android/car/CarPowerManagementTest.java
+++ b/tests/carservice_test/src/com/android/car/CarPowerManagementTest.java
@@ -246,7 +246,11 @@
         mPowerStateHandler.sendPowerState(
                 VehicleApPowerStateReq.SHUTDOWN_PREPARE,
                 VehicleApPowerStateShutdownParam.CAN_SLEEP);
-        assertResponse(VehicleApPowerStateReport.SHUTDOWN_PREPARE, 0, true);
+        // The state machine should go to SHUTDOWN_PREPARE, but may
+        // quickly transition to SHUTDOWN_POSTPONE. Report success
+        // if we got to SHUTDOWN_PREPARE, even if we're not there now.
+        assertResponseTransient(VehicleApPowerStateReport.SHUTDOWN_PREPARE, 0, true);
+
         mMockDisplayInterface.waitForDisplayState(false);
         assertResponse(VehicleApPowerStateReport.DEEP_SLEEP_ENTRY, 0, false);
         mMockDisplayInterface.waitForDisplayState(false);
@@ -255,6 +259,7 @@
         mMockDisplayInterface.waitForDisplayState(false);
     }
 
+    // Check that 'expectedState' was reached and is the current state.
     private void assertResponse(int expectedState, int expectedParam, boolean checkParam)
             throws Exception {
         LinkedList<int[]> setEvents = mPowerStateHandler.waitForStateSetAndGetAll(
@@ -266,6 +271,21 @@
         }
     }
 
+    // Check that 'expectedState' was reached. (But it's OK if it is not still current.)
+    private void assertResponseTransient(int expectedState, int expectedParam, boolean checkParam)
+            throws Exception {
+        LinkedList<int[]> setEvents = mPowerStateHandler.waitForStateSetAndGetAll(
+                DEFAULT_WAIT_TIMEOUT_MS, expectedState);
+        for (int[] aState : setEvents) {
+            if (expectedState != aState[0]) continue;
+            if (checkParam) {
+                assertEquals(expectedParam, aState[1]);
+            }
+            return; // Success
+        }
+        fail("Did not find expected state: " + expectedState);
+    }
+
     private void assertWaitForVhal() throws Exception {
         mPowerStateHandler.waitForSubscription(DEFAULT_WAIT_TIMEOUT_MS);
         LinkedList<int[]> setEvents = mPowerStateHandler.waitForStateSetAndGetAll(
@@ -373,6 +393,7 @@
                     for (int[] state : mSetStates) {
                         if (state[0] == expectedSet) {
                             found = true;
+                            break;
                         }
                     }
                     if (found) {
diff --git a/tests/carservice_test/src/com/android/car/CarUxRestrictionsConfigurationXmlParserTest.java b/tests/carservice_test/src/com/android/car/CarUxRestrictionsConfigurationXmlParserTest.java
index 30649e0..bb3c7bf 100644
--- a/tests/carservice_test/src/com/android/car/CarUxRestrictionsConfigurationXmlParserTest.java
+++ b/tests/carservice_test/src/com/android/car/CarUxRestrictionsConfigurationXmlParserTest.java
@@ -19,7 +19,6 @@
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_MOVING;
 import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_PARKED;
 import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_BASELINE;
-import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_PASSENGER;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -45,6 +44,9 @@
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class CarUxRestrictionsConfigurationXmlParserTest {
+
+    private static final String UX_RESTRICTION_MODE_PASSENGER = "passenger";
+
     private Context getContext() {
         return InstrumentationRegistry.getTargetContext();
     }
@@ -167,7 +169,7 @@
         Set<Byte> expected = new ArraySet<>();
         expected.add((byte) 1);
         expected.add((byte) 2);
-        for (CarUxRestrictionsConfiguration config: configs) {
+        for (CarUxRestrictionsConfiguration config : configs) {
             assertTrue(expected.contains(config.getPhysicalPort()));
         }
     }
@@ -179,7 +181,7 @@
                 CarUxRestrictionsConfigurationXmlParser.parse(
                         getContext(), R.xml.ux_restrictions_multiple_display_ports);
 
-        for (CarUxRestrictionsConfiguration config: configs) {
+        for (CarUxRestrictionsConfiguration config : configs) {
             CarUxRestrictions r = config.getUxRestrictions(DRIVING_STATE_PARKED, 0f);
             assertEquals(1, r.getMaxContentDepth());
             assertEquals(1, r.getMaxCumulativeContentItems());
diff --git a/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java b/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java
index aadb6f9..0b77d8e 100644
--- a/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/CarUxRestrictionsManagerServiceTest.java
@@ -15,9 +15,17 @@
  */
 package com.android.car;
 
+import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_IDLING;
+import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_MOVING;
+import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_PARKED;
+import static android.car.drivingstate.CarDrivingStateEvent.DRIVING_STATE_UNKNOWN;
+import static android.car.drivingstate.CarUxRestrictions.UX_RESTRICTIONS_BASELINE;
+import static android.car.drivingstate.CarUxRestrictionsManager.UX_RESTRICTION_MODE_BASELINE;
+
 import static com.android.car.CarUxRestrictionsManagerService.CONFIG_FILENAME_PRODUCTION;
 import static com.android.car.CarUxRestrictionsManagerService.CONFIG_FILENAME_STAGED;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -27,16 +35,19 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.car.VehiclePropertyIds;
 import android.car.drivingstate.CarDrivingStateEvent;
 import android.car.drivingstate.CarUxRestrictions;
 import android.car.drivingstate.CarUxRestrictionsConfiguration;
 import android.car.drivingstate.CarUxRestrictionsConfiguration.Builder;
+import android.car.drivingstate.ICarDrivingStateChangeListener;
 import android.car.hardware.CarPropertyValue;
+import android.car.hardware.property.CarPropertyEvent;
 import android.content.Context;
 import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.os.RemoteException;
 import android.os.SystemClock;
-import android.util.JsonReader;
 import android.util.JsonWriter;
 
 import androidx.test.InstrumentationRegistry;
@@ -46,6 +57,7 @@
 import com.android.car.systeminterface.SystemInterface;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,18 +66,22 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class CarUxRestrictionsManagerServiceTest {
+
+    private static final String UX_RESTRICTION_MODE_PASSENGER = "passenger";
+
     private CarUxRestrictionsManagerService mService;
 
     @Mock
@@ -109,7 +125,15 @@
         CarUxRestrictionsConfiguration config = createEmptyConfig();
 
         assertTrue(mService.saveUxRestrictionsConfigurationForNextBoot(Arrays.asList(config)));
-        assertTrue(readFile(staged).equals(config));
+
+        String expectedConfig = "{\"schema_version\":2,\"restrictions\":[{\"physical_port\":null,"
+                + "\"max_content_depth\":-1,\"max_cumulative_content_items\":-1,"
+                + "\"max_string_length\":-1,\"baseline\":{\"parked_restrictions\":[{\"req_opt"
+                + "\":true,\"restrictions\":511}],\"idling_restrictions\":[{\"req_opt\":true,"
+                + "\"restrictions\":511}],\"moving_restrictions\":[{\"req_opt\":true,"
+                + "\"restrictions\":511}],\"unknown_restrictions\":[{\"req_opt\":true,"
+                + "\"restrictions\":511}]}}]}";
+        assertEquals(readFile(staged.toPath()), expectedConfig);
         // Verify prod config file was not created.
         assertFalse(new File(mTempSystemCarDir, CONFIG_FILENAME_PRODUCTION).exists());
     }
@@ -156,6 +180,71 @@
     }
 
     @Test
+    public void testLoadConfig_SupportsLegacyV1() throws IOException {
+        String v1LegacyJsonFormat = "[{\"physical_port\":1,\"max_content_depth\":2,"
+                + "\"max_cumulative_content_items\":20,\"max_string_length\":21,"
+                + "\"parked_restrictions\":[{\"req_opt\":false,\"restrictions\":0}],"
+                + "\"idling_restrictions\":[{\"req_opt\":true,\"restrictions\":7}],"
+                + "\"moving_restrictions\":[{\"req_opt\":true,\"restrictions\":8}],"
+                + "\"unknown_restrictions\":[{\"req_opt\":true,\"restrictions\":511}],"
+                + "\"passenger_parked_restrictions\":[{\"req_opt\":false,\"restrictions\":0}],"
+                + "\"passenger_idling_restrictions\":[{\"req_opt\":true,\"restrictions\":56}],"
+                + "\"passenger_moving_restrictions\":[{\"req_opt\":true,\"restrictions\":57}],"
+                + "\"passenger_unknown_restrictions\":[{\"req_opt\":true,\"restrictions\":510}]}]";
+        setupMockFileFromString(CONFIG_FILENAME_PRODUCTION, v1LegacyJsonFormat);
+
+        CarUxRestrictionsConfiguration actual = mService.loadConfig().get(0);
+
+        CarUxRestrictionsConfiguration expectedConfig = new Builder()
+                .setPhysicalPort((byte) 1)
+                .setMaxContentDepth(2)
+                .setMaxCumulativeContentItems(20)
+                .setMaxStringLength(21)
+                .setUxRestrictions(DRIVING_STATE_PARKED,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(false)
+                                .setRestrictions(UX_RESTRICTIONS_BASELINE)
+                                .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_IDLING,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(true)
+                                .setRestrictions(7)
+                                .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_MOVING,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(true)
+                                .setRestrictions(8)
+                                .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_UNKNOWN,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(true)
+                                .setRestrictions(511)
+                                .setMode(UX_RESTRICTION_MODE_BASELINE))
+                .setUxRestrictions(DRIVING_STATE_PARKED,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(false)
+                                .setRestrictions(UX_RESTRICTIONS_BASELINE)
+                                .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .setUxRestrictions(DRIVING_STATE_IDLING,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(true)
+                                .setRestrictions(56)
+                                .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .setUxRestrictions(DRIVING_STATE_MOVING,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(true)
+                                .setRestrictions(57)
+                                .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .setUxRestrictions(DRIVING_STATE_UNKNOWN,
+                        new CarUxRestrictionsConfiguration.DrivingStateRestrictions()
+                                .setDistractionOptimizationRequired(true)
+                                .setRestrictions(510)
+                                .setMode(UX_RESTRICTION_MODE_PASSENGER))
+                .build();
+        assertTrue(actual.equals(expectedConfig));
+    }
+
+    @Test
     public void testLoadConfig_PromoteStagedFileWhenParked() throws Exception {
         CarUxRestrictionsConfiguration expected = createEmptyConfig();
         // Staged file contains actual config. Ignore prod since it should be overwritten by staged.
@@ -220,6 +309,198 @@
         assertTrue(restrictions.toString(), expected.isSameRestrictions(restrictions));
     }
 
+    // This test only involves calling a few methods and should finish very quickly. If it doesn't
+    // finish in 20s, we probably encountered a deadlock.
+    @Test(timeout = 20000)
+    public void testInitService_NoDeadlockWithCarDrivingStateService()
+            throws Exception {
+
+        CarDrivingStateService drivingStateService = new CarDrivingStateService(mSpyContext,
+                mMockCarPropertyService);
+        CarUxRestrictionsManagerService uxRestrictionsService = new CarUxRestrictionsManagerService(
+                mSpyContext, drivingStateService, mMockCarPropertyService);
+
+        CountDownLatch dispatchingStartedSignal = new CountDownLatch(1);
+        CountDownLatch initCompleteSignal = new CountDownLatch(1);
+
+        // A deadlock can exist when the dispatching of a listener is synchronized. For instance,
+        // the CarUxRestrictionsManagerService#init() method registers a callback like this one. The
+        // deadlock risk occurs if:
+        // 1. CarUxRestrictionsManagerService has registered a listener with CarDrivingStateService
+        // 2. A synchronized method of CarUxRestrictionsManagerService starts to run
+        // 3. While the method from (2) is running, a property event occurs on a different thread
+        //    that triggers a drive state event in CarDrivingStateService. If CarDrivingStateService
+        //    handles the property event in a synchronized method, then CarDrivingStateService is
+        //    locked. The listener from (1) will wait until the lock on
+        //    CarUxRestrictionsManagerService is released.
+        // 4. The synchronized method from (2) attempts to access CarDrivingStateService. For
+        //    example, the implementation below attempts to read the restriction mode.
+        //
+        // In the above steps, both CarUxRestrictionsManagerService and CarDrivingStateService are
+        // locked and waiting on each other, hence the deadlock.
+        drivingStateService.registerDrivingStateChangeListener(
+                new ICarDrivingStateChangeListener.Stub() {
+                    @Override
+                    public void onDrivingStateChanged(CarDrivingStateEvent event)
+                            throws RemoteException {
+                        // EVENT 2 [new thread]: this callback is called from within
+                        // handlePropertyEvent(), which might (but shouldn't) lock
+                        // CarDrivingStateService
+
+                        // Notify that the dispatching process has started
+                        dispatchingStartedSignal.countDown();
+
+                        try {
+                            // EVENT 3b [new thread]: Wait until init() has finished. If these
+                            // threads don't have lock dependencies, there is no reason there
+                            // would be an issue with waiting.
+                            //
+                            // In the real world, this wait could represent a long-running
+                            // task, or hitting the below line that attempts to access the
+                            // CarUxRestrictionsManagerService (which might be locked while init
+                            // () is running).
+                            //
+                            // If there is a deadlock while waiting for init to complete, we will
+                            // never progress past this line.
+                            initCompleteSignal.await();
+                        } catch (InterruptedException e) {
+                            Assert.fail("onDrivingStateChanged thread interrupted");
+                        }
+
+                        // Attempt to access CarUxRestrictionsManagerService. If
+                        // CarUxRestrictionsManagerService is locked because it is doing its own
+                        // work, then this will wait.
+                        //
+                        // This line won't execute in the deadlock flow. However, it is an example
+                        // of a real-world piece of code that would serve the same role as the above
+                        uxRestrictionsService.getCurrentUxRestrictions();
+                    }
+                });
+
+        // EVENT 1 [new thread]: handlePropertyEvent() is called, which locks CarDrivingStateService
+        // Ideally CarPropertyService would trigger the change event, but since that is mocked
+        // we manually trigger the event. This event is what eventually triggers the dispatch to
+        // ICarDrivingStateChangeListener that was defined above.
+        Runnable propertyChangeEventRunnable =
+                () -> drivingStateService.handlePropertyEvent(
+                        new CarPropertyEvent(CarPropertyEvent.PROPERTY_EVENT_PROPERTY_CHANGE,
+                                new CarPropertyValue<>(
+                                        VehiclePropertyIds.PERF_VEHICLE_SPEED, 0, 100f)));
+        Thread thread = new Thread(propertyChangeEventRunnable);
+        thread.start();
+
+        // Wait until propertyChangeEventRunnable has triggered and the
+        // ICarDrivingStateChangeListener callback declared above started to run.
+        dispatchingStartedSignal.await();
+
+        // EVENT 3a [main thread]: init() is called, which locks CarUxRestrictionsManagerService
+        // If init() is synchronized, thereby locking CarUxRestrictionsManagerService, and it
+        // internally attempts to access CarDrivingStateService, and if CarDrivingStateService has
+        // been locked because of the above listener, then both classes are locked and waiting on
+        // each other, so we would encounter a deadlock.
+        uxRestrictionsService.init();
+
+        // If there is a deadlock in init(), then this will never be called
+        initCompleteSignal.countDown();
+
+        // wait for thread to join to leave in a deterministic state
+        try {
+            thread.join(5000);
+        } catch (InterruptedException e) {
+            Assert.fail("Thread failed to join");
+        }
+    }
+
+    // This test only involves calling a few methods and should finish very quickly. If it doesn't
+    // finish in 20s, we probably encountered a deadlock.
+    @Test(timeout = 20000)
+    public void testSetUxRChangeBroadcastEnabled_NoDeadlockWithCarDrivingStateService()
+            throws Exception {
+
+        CarDrivingStateService drivingStateService = new CarDrivingStateService(mSpyContext,
+                mMockCarPropertyService);
+        CarUxRestrictionsManagerService uxRestrictionService = new CarUxRestrictionsManagerService(
+                mSpyContext, drivingStateService, mMockCarPropertyService);
+
+        CountDownLatch dispatchingStartedSignal = new CountDownLatch(1);
+        CountDownLatch initCompleteSignal = new CountDownLatch(1);
+
+        // See testInitService_NoDeadlockWithCarDrivingStateService for details on why a deadlock
+        // may occur. This test could fail for the same reason, except the callback we register here
+        // is purely to introduce a delay, and the deadlock actually happens inside the callback
+        // that CarUxRestrictionsManagerService#init() registers internally.
+        drivingStateService.registerDrivingStateChangeListener(
+                new ICarDrivingStateChangeListener.Stub() {
+                    @Override
+                    public void onDrivingStateChanged(CarDrivingStateEvent event)
+                            throws RemoteException {
+                        // EVENT 2 [new thread]: this callback is called from within
+                        // handlePropertyEvent(), which might (but shouldn't) lock
+                        // CarDrivingStateService
+
+                        // Notify that the dispatching process has started
+                        dispatchingStartedSignal.countDown();
+
+                        try {
+                            // EVENT 3b [new thread]: Wait until init() has finished. If these
+                            // threads don't have lock dependencies, there is no reason there
+                            // would be an issue with waiting.
+                            //
+                            // In the real world, this wait could represent a long-running
+                            // task, or hitting the line inside
+                            // CarUxRestrictionsManagerService#init()'s internal registration
+                            // that attempts to access the CarUxRestrictionsManagerService (which
+                            // might be locked while init() is running).
+                            //
+                            // If there is a deadlock while waiting for init to complete, we will
+                            // never progress past this line.
+                            initCompleteSignal.await();
+                        } catch (InterruptedException e) {
+                            Assert.fail("onDrivingStateChanged thread interrupted");
+                        }
+                    }
+                });
+
+        // The init() method internally registers a callback to CarDrivingStateService
+        uxRestrictionService.init();
+
+        // EVENT 1 [new thread]: handlePropertyEvent() is called, which locks CarDrivingStateService
+        // Ideally CarPropertyService would trigger the change event, but since that is mocked
+        // we manually trigger the event. This event eventually triggers the dispatch to
+        // ICarDrivingStateChangeListener that was defined above and a dispatch to the registration
+        // that CarUxRestrictionsManagerService internally made to CarDrivingStateService in
+        // CarUxRestrictionsManagerService#init().
+        Runnable propertyChangeEventRunnable =
+                () -> drivingStateService.handlePropertyEvent(
+                        new CarPropertyEvent(CarPropertyEvent.PROPERTY_EVENT_PROPERTY_CHANGE,
+                                new CarPropertyValue<>(
+                                        VehiclePropertyIds.PERF_VEHICLE_SPEED, 0, 100f)));
+        Thread thread = new Thread(propertyChangeEventRunnable);
+        thread.start();
+
+        // Wait until propertyChangeEventRunnable has triggered and the
+        // ICarDrivingStateChangeListener callback declared above started to run.
+        dispatchingStartedSignal.await();
+
+        // EVENT 3a [main thread]: a synchronized method is called, which locks
+        // CarUxRestrictionsManagerService
+        //
+        // Any synchronized method that internally accesses CarDrivingStateService could encounter a
+        // deadlock if the above setup locks CarDrivingStateService.
+        uxRestrictionService.setUxRChangeBroadcastEnabled(true);
+
+        // If there is a deadlock in init(), then this will never be called
+        initCompleteSignal.countDown();
+
+        // wait for thread to join to leave in a deterministic state
+        try {
+            thread.join(5000);
+        } catch (InterruptedException e) {
+            Assert.fail("Thread failed to join");
+        }
+    }
+
+
     private CarUxRestrictionsConfiguration createEmptyConfig() {
         return createEmptyConfig(null);
     }
@@ -268,14 +549,21 @@
         return f;
     }
 
-    private CarUxRestrictionsConfiguration readFile(File file) throws Exception {
-        try (JsonReader reader = new JsonReader(
-                new InputStreamReader(new FileInputStream(file), "UTF-8"))) {
-            CarUxRestrictionsConfiguration config = null;
-            reader.beginArray();
-            config = CarUxRestrictionsConfiguration.readJson(reader);
-            reader.endArray();
-            return config;
+    private File setupMockFileFromString(String filename, String config)
+            throws IOException {
+        File f = new File(mTempSystemCarDir, filename);
+        assertTrue(f.createNewFile());
+
+        if (config != null) {
+            try (FileOutputStream writer = new FileOutputStream(f)) {
+                byte[] bytes = config.getBytes();
+                writer.write(bytes);
+            }
         }
+        return f;
+    }
+
+    private String readFile(Path path) throws Exception {
+        return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
     }
 }
diff --git a/tests/carservice_test/src/com/android/car/MockedCarTestBase.java b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
index 894c402..69eba19 100644
--- a/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
+++ b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
@@ -56,6 +56,7 @@
 import com.android.car.vehiclehal.test.MockedVehicleHal.StaticPropertyHandler;
 import com.android.car.vehiclehal.test.MockedVehicleHal.VehicleHalPropertyHandler;
 import com.android.car.vehiclehal.test.VehiclePropConfigBuilder;
+import com.android.car.vms.VmsClientManager;
 
 import org.junit.After;
 import org.junit.Before;
@@ -185,6 +186,10 @@
         return (CarPackageManagerService) mCarImpl.getCarService(Car.PACKAGE_SERVICE);
     }
 
+    public VmsClientManager getVmsClientManager() {
+        return (VmsClientManager) mCarImpl.getCarInternalService(ICarImpl.INTERNAL_VMS_MANAGER);
+    }
+
     protected Context getCarServiceContext() {
         return getContext();
     }
@@ -261,11 +266,10 @@
         if (mRealCarServiceReleased) {
             return;  // We just want to release it once.
         }
-
         mRealCarServiceReleased = true;  // To make sure it was called once.
 
         Object waitForConnection = new Object();
-        android.car.Car car = android.car.Car.createCar(context, new ServiceConnection() {
+        Car car = android.car.Car.createCar(context, new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
                 synchronized (waitForConnection) {
@@ -287,10 +291,10 @@
         if (car.isConnected()) {
             Log.i(TAG, "Connected to real car service");
             CarTestManagerBinderWrapper binderWrapper =
-                    (CarTestManagerBinderWrapper) car.getCarManager(android.car.Car.TEST_SERVICE);
+                    (CarTestManagerBinderWrapper) car.getCarManager(Car.TEST_SERVICE);
             assertNotNull(binderWrapper);
 
-            CarTestManager mgr = new CarTestManager(binderWrapper.binder);
+            CarTestManager mgr = new CarTestManager(car, binderWrapper.binder);
             mgr.stopCarService(mCarServiceToken);
         }
     }
diff --git a/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java b/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java
index 450b9e9..ccc2e6c 100644
--- a/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java
+++ b/tests/carservice_test/src/com/android/car/MockedVmsTestBase.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import android.app.ActivityManager;
 import android.car.Car;
 import android.car.VehicleAreaType;
 import android.car.vms.VmsAvailableLayers;
@@ -25,7 +26,6 @@
 import android.car.vms.VmsPublisherClientService;
 import android.car.vms.VmsSubscriberManager;
 import android.car.vms.VmsSubscriptionState;
-import android.content.Intent;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropertyAccess;
@@ -34,7 +34,6 @@
 import android.hardware.automotive.vehicle.V2_0.VmsBaseMessageIntegerValuesIndex;
 import android.hardware.automotive.vehicle.V2_0.VmsMessageType;
 import android.hardware.automotive.vehicle.V2_0.VmsStartSessionMessageIntegerValuesIndex;
-import android.os.UserHandle;
 import android.util.Log;
 import android.util.Pair;
 
@@ -83,8 +82,7 @@
     @Before
     public void setUpVms() throws Exception {
         // Trigger VmsClientManager to bind to the MockPublisherClient
-        getContext().sendBroadcastAsUser(new Intent(Intent.ACTION_USER_UNLOCKED), UserHandle.ALL);
-
+        getVmsClientManager().mUserCallback.onSwitchUser(ActivityManager.getCurrentUser());
         mVmsSubscriberManager = (VmsSubscriberManager) getCar().getCarManager(
                 Car.VMS_SUBSCRIBER_SERVICE);
         mSubscriberClient = new MockSubscriberClient();
diff --git a/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java b/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java
index 0e3adde..0bb9d4f 100644
--- a/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsPublisherClientPermissionTest.java
@@ -21,10 +21,9 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import android.app.ActivityManager;
 import android.car.vms.VmsPublisherClientService;
 import android.car.vms.VmsSubscriptionState;
-import android.content.Intent;
-import android.os.UserHandle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -98,7 +97,7 @@
 
     @Before
     public void triggerClientBinding() {
-        getContext().sendBroadcastAsUser(new Intent(Intent.ACTION_USER_UNLOCKED), UserHandle.ALL);
+        getVmsClientManager().mUserCallback.onSwitchUser(ActivityManager.getCurrentUser());
     }
 
     @Test
diff --git a/tests/carservice_test/src/com/android/car/vms/VmsBrokerServiceTest.java b/tests/carservice_test/src/com/android/car/vms/VmsBrokerServiceTest.java
deleted file mode 100644
index 5ce7df5..0000000
--- a/tests/carservice_test/src/com/android/car/vms/VmsBrokerServiceTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.car.vms;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.car.vms.IVmsSubscriberClient;
-import android.car.vms.VmsLayer;
-import android.content.pm.PackageManager;
-import android.os.Binder;
-import android.os.Process;
-
-import androidx.test.filters.MediumTest;
-
-import org.junit.Test;
-
-import java.util.function.IntSupplier;
-
-@MediumTest
-public class VmsBrokerServiceTest {
-
-    class MockIntProvider implements IntSupplier {
-        private int[] mInts;
-        private int mIdx;
-
-        MockIntProvider(int... ints) {
-            mInts = ints;
-            mIdx = 0;
-        }
-
-        public int getAsInt() {
-            int ret = mInts[mIdx];
-            mIdx++;
-            return ret;
-        }
-    }
-
-    /**
-     * Test that adding a subscriber to VmsBrokerService also keeps track of the package name for
-     * a given subscriber. Also checks that if we remove a dead subscriber, we no longer track the
-     * package name associated with it.
-     */
-    @Test
-    public void testAddSubscription() {
-        PackageManager packageManager = mock(PackageManager.class);
-        IVmsSubscriberClient subscriberClient = mock(IVmsSubscriberClient.class);
-        Binder binder = mock(Binder.class);
-        VmsLayer layer = mock(VmsLayer.class);
-        when(packageManager.getNameForUid(0)).thenReturn("test.package1");
-        when(subscriberClient.asBinder()).thenReturn(binder);
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> 200, () -> 0);
-        broker.addSubscription(subscriberClient);
-        assertThat(broker.getPackageName(subscriberClient)).isEqualTo("test.package1");
-        broker.removeDeadSubscriber(subscriberClient);
-        assertThat(broker.getPackageName(subscriberClient)).isNull();
-    }
-
-    @Test
-    public void testAddSubscriptionLayer() {
-        PackageManager packageManager = mock(PackageManager.class);
-        IVmsSubscriberClient subscriberClient = mock(IVmsSubscriberClient.class);
-        Binder binder = mock(Binder.class);
-        VmsLayer layer = mock(VmsLayer.class);
-        when(packageManager.getNameForUid(0)).thenReturn("test.package2");
-        when(subscriberClient.asBinder()).thenReturn(binder);
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> 200, () -> 0);
-        broker.addSubscription(subscriberClient, layer);
-        assertThat(broker.getPackageName(subscriberClient)).isEqualTo("test.package2");
-        broker.removeDeadSubscriber(subscriberClient);
-        assertThat(broker.getPackageName(subscriberClient)).isNull();
-    }
-
-    @Test
-    public void testAddSubscriptionLayerVersion() {
-        PackageManager packageManager = mock(PackageManager.class);
-        IVmsSubscriberClient subscriberClient = mock(IVmsSubscriberClient.class);
-        Binder binder = mock(Binder.class);
-        VmsLayer layer = mock(VmsLayer.class);
-        when(packageManager.getNameForUid(0)).thenReturn("test.package3");
-        when(subscriberClient.asBinder()).thenReturn(binder);
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> 200, () -> 0);
-        broker.addSubscription(subscriberClient, layer, 1234);
-        assertThat(broker.getPackageName(subscriberClient)).isEqualTo("test.package3");
-        broker.removeDeadSubscriber(subscriberClient);
-        assertThat(broker.getPackageName(subscriberClient)).isNull();
-    }
-
-    @Test
-    public void testMultipleSubscriptionsSameClientCallsPackageManagerOnce() {
-        PackageManager packageManager = mock(PackageManager.class);
-        IVmsSubscriberClient subscriberClient = mock(IVmsSubscriberClient.class);
-        Binder binder = mock(Binder.class);
-        when(subscriberClient.asBinder()).thenReturn(binder);
-        when(packageManager.getNameForUid(0)).thenReturn("test.package3");
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> 0, () -> 0);
-        broker.addSubscription(subscriberClient);
-        broker.addSubscription(subscriberClient);
-        // The second argument isn't necessary but is here for clarity.
-        verify(packageManager, times(1)).getNameForUid(0);
-    }
-
-    @Test
-    public void testUnknownPackageName() {
-        PackageManager packageManager = mock(PackageManager.class);
-        IVmsSubscriberClient subscriberClient = mock(IVmsSubscriberClient.class);
-        Binder binder = mock(Binder.class);
-        when(subscriberClient.asBinder()).thenReturn(binder);
-        when(packageManager.getNameForUid(0)).thenReturn(null);
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> 0, () -> 0);
-        broker.addSubscription(subscriberClient);
-        assertThat(broker.getPackageName(subscriberClient)).isEqualTo(
-                VmsBrokerService.UNKNOWN_PACKAGE);
-    }
-
-    /**
-     * Tests that if the HAL is a subscriber, we record its package name as HalClient.
-     */
-    @Test
-    public void testAddingHalSubscriberSavesPackageName() {
-        PackageManager packageManager = mock(PackageManager.class);
-        IVmsSubscriberClient subscriberClient = mock(IVmsSubscriberClient.class);
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> Process.myPid(),
-                () -> Process.SYSTEM_UID);
-        broker.addSubscription(subscriberClient);
-        assertThat(broker.getPackageName(subscriberClient)).isEqualTo(VmsBrokerService.HAL_CLIENT);
-    }
-
-    @Test
-    public void testMultipleSubscriptionsPackageManager() {
-        PackageManager packageManager = mock(PackageManager.class);
-
-        IVmsSubscriberClient subscriberClient1 = mock(IVmsSubscriberClient.class);
-        Binder binder1 = mock(Binder.class);
-        when(subscriberClient1.asBinder()).thenReturn(binder1);
-
-        IVmsSubscriberClient subscriberClient2 = mock(IVmsSubscriberClient.class);
-        Binder binder2 = mock(Binder.class);
-        when(subscriberClient2.asBinder()).thenReturn(binder2);
-
-        IVmsSubscriberClient subscriberClient3 = mock(IVmsSubscriberClient.class);
-        Binder binder3 = mock(Binder.class);
-        when(subscriberClient3.asBinder()).thenReturn(binder3);
-
-        // Tests a client with a different UID but the same package as subscriberClient1
-        IVmsSubscriberClient subscriberClient4 = mock(IVmsSubscriberClient.class);
-        Binder binder4 = mock(Binder.class);
-        when(subscriberClient4.asBinder()).thenReturn(binder4);
-
-        when(packageManager.getNameForUid(0)).thenReturn("test.package0");
-        when(packageManager.getNameForUid(1)).thenReturn("test.package1");
-        when(packageManager.getNameForUid(2)).thenReturn("test.package2");
-        when(packageManager.getNameForUid(3)).thenReturn("test.package0");
-
-        VmsBrokerService broker = new VmsBrokerService(packageManager, () -> 10,
-                new MockIntProvider(0, 1, 2, 3));
-
-        broker.addSubscription(subscriberClient1);
-        broker.addSubscription(subscriberClient2);
-        broker.addSubscription(subscriberClient3);
-        broker.addSubscription(subscriberClient4);
-
-        verify(packageManager).getNameForUid(0);
-        verify(packageManager).getNameForUid(1);
-        verify(packageManager).getNameForUid(2);
-        verify(packageManager).getNameForUid(3);
-
-        assertThat(broker.getPackageName(subscriberClient1)).isEqualTo("test.package0");
-        assertThat(broker.getPackageName(subscriberClient2)).isEqualTo("test.package1");
-        assertThat(broker.getPackageName(subscriberClient3)).isEqualTo("test.package2");
-        assertThat(broker.getPackageName(subscriberClient4)).isEqualTo("test.package0");
-    }
-}
diff --git a/tests/carservice_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index 6b715fc..f172a61 100644
--- a/tests/carservice_unit_test/Android.mk
+++ b/tests/carservice_unit_test/Android.mk
@@ -18,7 +18,9 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    ../../../../../frameworks/opt/car/services/src/com/android/internal/car/ICarServiceHelper.aidl
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
     packages/services/Car/service/res
@@ -48,17 +50,19 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     androidx.test.core \
+    androidx.test.ext.junit \
     androidx.test.rules \
     car-frameworks-service \
     car-service-lib-for-test \
     com.android.car.test.utils \
-    junit \
-    mockito-target-inline-minus-junit4 \
     frameworks-base-testutils \
+    mockito-target-extended \
+    testng \
     truth-prebuilt
 
 # mockito-target-inline dependency
 LOCAL_JNI_SHARED_LIBRARIES := \
     libdexmakerjvmtiagent \
+    libstaticjvmtiagent \
 
 include $(BUILD_PACKAGE)
diff --git a/tests/carservice_unit_test/AndroidManifest.xml b/tests/carservice_unit_test/AndroidManifest.xml
index e5e31bf..5ed59ef 100644
--- a/tests/carservice_unit_test/AndroidManifest.xml
+++ b/tests/carservice_unit_test/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
             android:targetPackage="com.android.car.carservice_unittest"
             android:label="Unit Tests for Car APIs"/>
+    <uses-permission android:name="android.car.permission.CAR_ENROLL_TRUST" />
 
     <application android:label="CarServiceUnitTest"
             android:debuggable="true">
diff --git a/tests/carservice_unit_test/src/android/car/CarTest.java b/tests/carservice_unit_test/src/android/car/CarTest.java
new file mode 100644
index 0000000..d1f5ac6
--- /dev/null
+++ b/tests/carservice_unit_test/src/android/car/CarTest.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 android.car;
+
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.annotation.Nullable;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.ServiceManager;
+import android.util.Pair;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.car.CarServiceUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoSession;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.quality.Strictness;
+
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Unit test for Car API.
+ */
+@RunWith(AndroidJUnit4.class)
+public class CarTest {
+    private static final String TAG = CarTest.class.getSimpleName();
+
+    private MockitoSession mMockingSession;
+
+    @Mock
+    private Context mContext;
+
+    private int mGetServiceCallCount;
+
+    // It is tricky to mock this. So create dummy version instead.
+    private ICar.Stub mService = new ICar.Stub() {
+        @Override
+        public void setCarServiceHelper(android.os.IBinder helper) {
+        }
+
+        @Override
+        public void setUserLockStatus(int userHandle, int unlocked) {
+        }
+
+        @Override
+        public void onSwitchUser(int userHandle) {
+        }
+
+        @Override
+        public android.os.IBinder getCarService(java.lang.String serviceName) {
+            return null;
+        }
+
+        @Override
+        public int getCarConnectionType() {
+            return 0;
+        }
+    };
+
+    private class LifecycleListener implements Car.CarServiceLifecycleListener {
+        // Use thread safe one to prevent adding another lock for testing
+        private CopyOnWriteArrayList<Pair<Car, Boolean>> mEvents = new CopyOnWriteArrayList<>();
+
+        @Override
+        public void onLifecycleChanged(Car car, boolean ready) {
+            assertThat(Looper.getMainLooper()).isEqualTo(Looper.myLooper());
+            mEvents.add(new Pair<>(car, ready));
+        }
+    }
+
+    private  final LifecycleListener mLifecycleListener = new LifecycleListener();
+
+    @Before
+    public void setUp() {
+        mMockingSession = mockitoSession()
+                .initMocks(this)
+                .mockStatic(ServiceManager.class)
+                .strictness(Strictness.LENIENT)
+                .startMocking();
+        mGetServiceCallCount = 0;
+    }
+
+    @After
+    public void tearDown() {
+        mMockingSession.finishMocking();
+    }
+
+    private void expectService(@Nullable IBinder service) {
+        doReturn(service).when(
+                () -> ServiceManager.getService(Car.CAR_SERVICE_BINDER_SERVICE_NAME));
+    }
+
+    private void expectBindService() {
+        when(mContext.bindServiceAsUser(anyObject(), anyObject(), anyInt(),
+                anyObject())).thenReturn(true);
+    }
+
+    private void returnServiceAfterNSereviceManagerCalls(int returnNonNullAfterThisCall) {
+        doAnswer((InvocationOnMock invocation)  -> {
+            mGetServiceCallCount++;
+            if (mGetServiceCallCount > returnNonNullAfterThisCall) {
+                return mService;
+            } else {
+                return null;
+            }
+        }).when(() -> ServiceManager.getService(Car.CAR_SERVICE_BINDER_SERVICE_NAME));
+    }
+
+    private void assertServiceBoundOnce() {
+        verify(mContext, times(1)).bindServiceAsUser(anyObject(), anyObject(), anyInt(),
+                anyObject());
+    }
+
+    private void assertOneListenerCallAndClear(Car expectedCar, boolean ready) {
+        assertThat(mLifecycleListener.mEvents).containsExactly(new Pair<>(expectedCar, ready));
+        mLifecycleListener.mEvents.clear();
+    }
+
+    @Test
+    public void testCreateCarSuccessWithCarServiceRunning() {
+        expectService(mService);
+        Car car = Car.createCar(mContext);
+        assertThat(car).isNotNull();
+        car.disconnect();
+    }
+
+    @Test
+    public void testCreateCarReturnNull() {
+        // car service is not running yet and bindService does not bring the service yet.
+        // createCar should timeout and give up.
+        expectService(null);
+        assertThat(Car.createCar(mContext)).isNull();
+    }
+
+    @Test
+    public void testCreateCarOkWhenCarServiceIsStarted() {
+        returnServiceAfterNSereviceManagerCalls(10);
+        // Car service is not running yet and binsService call should start it.
+        expectBindService();
+        Car car = Car.createCar(mContext);
+        assertThat(car).isNotNull();
+        assertServiceBoundOnce();
+        car.disconnect();
+    }
+
+    @Test
+    public void testCreateCarWithStatusChangeNoServiceConnectionWithCarServiceStarted() {
+        returnServiceAfterNSereviceManagerCalls(10);
+        expectBindService();
+        Car car = Car.createCar(mContext, null,
+                Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, mLifecycleListener);
+        assertThat(car).isNotNull();
+        assertServiceBoundOnce();
+        waitForMainToBeComplete();
+        assertOneListenerCallAndClear(car, true);
+
+        // Just call these to guarantee that nothing crashes with these call.
+        runOnMainSyncSafe(() -> {
+            car.getServiceConnectionListener().onServiceConnected(new ComponentName("", ""),
+                    mService);
+            car.getServiceConnectionListener().onServiceDisconnected(new ComponentName("", ""));
+        });
+    }
+
+    @Test
+    public void testCreateCarWithStatusChangeNoServiceHandleCarServiceRestart() {
+        expectService(mService);
+        expectBindService();
+        Car car = Car.createCar(mContext, null,
+                Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, mLifecycleListener);
+        assertThat(car).isNotNull();
+        assertServiceBoundOnce();
+
+        // fake connection
+        runOnMainSyncSafe(() ->
+                car.getServiceConnectionListener().onServiceConnected(new ComponentName("", ""),
+                        mService));
+        waitForMainToBeComplete();
+        assertOneListenerCallAndClear(car, true);
+
+        // fake crash
+        runOnMainSyncSafe(() ->
+                car.getServiceConnectionListener().onServiceDisconnected(
+                        new ComponentName("", "")));
+        waitForMainToBeComplete();
+        assertOneListenerCallAndClear(car, false);
+
+
+        // fake restart
+        runOnMainSyncSafe(() ->
+                car.getServiceConnectionListener().onServiceConnected(new ComponentName("", ""),
+                        mService));
+        waitForMainToBeComplete();
+        assertOneListenerCallAndClear(car, true);
+    }
+
+    @Test
+    public void testCreateCarWithStatusChangeDirectCallInsideMainForServiceAlreadyReady() {
+        expectService(mService);
+        expectBindService();
+        runOnMainSyncSafe(() -> {
+            Car car = Car.createCar(mContext, null,
+                    Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, mLifecycleListener);
+            assertThat(car).isNotNull();
+            verify(mContext, times(1)).bindServiceAsUser(anyObject(), anyObject(), anyInt(),
+                    anyObject());
+            // mLifecycleListener should have been called as this is main thread.
+            assertOneListenerCallAndClear(car, true);
+        });
+    }
+
+    @Test
+    public void testCreateCarWithStatusChangeDirectCallInsideMainForServiceReadyLater() {
+        returnServiceAfterNSereviceManagerCalls(10);
+        expectBindService();
+        runOnMainSyncSafe(() -> {
+            Car car = Car.createCar(mContext, null,
+                    Car.CAR_WAIT_TIMEOUT_WAIT_FOREVER, mLifecycleListener);
+            assertThat(car).isNotNull();
+            assertServiceBoundOnce();
+            assertOneListenerCallAndClear(car, true);
+        });
+    }
+
+    private void runOnMainSyncSafe(Runnable runnable) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
+            runnable.run();
+        } else {
+            CarServiceUtils.runOnMainSync(runnable);
+        }
+    }
+    private void waitForMainToBeComplete() {
+        // dispatch dummy runnable and confirm that it is done.
+        runOnMainSyncSafe(() -> { });
+    }
+}
diff --git a/tests/carservice_unit_test/src/com/android/car/CarLocationServiceTest.java b/tests/carservice_unit_test/src/com/android/car/CarLocationServiceTest.java
index c9e85e0..5384005 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarLocationServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarLocationServiceTest.java
@@ -415,13 +415,17 @@
 
     /**
      * Test that the {@link CarLocationService} deletes location_cache.json when the system resumes
-     * from suspend-to-ram.
+     * from suspend-to-ram if moving.
      */
     @Test
-    public void testDeletesCacheFileUponSuspendExit() throws Exception {
+    public void testDeletesCacheFileUponSuspendExitWhileMoving() throws Exception {
         mCarLocationService.init();
         when(mMockLocationManagerProxy.isLocationEnabled()).thenReturn(false);
+        when(mMockCarDrivingStateService.getCurrentDrivingState()).thenReturn(
+                new CarDrivingStateEvent(CarDrivingStateEvent.DRIVING_STATE_MOVING, 0));
+        writeCacheFile("{\"provider\":\"latitude\":16.7666,\"longitude\": \"accuracy\":1.0}");
         CompletableFuture<Void> future = new CompletableFuture<>();
+        assertTrue(getLocationCacheFile().exists());
 
         mCarLocationService.onStateChanged(CarPowerStateListener.SUSPEND_EXIT, future);
 
@@ -431,6 +435,26 @@
     }
 
     /**
+     * Test that the {@link CarLocationService} registers for driving state changes when the system
+     * resumes from suspend-to-ram.
+     */
+    @Test
+    public void testRegistersForDrivingStateChangesUponSuspendExit() throws Exception {
+        mCarLocationService.init();
+        when(mMockLocationManagerProxy.isLocationEnabled()).thenReturn(false);
+        when(mMockCarDrivingStateService.getCurrentDrivingState()).thenReturn(
+                new CarDrivingStateEvent(CarDrivingStateEvent.DRIVING_STATE_PARKED, 0));
+        CompletableFuture<Void> future = new CompletableFuture<>();
+
+        mCarLocationService.onStateChanged(CarPowerStateListener.SUSPEND_EXIT, future);
+
+        assertTrue(future.isDone());
+        verify(mMockLocationManagerProxy, times(0)).isLocationEnabled();
+        // One of the registrations should happen during init and another during onStateChanged.
+        verify(mMockCarDrivingStateService, times(2)).registerDrivingStateChangeListener(any());
+    }
+
+    /**
      * Test that the {@link CarLocationService} deletes location_cache.json when the car enters a
      * moving driving state.
      */
diff --git a/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java b/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
index fa82f90..6baf12a 100644
--- a/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/CarPowerManagementServiceTest.java
@@ -16,22 +16,44 @@
 
 package com.android.car;
 
+import static android.content.pm.UserInfo.FLAG_EPHEMERAL;
+import static android.content.pm.UserInfo.FLAG_GUEST;
+import static android.os.UserHandle.USER_SYSTEM;
+
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.notNull;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import android.annotation.Nullable;
+import android.app.ActivityManager;
 import android.car.hardware.power.CarPowerManager.CarPowerStateListener;
 import android.car.hardware.power.ICarPowerStateListener;
 import android.car.userlib.CarUserManagerHelper;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.VehicleApPowerStateReq;
 import android.hardware.automotive.vehicle.V2_0.VehicleApPowerStateShutdownParam;
 import android.os.RemoteException;
-import android.test.AndroidTestCase;
+import android.os.UserManager;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+
 import com.android.car.hal.PowerHalService;
 import com.android.car.hal.PowerHalService.PowerState;
 import com.android.car.systeminterface.DisplayInterface;
@@ -41,94 +63,157 @@
 import com.android.car.systeminterface.WakeLockInterface;
 import com.android.car.test.utils.TemporaryDirectory;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoSession;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.quality.Strictness;
+
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
 @SmallTest
-public class CarPowerManagementServiceTest extends AndroidTestCase {
+@RunWith(MockitoJUnitRunner.class)
+public class CarPowerManagementServiceTest {
     private static final String TAG = CarPowerManagementServiceTest.class.getSimpleName();
     private static final long WAIT_TIMEOUT_MS = 2000;
     private static final long WAIT_TIMEOUT_LONG_MS = 5000;
+    private static final int NO_USER_INFO_FLAGS = 0;
+    private static final String NEW_GUEST_NAME = "NewestGuestInTheBlock";
 
     private final MockDisplayInterface mDisplayInterface = new MockDisplayInterface();
     private final MockSystemStateInterface mSystemStateInterface = new MockSystemStateInterface();
     private final MockWakeLockInterface mWakeLockInterface = new MockWakeLockInterface();
     private final MockIOInterface mIOInterface = new MockIOInterface();
     private final PowerSignalListener mPowerSignalListener = new PowerSignalListener();
-    private CarUserManagerHelper mCarUserManagerHelper;
+    private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+
+    private MockitoSession mSession;
 
     private MockedPowerHalService mPowerHal;
     private SystemInterface mSystemInterface;
     private CarPowerManagementService mService;
     private CompletableFuture<Void> mFuture;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Mock
+    private CarUserManagerHelper mCarUserManagerHelper;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Resources mResources;
+
+    // Wakeup time for the test; it's automatically set based on @WakeupTime annotation
+    private int mWakeupTime;
+
+    // Value used to set config_disableUserSwitchDuringResume - must be defined before initTest();
+    private boolean mDisableUserSwitchDuringResume;
+
+    @Rule
+    public final TestRule setWakeupTimeRule = new TestWatcher() {
+        protected void starting(Description description) {
+            final String testName = description.getMethodName();
+            try {
+                Method testMethod = CarPowerManagementServiceTest.class.getMethod(testName);
+                WakeupTime wakeupAnnotation = testMethod.getAnnotation(WakeupTime.class);
+                if (wakeupAnnotation != null) {
+                    mWakeupTime = wakeupAnnotation.value();
+                    Log.d(TAG, "Using annotated wakeup time: " + mWakeupTime);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Could not infer wakeupTime for " + testName, e);
+            }
+        }
+    };
+
+    @Before
+    public void setUp() throws Exception {
+        mSession = mockitoSession()
+                .strictness(Strictness.LENIENT)
+                .spyStatic(ActivityManager.class)
+                .startMocking();
         mPowerHal = new MockedPowerHalService(true /*isPowerStateSupported*/,
                 true /*isDeepSleepAllowed*/, true /*isTimedWakeupAllowed*/);
-        mSystemInterface = SystemInterface.Builder.defaultSystemInterface(getContext())
+        mSystemInterface = SystemInterface.Builder.defaultSystemInterface(mContext)
             .withDisplayInterface(mDisplayInterface)
             .withSystemStateInterface(mSystemStateInterface)
             .withWakeLockInterface(mWakeLockInterface)
             .withIOInterface(mIOInterface).build();
-        mCarUserManagerHelper = mock(CarUserManagerHelper.class);
-        doReturn(true).when(mCarUserManagerHelper).switchToUserId(anyInt());
-        doReturn(10).when(mCarUserManagerHelper).getInitialUser();
-        doReturn(10).when(mCarUserManagerHelper).getCurrentForegroundUserId();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    @After
+    public void tearDown() throws Exception {
         if (mService != null) {
             mService.release();
         }
         mIOInterface.tearDown();
+        mSession.finishMocking();
     }
 
     /**
      * Helper method to create mService and initialize a test case
      */
-    private void initTest(int wakeupTime) throws Exception {
-        mService = new CarPowerManagementService(getContext(), mPowerHal, mSystemInterface,
-                mCarUserManagerHelper);
+    private void initTest() throws Exception {
+        when(mResources.getInteger(R.integer.maxGarageModeRunningDurationInSecs))
+                .thenReturn(900);
+        when(mResources.getBoolean(R.bool.config_disableUserSwitchDuringResume))
+                .thenReturn(mDisableUserSwitchDuringResume);
+
+        Log.i(TAG, "initTest(): overridden overlay properties: "
+                + "config_disableUserSwitchDuringResume="
+                + mResources.getBoolean(R.bool.config_disableUserSwitchDuringResume)
+                + ", maxGarageModeRunningDurationInSecs="
+                + mResources.getInteger(R.integer.maxGarageModeRunningDurationInSecs));
+        mService = new CarPowerManagementService(mContext, mResources, mPowerHal,
+                mSystemInterface, mCarUserManagerHelper, mUserManager, NEW_GUEST_NAME);
         mService.init();
         CarPowerManagementService.setShutdownPrepareTimeout(0);
         mPowerHal.setSignalListener(mPowerSignalListener);
-        if (wakeupTime > 0) {
+        if (mWakeupTime > 0) {
             registerListenerToService();
-            mService.scheduleNextWakeupTime(wakeupTime);
+            mService.scheduleNextWakeupTime(mWakeupTime);
         }
         assertStateReceived(MockedPowerHalService.SET_WAIT_FOR_VHAL, 0);
     }
 
+    @Test
     public void testBootComplete() throws Exception {
-        initTest(0);
+        initTest();
     }
 
+    @Test
     public void testDisplayOn() throws Exception {
         // start with display off
         mSystemInterface.setDisplayState(false);
         mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS);
-        initTest(0);
+        initTest();
         // Transition to ON state
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
 
         // display should be turned on as it started with off state.
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
     }
 
+    @Test
     public void testShutdown() throws Exception {
-        initTest(0);
+        initTest();
 
         // Transition to ON state
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
 
         mPowerHal.setCurrentPowerState(
                 new PowerState(
@@ -137,30 +222,112 @@
         // Since modules have to manually schedule next wakeup, we should not schedule next wakeup
         // To test module behavior, we need to actually implement mock listener module.
         assertStateReceived(PowerHalService.SET_SHUTDOWN_START, 0);
-        assertFalse(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isFalse();
         mPowerSignalListener.waitForShutdown(WAIT_TIMEOUT_MS);
         mSystemStateInterface.waitForShutdown(WAIT_TIMEOUT_MS);
     }
 
+    @Test
+    public void testSuspend() throws Exception {
+        initTest();
+
+        // Start in the ON state
+        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
+        // Request suspend
+        mPowerHal.setCurrentPowerState(
+                new PowerState(
+                        VehicleApPowerStateReq.SHUTDOWN_PREPARE,
+                        VehicleApPowerStateShutdownParam.CAN_SLEEP));
+        // Verify suspend
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
+    }
+
+    @Test
+    public void testShutdownOnSuspend() throws Exception {
+        initTest();
+
+        // Start in the ON state
+        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
+        // Tell it to shutdown
+        mService.requestShutdownOnNextSuspend();
+        // Request suspend
+        mPowerHal.setCurrentPowerState(
+                new PowerState(
+                        VehicleApPowerStateReq.SHUTDOWN_PREPARE,
+                        VehicleApPowerStateShutdownParam.CAN_SLEEP));
+        // Verify shutdown
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_SHUTDOWN_START, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
+        mPowerSignalListener.waitForShutdown(WAIT_TIMEOUT_MS);
+        // Send the finished signal
+        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.FINISHED, 0));
+        mSystemStateInterface.waitForShutdown(WAIT_TIMEOUT_MS);
+        // Cancel the shutdown
+        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.CANCEL_SHUTDOWN, 0));
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_SHUTDOWN_CANCELLED, WAIT_TIMEOUT_LONG_MS, 0);
+
+        // Request suspend again
+        mPowerHal.setCurrentPowerState(
+                new PowerState(
+                        VehicleApPowerStateReq.SHUTDOWN_PREPARE,
+                        VehicleApPowerStateShutdownParam.CAN_SLEEP));
+        // Verify suspend
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
+    }
+
+    @Test
+    public void testShutdownCancel() throws Exception {
+        initTest();
+
+        // Start in the ON state
+        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
+        // Start shutting down
+        mPowerHal.setCurrentPowerState(
+                new PowerState(
+                        VehicleApPowerStateReq.SHUTDOWN_PREPARE,
+                        VehicleApPowerStateShutdownParam.SHUTDOWN_IMMEDIATELY));
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_SHUTDOWN_START, WAIT_TIMEOUT_LONG_MS, 0);
+        // Cancel the shutdown
+        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.CANCEL_SHUTDOWN, 0));
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_SHUTDOWN_CANCELLED, WAIT_TIMEOUT_LONG_MS, 0);
+        // Go to suspend
+        mPowerHal.setCurrentPowerState(
+                new PowerState(
+                        VehicleApPowerStateReq.SHUTDOWN_PREPARE,
+                        VehicleApPowerStateShutdownParam.CAN_SLEEP));
+        assertStateReceivedForShutdownOrSleepWithPostpone(
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
+    }
+
+    @Test
+    @WakeupTime(100)
     public void testShutdownWithProcessing() throws Exception {
-        final int wakeupTime = 100;
-        initTest(wakeupTime);
+        initTest();
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.SHUTDOWN_PREPARE, 0));
         assertStateReceivedForShutdownOrSleepWithPostpone(
-                PowerHalService.SET_SHUTDOWN_START, WAIT_TIMEOUT_LONG_MS, wakeupTime);
+                PowerHalService.SET_SHUTDOWN_START, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
         mPowerSignalListener.waitForShutdown(WAIT_TIMEOUT_MS);
         // Send the finished signal
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.FINISHED, 0));
         mSystemStateInterface.waitForShutdown(WAIT_TIMEOUT_MS);
     }
 
+    @Test
+    @WakeupTime(100)
     public void testSleepEntryAndWakeup() throws Exception {
-        final int wakeupTime = 100;
-        initTest(wakeupTime);
+        initTest();
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.SHUTDOWN_PREPARE,
                 VehicleApPowerStateShutdownParam.CAN_SLEEP));
         assertStateReceivedForShutdownOrSleepWithPostpone(
-                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, wakeupTime);
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
         mPowerSignalListener.waitForSleepEntry(WAIT_TIMEOUT_MS);
         // Send the finished signal from HAL to CPMS
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.FINISHED, 0));
@@ -169,51 +336,302 @@
         mPowerSignalListener.waitForSleepExit(WAIT_TIMEOUT_MS);
     }
 
-    public void testSleepEntryAndWakeUpForProcessing() throws Exception {
-        final int wakeupTime = 100;
-        initTest(wakeupTime);
+    @Test
+    public void testUserSwitchingOnResume_differentUser() throws Exception {
+        initTest();
+        setUserInfo(10, NO_USER_INFO_FLAGS);
+        setUserInfo(11, NO_USER_INFO_FLAGS);
+        setCurrentUser(10);
+        setInitialUser(11);
 
-        // set up for user switching after display on
-        final int currentUserId = 10;
-        final int newUserId = 11;
-        doReturn(newUserId).when(mCarUserManagerHelper).getInitialUser();
-        doReturn(currentUserId).when(mCarUserManagerHelper).getCurrentForegroundUserId();
+        suspendAndResumeForUserSwitchingTests();
 
-        mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        verifyUserSwitched(11);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_sameUser() throws Exception {
+        initTest();
+        setUserInfo(10, NO_USER_INFO_FLAGS);
+        setInitialUser(10);
+        setCurrentUser(10);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_differentEphemeralUser() throws Exception {
+        initTest();
+        setUserInfo(10, NO_USER_INFO_FLAGS);
+        setUserInfo(11, FLAG_EPHEMERAL);
+        setCurrentUser(10);
+        setInitialUser(11);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserSwitched(11);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_sameGuest() throws Exception {
+        initTest();
+        setUserInfo(10, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(10);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(10);
+        expectNewGuestCreated(11);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserRemoved(10);
+        verifyUserSwitched(11);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_differentGuest() throws Exception {
+        initTest();
+        setUserInfo(11, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(11);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(11);
+        expectNewGuestCreated(12);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserRemoved(11);
+        verifyUserSwitched(12);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_guestCreationFailed() throws Exception {
+        initTest();
+        setUserInfo(10, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(10);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(10);
+        expectNewGuestCreationFailed("ElGuesto");
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+        verifyUserNotRemoved(10);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_differentPersistentGuest() throws Exception {
+        initTest();
+        setUserInfo(11, "ElGuesto", FLAG_GUEST);
+        setInitialUser(11);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(11);
+        expectNewGuestCreated(12);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserRemoved(11);
+        verifyUserSwitched(12);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_preDeleteGuestFail() throws Exception {
+        initTest();
+        setUserInfo(10, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(10);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionFail(10);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+        verifyNoGuestCreated();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_systemUser() throws Exception {
+        initTest();
+        setInitialUser(USER_SYSTEM);
+        setCurrentUser(10);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_differentUser() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(10, NO_USER_INFO_FLAGS);
+        setUserInfo(11, NO_USER_INFO_FLAGS);
+        setCurrentUser(10);
+        setInitialUser(11);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_sameUser() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(10, NO_USER_INFO_FLAGS);
+        setInitialUser(10);
+        setCurrentUser(10);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_differentEphemeralUser() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(10, NO_USER_INFO_FLAGS);
+        setUserInfo(11, FLAG_EPHEMERAL);
+        setCurrentUser(10);
+        setInitialUser(11);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_sameGuest() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(10, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(10);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(10);
+        expectNewGuestCreated(11);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserRemoved(10);
+        verifyUserSwitched(11);
+
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_differentGuest() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(11, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(11);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(11);
+        expectNewGuestCreated(12);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserRemoved(11);
+        verifyUserSwitched(12);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_guestCreationFailed() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        initTest();
+        setUserInfo(10, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(10);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(10);
+        expectNewGuestCreationFailed("ElGuesto");
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+        verifyUserNotRemoved(10);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_differentPersistentGuest()
+            throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(11, "ElGuesto", FLAG_GUEST);
+        setInitialUser(11);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionOk(11);
+        expectNewGuestCreated(12);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserRemoved(11);
+        verifyUserSwitched(12);
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_preDeleteGuestFail() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setUserInfo(10, "ElGuesto", FLAG_GUEST | FLAG_EPHEMERAL);
+        setInitialUser(10);
+        setCurrentUser(10);
+        expectGuestMarkedForDeletionFail(10);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+        verifyNoGuestCreated();
+    }
+
+    @Test
+    public void testUserSwitchingOnResume_disabledByOEM_systemUser() throws Exception {
+        disableUserSwitchingDuringResume();
+        initTest();
+        setInitialUser(USER_SYSTEM);
+        setCurrentUser(10);
+
+        suspendAndResumeForUserSwitchingTests();
+
+        verifyUserNotSwitched();
+    }
+
+    private void suspendAndResumeForUserSwitchingTests() throws Exception {
+        Log.d(TAG, "suspend()");
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.SHUTDOWN_PREPARE,
                 VehicleApPowerStateShutdownParam.CAN_SLEEP));
-        assertFalse(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isFalse();
         assertStateReceivedForShutdownOrSleepWithPostpone(
-                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, wakeupTime);
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
         mPowerSignalListener.waitForSleepEntry(WAIT_TIMEOUT_MS);
+
         // Send the finished signal
+        Log.d(TAG, "resume()");
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.FINISHED, 0));
         mSystemStateInterface.setWakeupCausedByTimer(true);
         mSystemStateInterface.waitForSleepEntryAndWakeup(WAIT_TIMEOUT_MS);
         assertStateReceived(PowerHalService.SET_DEEP_SLEEP_EXIT, 0);
         mPowerSignalListener.waitForSleepExit(WAIT_TIMEOUT_MS);
-        mService.scheduleNextWakeupTime(wakeupTime);
+        mService.scheduleNextWakeupTime(mWakeupTime);
         // second processing after wakeup
-        assertFalse(mDisplayInterface.getDisplayState());
-        // do not skip user switching part.
-        mService.clearIsBooting();
+        assertThat(mDisplayInterface.getDisplayState()).isFalse();
+
+        mService.setStateForTesting(/* isBooting= */ false, /* isResuming= */ true);
+
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
-        // user switching should have been requested.
-        verify(mCarUserManagerHelper, times(1)).switchToUserId(newUserId);
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
+        // Should wait until Handler has finished ON processing.
+        CarServiceUtils.runOnLooperSync(mService.getHandlerThread().getLooper(), () -> { });
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.SHUTDOWN_PREPARE,
                 VehicleApPowerStateShutdownParam.CAN_SLEEP));
         assertStateReceivedForShutdownOrSleepWithPostpone(
-                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, wakeupTime);
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
         mPowerSignalListener.waitForSleepEntry(WAIT_TIMEOUT_MS);
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.FINISHED, 0));
-        // PM will shutdown system as it was not woken-up due to timer and it is not power on.
+        // PM will shutdown system as it was not woken-up due timer and it is not power on.
         mSystemStateInterface.setWakeupCausedByTimer(false);
         mSystemStateInterface.waitForSleepEntryAndWakeup(WAIT_TIMEOUT_MS);
         // Since we just woke up from shutdown, wake up time will be 0
         assertStateReceived(PowerHalService.SET_DEEP_SLEEP_EXIT, 0);
-        assertFalse(mDisplayInterface.getDisplayState());
+        assertThat(mDisplayInterface.getDisplayState()).isFalse();
     }
 
     private void registerListenerToService() {
@@ -238,8 +656,8 @@
 
     private void assertStateReceived(int expectedState, int expectedParam) throws Exception {
         int[] state = mPowerHal.waitForSend(WAIT_TIMEOUT_MS);
-        assertEquals(expectedState, state[0]);
-        assertEquals(expectedParam, state[1]);
+        assertThat(state[0]).isEqualTo(expectedState);
+        assertThat(state[1]).isEqualTo(expectedParam);
     }
 
     private void assertStateReceivedForShutdownOrSleepWithPostpone(
@@ -253,7 +671,7 @@
                 continue;
             }
             if (state[0] == lastState) {
-                assertEquals(expectedParamForShutdownOrSuspend, state[1]);
+                assertThat(state[1]).isEqualTo(expectedParamForShutdownOrSuspend);
                 return;
             }
         }
@@ -266,6 +684,70 @@
         }
     }
 
+    private void setInitialUser(int userId) {
+        when(mCarUserManagerHelper.getInitialUser()).thenReturn(userId);
+    }
+
+    private void setCurrentUser(int userId) {
+        when(ActivityManager.getCurrentUser()).thenReturn(userId);
+    }
+
+    private void setUserInfo(int userId, int flags) {
+        setUserInfo(userId, /* name= */ null, flags);
+    }
+
+    private void setUserInfo(int userId, @Nullable String name, int flags) {
+        final UserInfo userInfo = new UserInfo();
+        userInfo.id = userId;
+        userInfo.name = name;
+        userInfo.flags = flags;
+        Log.v(TAG, "UM.getUserInfo("  + userId + ") will return " + userInfo.toFullString());
+        when(mUserManager.getUserInfo(userId)).thenReturn(userInfo);
+    }
+
+    private void verifyUserNotSwitched() {
+        verify(mCarUserManagerHelper, never()).switchToUserId(anyInt());
+    }
+
+    private void verifyUserSwitched(int userId) {
+        verify(mCarUserManagerHelper, times(1)).switchToUserId(userId);
+    }
+
+    private void verifyNoGuestCreated() {
+        verify(mUserManager, never()).createGuest(notNull(), anyString());
+    }
+
+    private void expectGuestMarkedForDeletionOk(int userId) {
+        when(mUserManager.markGuestForDeletion(userId)).thenReturn(true);
+    }
+
+    private void expectGuestMarkedForDeletionFail(int userId) {
+        when(mUserManager.markGuestForDeletion(userId)).thenReturn(false);
+    }
+
+    private void expectNewGuestCreated(int userId) {
+        final UserInfo userInfo = new UserInfo();
+        userInfo.id = userId;
+        userInfo.name = NEW_GUEST_NAME;
+        when(mUserManager.createGuest(notNull(), eq(NEW_GUEST_NAME))).thenReturn(userInfo);
+    }
+
+    private void expectNewGuestCreationFailed(String name) {
+        when(mUserManager.createGuest(notNull(), eq(name))).thenReturn(null);
+    }
+
+    private void verifyUserRemoved(int userId) {
+        verify(mUserManager, times(1)).removeUser(userId);
+    }
+
+    private void verifyUserNotRemoved(int userId) {
+        verify(mUserManager, never()).removeUser(userId);
+    }
+
+    private void disableUserSwitchingDuringResume() {
+        mDisableUserSwitchDuringResume = true;
+    }
+
     private static final class MockDisplayInterface implements DisplayInterface {
         private boolean mDisplayOn = true;
         private final Semaphore mDisplayStateWait = new Semaphore(0);
@@ -422,4 +904,10 @@
             }
         }
     }
+
+    @Retention(RUNTIME)
+    @Target({METHOD})
+    public static @interface WakeupTime {
+        int value();
+    }
 }
diff --git a/tests/carservice_unit_test/src/com/android/car/MockedPowerHalService.java b/tests/carservice_unit_test/src/com/android/car/MockedPowerHalService.java
index 7359a03..770cc85 100644
--- a/tests/carservice_unit_test/src/com/android/car/MockedPowerHalService.java
+++ b/tests/carservice_unit_test/src/com/android/car/MockedPowerHalService.java
@@ -87,6 +87,12 @@
         doSendState(SET_SHUTDOWN_START, wakeupTimeSec);
     }
 
+    @Override
+    public void sendShutdownCancel() {
+        Log.i(TAG, "sendShutdownCancel");
+        doSendState(SET_SHUTDOWN_CANCELLED, 0);
+    }
+
     public synchronized int[] waitForSend(long timeoutMs) throws Exception {
         if (mSentStates.size() == 0) {
             wait(timeoutMs);
diff --git a/tests/carservice_unit_test/src/com/android/car/SystemStateInterfaceTest.java b/tests/carservice_unit_test/src/com/android/car/SystemStateInterfaceTest.java
new file mode 100644
index 0000000..5f8ac00
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/SystemStateInterfaceTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.car.systeminterface.SystemStateInterface;
+import com.android.internal.car.ICarServiceHelper;
+import com.android.settingslib.utils.ThreadUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * Unit tests for {@link SystemStateInterface}
+ *
+ * Run:
+ * atest SystemStateInterfaceTest
+ */
+public class SystemStateInterfaceTest {
+    private static final long HELPER_DELAY_MS = 50;
+
+    @Mock private Context mMockContext;
+    private SystemStateInterface.DefaultImpl mSystemStateInterface;
+    private final ICarServiceHelper mTestHelperGood = new TestServiceHelperSucceeds();
+    private final ICarServiceHelper mTestHelperFails = new TestServiceHelperFails();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mSystemStateInterface = new SystemStateInterface.DefaultImpl(mMockContext);
+    }
+
+    @Test
+    public void testSleepWhenHelperSucceeds() {
+        mSystemStateInterface.setCarServiceHelper(mTestHelperGood);
+        assertThat(mSystemStateInterface.enterDeepSleep()).isTrue();
+    }
+
+    @Test
+    public void testSleepWhenHelperFails() {
+        mSystemStateInterface.setCarServiceHelper(mTestHelperFails);
+        assertThat(mSystemStateInterface.enterDeepSleep()).isFalse();
+    }
+
+    @Test
+    public void testSleepWithNullHelper() {
+        mSystemStateInterface.setCarServiceHelper(null);
+        assertThat(mSystemStateInterface.enterDeepSleep()).isFalse();
+    }
+
+    @Test
+    public void testSleepWithDelayedHelperSucceeds() {
+        assertThat(sleepWithDelayedHelper(mTestHelperGood)).isTrue();
+    }
+
+    @Test
+    public void testSleepWithDelayedHelperFails() {
+        assertThat(sleepWithDelayedHelper(mTestHelperFails)).isFalse();
+    }
+
+    @Test
+    public void testSleepWithDelayedNullHelper() {
+        assertThat(sleepWithDelayedHelper(null)).isFalse();
+    }
+
+    private static class TestServiceHelperSucceeds extends ICarServiceHelper.Stub {
+        @Override
+        public int forceSuspend(int timeoutMs) {
+            return 0; // Success
+        }
+    }
+    private static class TestServiceHelperFails extends ICarServiceHelper.Stub {
+        @Override
+        public int forceSuspend(int timeoutMs) {
+            return 1; // Failure
+        }
+    }
+    // Invoke enterDeepSleep() before setting the helper.
+    // Return the result from enterDeepSleep().
+    private boolean sleepWithDelayedHelper(ICarServiceHelper serviceHelper) {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            // Provide the helper after a delay
+            try {
+                Thread.sleep(HELPER_DELAY_MS);
+            } catch (InterruptedException ie) {
+                Thread.currentThread().interrupt(); // Restore interrupted status
+            }
+            mSystemStateInterface.setCarServiceHelper(serviceHelper);
+        });
+        // Request deep sleep before the helper is provided
+        return mSystemStateInterface.enterDeepSleep();
+    }
+}
diff --git a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
index d65bc12..2bd09df 100644
--- a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
@@ -16,8 +16,6 @@
 
 package com.android.car;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -45,25 +43,24 @@
 
 import androidx.test.filters.SmallTest;
 
+import com.android.car.stats.CarStatsService;
+import com.android.car.stats.VmsClientLogger;
 import com.android.car.vms.VmsBrokerService;
 import com.android.car.vms.VmsClientManager;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 
 @SmallTest
 public class VmsPublisherServiceTest {
@@ -72,20 +69,22 @@
     private static final VmsLayersOffering OFFERING = new VmsLayersOffering(Collections.emptySet(),
             54321);
     private static final VmsLayer LAYER = new VmsLayer(1, 2, 3);
-    private static final VmsLayer LAYER2 = new VmsLayer(2, 2, 8);
-    private static final VmsLayer LAYER3 = new VmsLayer(3, 2, 8);
-    private static final VmsLayer LAYER4 = new VmsLayer(4, 2, 8);
 
     private static final int PUBLISHER_ID = 54321;
     private static final byte[] PAYLOAD = new byte[]{1, 2, 3, 4};
-    private static final byte[] PAYLOAD2 = new byte[]{1, 2, 3, 4, 5, 6};
-    private static final byte[] PAYLOAD3 = new byte[]{10, 12, 93, 4, 5, 6, 1, 1, 1};
+
+    private static final int PUBLISHER_UID = 10100;
+    private static final int SUBSCRIBER_UID = 10101;
+    private static final int SUBSCRIBER_UID2 = 10102;
+    private static final int NO_SUBSCRIBERS_UID = -1;
 
     @Rule
     public MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Mock
     private Context mContext;
     @Mock
+    private CarStatsService mStatsService;
+    @Mock
     private VmsBrokerService mBrokerService;
     @Captor
     private ArgumentCaptor<VmsBrokerService.PublisherListener> mProxyCaptor;
@@ -93,13 +92,18 @@
     private VmsClientManager mClientManager;
 
     @Mock
+    private VmsClientLogger mPublisherLog;
+    @Mock
+    private VmsClientLogger mSubscriberLog;
+    @Mock
+    private VmsClientLogger mSubscriberLog2;
+    @Mock
+    private VmsClientLogger mNoSubscribersLog;
+
+    @Mock
     private IVmsSubscriberClient mSubscriberClient;
     @Mock
     private IVmsSubscriberClient mSubscriberClient2;
-    @Mock
-    private IVmsSubscriberClient mThrowingSubscriberClient;
-    @Mock
-    private IVmsSubscriberClient mThrowingSubscriberClient2;
 
     private VmsPublisherService mPublisherService;
     private MockPublisherClient mPublisherClient;
@@ -107,14 +111,27 @@
 
     @Before
     public void setUp() {
-        mPublisherService = new VmsPublisherService(mContext, mBrokerService, mClientManager);
-        verify(mClientManager).registerConnectionListener(mPublisherService);
+        mPublisherService = new VmsPublisherService(mContext, mStatsService, mBrokerService,
+                mClientManager, () -> PUBLISHER_UID);
+        verify(mClientManager).setPublisherService(mPublisherService);
+
+        when(mClientManager.getSubscriberUid(mSubscriberClient)).thenReturn(SUBSCRIBER_UID);
+        when(mClientManager.getSubscriberUid(mSubscriberClient2)).thenReturn(SUBSCRIBER_UID2);
+
+        when(mStatsService.getVmsClientLogger(PUBLISHER_UID)).thenReturn(mPublisherLog);
+        when(mStatsService.getVmsClientLogger(SUBSCRIBER_UID)).thenReturn(mSubscriberLog);
+        when(mStatsService.getVmsClientLogger(SUBSCRIBER_UID2)).thenReturn(mSubscriberLog2);
+        when(mStatsService.getVmsClientLogger(NO_SUBSCRIBERS_UID)).thenReturn(mNoSubscribersLog);
 
         mPublisherClient = new MockPublisherClient();
         mPublisherClient2 = new MockPublisherClient();
         when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER, PUBLISHER_ID))
                 .thenReturn(new HashSet<>(Arrays.asList(mSubscriberClient, mSubscriberClient2)));
+    }
 
+    @After
+    public void tearDown() {
+        verifyNoMoreInteractions(mPublisherLog, mSubscriberLog, mSubscriberLog2, mNoSubscribersLog);
     }
 
     @Test
@@ -124,8 +141,8 @@
 
     @Test
     public void testOnClientConnected() {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        mPublisherService.onClientConnected("SomeOtherClient", mPublisherClient2.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
+        mPublisherService.onClientConnected("SomeOtherClient", mPublisherClient2);
         verify(mBrokerService, times(2)).addPublisherListener(mProxyCaptor.capture());
 
         assertNotNull(mPublisherClient.mPublisherService);
@@ -138,8 +155,8 @@
 
     @Test
     public void testOnClientDisconnected() {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        mPublisherService.onClientConnected("SomeOtherClient", mPublisherClient2.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
+        mPublisherService.onClientConnected("SomeOtherClient", mPublisherClient2);
         verify(mBrokerService, times(2)).addPublisherListener(mProxyCaptor.capture());
 
         reset(mClientManager, mBrokerService);
@@ -152,7 +169,7 @@
 
     @Test
     public void testSetLayersOffering() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
 
         mPublisherClient.mPublisherService.setLayersOffering(mPublisherClient.mToken, OFFERING);
         verify(mBrokerService).setPublisherLayersOffering(mPublisherClient.mToken, OFFERING);
@@ -160,14 +177,14 @@
 
     @Test(expected = SecurityException.class)
     public void testSetLayersOffering_InvalidToken() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
 
         mPublisherClient.mPublisherService.setLayersOffering(new Binder(), OFFERING);
     }
 
     @Test(expected = SecurityException.class)
     public void testSetLayersOffering_Disconnected() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         mPublisherService.onClientDisconnected("SomeClient");
 
         mPublisherClient.mPublisherService.setLayersOffering(mPublisherClient.mToken, OFFERING);
@@ -175,7 +192,7 @@
 
     @Test(expected = SecurityException.class)
     public void testSetLayersOffering_PermissionDenied() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         when(mContext.checkCallingOrSelfPermission(Car.PERMISSION_VMS_PUBLISHER)).thenReturn(
                 PackageManager.PERMISSION_DENIED);
 
@@ -184,17 +201,21 @@
 
     @Test
     public void testPublish() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
 
         mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
                 PAYLOAD);
         verify(mSubscriberClient).onVmsMessageReceived(LAYER, PAYLOAD);
         verify(mSubscriberClient2).onVmsMessageReceived(LAYER, PAYLOAD);
+
+        verify(mPublisherLog).logPacketSent(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog).logPacketReceived(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog2).logPacketReceived(LAYER, PAYLOAD.length);
     }
 
     @Test
     public void testPublishNullLayerAndNullPayload() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
 
         // We just want to ensure that no exceptions are thrown here.
         mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, null, PUBLISHER_ID,
@@ -202,26 +223,43 @@
     }
 
     @Test
+    public void testPublish_NoSubscribers() throws Exception {
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
+        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER, PUBLISHER_ID))
+                .thenReturn(Collections.emptySet());
+
+        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
+                PAYLOAD);
+
+        verify(mPublisherLog).logPacketSent(LAYER, PAYLOAD.length);
+        verify(mNoSubscribersLog).logPacketDropped(LAYER, PAYLOAD.length);
+    }
+
+    @Test
     public void testPublish_ClientError() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         doThrow(new RemoteException()).when(mSubscriberClient).onVmsMessageReceived(LAYER, PAYLOAD);
 
         mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
                 PAYLOAD);
         verify(mSubscriberClient).onVmsMessageReceived(LAYER, PAYLOAD);
         verify(mSubscriberClient2).onVmsMessageReceived(LAYER, PAYLOAD);
+
+        verify(mPublisherLog).logPacketSent(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog).logPacketDropped(LAYER, PAYLOAD.length);
+        verify(mSubscriberLog2).logPacketReceived(LAYER, PAYLOAD.length);
     }
 
     @Test(expected = SecurityException.class)
     public void testPublish_InvalidToken() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
 
         mPublisherClient.mPublisherService.publish(new Binder(), LAYER, PUBLISHER_ID, PAYLOAD);
     }
 
     @Test(expected = SecurityException.class)
     public void testPublish_Disconnected() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         mPublisherService.onClientDisconnected("SomeClient");
 
         mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
@@ -230,7 +268,7 @@
 
     @Test(expected = SecurityException.class)
     public void testPublish_PermissionDenied() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         when(mContext.checkCallingOrSelfPermission(Car.PERMISSION_VMS_PUBLISHER)).thenReturn(
                 PackageManager.PERMISSION_DENIED);
 
@@ -240,7 +278,7 @@
 
     @Test
     public void testGetSubscriptions() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         when(mBrokerService.getSubscriptionState()).thenReturn(SUBSCRIPTION_STATE);
 
         assertEquals(SUBSCRIPTION_STATE, mPublisherClient.mPublisherService.getSubscriptions());
@@ -248,7 +286,7 @@
 
     @Test(expected = SecurityException.class)
     public void testGetSubscriptions_Disconnected() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         mPublisherService.onClientDisconnected("SomeClient");
 
         mPublisherClient.mPublisherService.getSubscriptions();
@@ -256,7 +294,7 @@
 
     @Test(expected = SecurityException.class)
     public void testGetSubscriptions_PermissionDenied() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         when(mContext.checkCallingOrSelfPermission(Car.PERMISSION_VMS_PUBLISHER)).thenReturn(
                 PackageManager.PERMISSION_DENIED);
 
@@ -265,7 +303,7 @@
 
     @Test
     public void testGetPublisherId() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         when(mBrokerService.getPublisherId(PAYLOAD)).thenReturn(PUBLISHER_ID);
 
         assertEquals(PUBLISHER_ID, mPublisherClient.mPublisherService.getPublisherId(PAYLOAD));
@@ -273,7 +311,7 @@
 
     @Test(expected = SecurityException.class)
     public void testGetPublisherId_Disconnected() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         mPublisherService.onClientDisconnected("SomeClient");
 
         mPublisherClient.mPublisherService.getPublisherId(PAYLOAD);
@@ -281,7 +319,7 @@
 
     @Test(expected = SecurityException.class)
     public void testGetPublisherId_PermissionDenied() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
         when(mContext.checkCallingOrSelfPermission(Car.PERMISSION_VMS_PUBLISHER)).thenReturn(
                 PackageManager.PERMISSION_DENIED);
 
@@ -290,8 +328,8 @@
 
     @Test
     public void testOnSubscriptionChange() {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        mPublisherService.onClientConnected("SomeOtherClient", mPublisherClient2.asBinder());
+        mPublisherService.onClientConnected("SomeClient", mPublisherClient);
+        mPublisherService.onClientConnected("SomeOtherClient", mPublisherClient2);
         verify(mBrokerService, times(2)).addPublisherListener(mProxyCaptor.capture());
 
         mProxyCaptor.getAllValues().get(0).onSubscriptionChange(SUBSCRIPTION_STATE);
@@ -301,341 +339,6 @@
     }
 
     @Test
-    public void testDump_getPacketCount() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-        String expectedPacketCountString = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER, 1L);
-        String expectedPacketSizeString = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER, PAYLOAD.length);
-        assertThat(dumpString.contains(expectedPacketCountString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString)).isTrue();
-    }
-
-    @Test
-    public void testDump_getPacketCounts() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD2);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        // LAYER called 6 times with PAYLOAD 2 times, PAYLOAD2 1 time, PAYLOAD3 3 times
-        String expectedPacketCountString1 = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER, 6L);
-        String expectedPacketSizeString1 = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER, 2 * PAYLOAD.length + PAYLOAD2.length + 3 * PAYLOAD3.length);
-
-        // LAYER2 called 2 times with PAYLOAD 1 time, PAYLOAD2 0 time, PAYLOAD3 1 times
-        String expectedPacketCountString2 = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER2, 2L);
-        String expectedPacketSizeString2 = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER2, PAYLOAD.length + PAYLOAD3.length);
-
-        // LAYER3 called 2 times with PAYLOAD 2 times, PAYLOAD2 0 time, PAYLOAD3 0 times
-        String expectedPacketCountString3 = String.format(VmsPublisherService.PACKET_COUNT_FORMAT,
-                LAYER3, 2L);
-        String expectedPacketSizeString3 = String.format(VmsPublisherService.PACKET_SIZE_FORMAT,
-                LAYER3, 2 * PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketCountString1)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString1)).isTrue();
-        assertThat(dumpString.contains(expectedPacketCountString2)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString2)).isTrue();
-        assertThat(dumpString.contains(expectedPacketCountString3)).isTrue();
-        assertThat(dumpString.contains(expectedPacketSizeString3)).isTrue();
-    }
-
-    @Test
-    public void testDumpNoListeners_getPacketFailureCount() throws Exception {
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        String expectedPacketFailureString = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER2, "SomeClient", "", 1L);
-        String expectedPacketFailureSizeString = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER2, "SomeClient", "", PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketFailureString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString)).isTrue();
-    }
-
-    @Test
-    public void testDumpNoListeners_getPacketFailureCounts() throws Exception {
-        // LAYER2 and LAYER3 both have no listeners
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER2, PUBLISHER_ID))
-                .thenReturn(new HashSet<>());
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>());
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        mPublisherService.onClientConnected("SomeClient2", mPublisherClient2.asBinder());
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER2, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        String expectedPacketFailureString = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER2, "SomeClient", "", 1L);
-        String expectedPacketFailureString2 = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER3, "SomeClient2", "", 1L);
-        String expectedPacketFailureSizeString = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER2, "SomeClient", "", PAYLOAD.length);
-        String expectedPacketFailureSizeString2 = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER3, "SomeClient2", "", PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketFailureString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureString2)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString2)).isTrue();
-    }
-
-    @Test
-    public void testDumpRemoteException_getPacketFailureCount() throws Exception {
-        // The listener on LAYER3 will throw on LAYER3 and PAYLOAD
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER3, PAYLOAD);
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(Arrays.asList(mThrowingSubscriberClient)));
-        when(mBrokerService.getPackageName(mThrowingSubscriberClient)).thenReturn("Thrower");
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        String expectedPacketFailureString = String.format(
-                VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT,
-                LAYER3, "SomeClient", "Thrower", 1L);
-        String expectedPacketFailureSizeString = String.format(
-                VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT,
-                LAYER3, "SomeClient", "Thrower", PAYLOAD.length);
-
-        assertThat(dumpString.contains(expectedPacketFailureString)).isTrue();
-        assertThat(dumpString.contains(expectedPacketFailureSizeString)).isTrue();
-    }
-
-    @Test
-    public void testDumpRemoteException_getPacketFailureCounts() throws Exception {
-        // The listeners will throw on LAYER3 or LAYER4 and PAYLOAD
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER3, PAYLOAD);
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER4, PAYLOAD);
-        Mockito.doThrow(new RemoteException()).when(
-                mThrowingSubscriberClient2).onVmsMessageReceived(LAYER3, PAYLOAD);
-        Mockito.doThrow(new RemoteException()).when(
-                mThrowingSubscriberClient2).onVmsMessageReceived(LAYER4, PAYLOAD);
-
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(
-                        Arrays.asList(mThrowingSubscriberClient, mThrowingSubscriberClient2)));
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER4, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(
-                        Arrays.asList(mThrowingSubscriberClient, mThrowingSubscriberClient2)));
-
-        when(mBrokerService.getPackageName(mThrowingSubscriberClient)).thenReturn("Thrower");
-        when(mBrokerService.getPackageName(mThrowingSubscriberClient2)).thenReturn("Thrower2");
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        mPublisherService.onClientConnected("SomeClient2", mPublisherClient2.asBinder());
-
-        // Layer 2 has no listeners and should therefore result in a packet failure to be recorded.
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient2.mPublisherService.publish(mPublisherClient2.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        List<String> expectedStrings = Arrays.asList(
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3, "SomeClient",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3, "SomeClient",
-                        "Thrower2", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4, "SomeClient",
-                        "Thrower2", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3,
-                        "SomeClient2",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3,
-                        "SomeClient2",
-                        "Thrower2", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4,
-                        "SomeClient2",
-                        "Thrower", 2L),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4,
-                        "SomeClient2",
-                        "Thrower2", 2L),
-
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient",
-                        "Thrower2", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient",
-                        "Thrower2", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient2",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient2",
-                        "Thrower2", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient2",
-                        "Thrower", 2 * PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient2",
-                        "Thrower2", 2 * PAYLOAD.length));
-
-        for (String expected : expectedStrings) {
-            assertThat(dumpString.contains(expected)).isTrue();
-        }
-    }
-
-    @Test
-    public void testDump_getAllMetrics() throws Exception {
-
-        // LAYER3 has no subscribers
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER3, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(Arrays.asList()));
-
-        // LAYER4 has a subscriber that will always throw
-        Mockito.doThrow(new RemoteException()).when(mThrowingSubscriberClient).onVmsMessageReceived(
-                LAYER4, PAYLOAD);
-
-        when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER4, PUBLISHER_ID))
-                .thenReturn(new HashSet<>(
-                        Arrays.asList(mThrowingSubscriberClient)));
-
-        when(mBrokerService.getPackageName(mThrowingSubscriberClient)).thenReturn("Thrower");
-
-        mPublisherService.onClientConnected("SomeClient", mPublisherClient.asBinder());
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER, PUBLISHER_ID,
-                PAYLOAD2);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER3, PUBLISHER_ID,
-                PAYLOAD3);
-        mPublisherClient.mPublisherService.publish(mPublisherClient.mToken, LAYER4, PUBLISHER_ID,
-                PAYLOAD);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        PrintWriter printWriter = new PrintWriter(outputStream);
-        mPublisherService.dump(printWriter);
-
-        printWriter.flush();
-        String dumpString = outputStream.toString();
-
-        List<String> expectedStrings = Arrays.asList(
-                String.format(VmsPublisherService.PACKET_COUNT_FORMAT, LAYER, 2),
-                String.format(VmsPublisherService.PACKET_COUNT_FORMAT, LAYER3, 1),
-                String.format(VmsPublisherService.PACKET_COUNT_FORMAT, LAYER4, 1),
-                String.format(VmsPublisherService.PACKET_SIZE_FORMAT, LAYER,
-                        PAYLOAD.length + PAYLOAD2.length),
-                String.format(VmsPublisherService.PACKET_SIZE_FORMAT, LAYER3, PAYLOAD3.length),
-                String.format(VmsPublisherService.PACKET_SIZE_FORMAT, LAYER4, PAYLOAD.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER3, "SomeClient",
-                        "",
-                        1),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER3, "SomeClient",
-                        "",
-                        PAYLOAD3.length),
-                String.format(VmsPublisherService.PACKET_FAILURE_COUNT_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", 1),
-                String.format(VmsPublisherService.PACKET_FAILURE_SIZE_FORMAT, LAYER4, "SomeClient",
-                        "Thrower", PAYLOAD.length)
-        );
-
-        for (String expected : expectedStrings) {
-            assertThat(dumpString.contains(expected)).isTrue();
-        }
-    }
-
-
-    @Test
     public void testRelease() {
         mPublisherService.release();
     }
diff --git a/tests/carservice_unit_test/src/com/android/car/VmsPublishersInfoTest.java b/tests/carservice_unit_test/src/com/android/car/VmsPublishersInfoTest.java
index 2c7b9f1..1938a19 100644
--- a/tests/carservice_unit_test/src/com/android/car/VmsPublishersInfoTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/VmsPublishersInfoTest.java
@@ -23,9 +23,9 @@
 import org.junit.Test;
 
 public class VmsPublishersInfoTest {
-    public static final byte[] MOCK_INFO_0 = new byte[]{2, 3, 5, 7, 11, 13, 17};
-    public static final byte[] SAME_MOCK_INFO_0 = new byte[]{2, 3, 5, 7, 11, 13, 17};
-    public static final byte[] MOCK_INFO_1 = new byte[]{2, 3, 5, 7, 11, 13, 17, 19};
+    public static final byte[] MOCK_INFO_1 = new byte[]{2, 3, 5, 7, 11, 13, 17};
+    public static final byte[] SAME_MOCK_INFO_1 = new byte[]{2, 3, 5, 7, 11, 13, 17};
+    public static final byte[] MOCK_INFO_2 = new byte[]{2, 3, 5, 7, 11, 13, 17, 19};
 
     private VmsPublishersInfo mVmsPublishersInfo;
 
@@ -36,9 +36,9 @@
 
     @Test
     public void testSingleInfo() throws Exception {
-        int id = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_0);
-        assertEquals(0, id);
-        assertArrayEquals(MOCK_INFO_0, mVmsPublishersInfo.getPublisherInfo(id));
+        int id = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_1);
+        assertEquals(1, id);
+        assertArrayEquals(MOCK_INFO_1, mVmsPublishersInfo.getPublisherInfo(id));
     }
 
     @Test
@@ -48,20 +48,20 @@
 
     @Test
     public void testTwoInfos() throws Exception {
-        int id0 = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_0);
         int id1 = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_1);
-        assertEquals(0, id0);
+        int id2 = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_2);
         assertEquals(1, id1);
-        assertArrayEquals(MOCK_INFO_0, mVmsPublishersInfo.getPublisherInfo(id0));
+        assertEquals(2, id2);
         assertArrayEquals(MOCK_INFO_1, mVmsPublishersInfo.getPublisherInfo(id1));
+        assertArrayEquals(MOCK_INFO_2, mVmsPublishersInfo.getPublisherInfo(id2));
     }
 
     @Test
     public void testSingleInfoInsertedTwice() throws Exception {
-        int id = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_0);
-        assertEquals(0, id);
+        int id = mVmsPublishersInfo.getIdForInfo(MOCK_INFO_1);
+        assertEquals(1, id);
 
-        int sameId = mVmsPublishersInfo.getIdForInfo(SAME_MOCK_INFO_0);
+        int sameId = mVmsPublishersInfo.getIdForInfo(SAME_MOCK_INFO_1);
         assertEquals(sameId, id);
     }
 }
diff --git a/tests/carservice_unit_test/src/com/android/car/VmsSubscriberServiceTest.java b/tests/carservice_unit_test/src/com/android/car/VmsSubscriberServiceTest.java
new file mode 100644
index 0000000..0208515
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/VmsSubscriberServiceTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.car.vms.IVmsSubscriberClient;
+import android.car.vms.VmsAvailableLayers;
+import android.car.vms.VmsLayer;
+import android.content.Context;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.car.hal.VmsHalService;
+import com.android.car.vms.VmsBrokerService;
+import com.android.car.vms.VmsClientManager;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+@SmallTest
+public class VmsSubscriberServiceTest {
+    private static final VmsLayer LAYER = new VmsLayer(1, 2, 3);
+    private static final int PUBLISHER_ID = 54321;
+    private static final byte[] PUBLISHER_INFO = new byte[]{1, 2, 3, 4};
+    private static final VmsAvailableLayers AVAILABLE_LAYERS =
+            new VmsAvailableLayers(Collections.emptySet(), 0);
+
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Mock
+    private Context mContext;
+    @Mock
+    private VmsBrokerService mBrokerService;
+    @Mock
+    private VmsClientManager mClientManager;
+    @Mock
+    private VmsHalService mHal;
+
+    @Mock
+    private IVmsSubscriberClient mSubscriberClient;
+    @Mock
+    private IVmsSubscriberClient mSubscriberClient2;
+
+    private VmsSubscriberService mSubscriberService;
+
+    @Before
+    public void setUp() {
+        mSubscriberService = new VmsSubscriberService(mContext, mBrokerService, mClientManager,
+                mHal);
+        verify(mBrokerService).addSubscriberListener(eq(mSubscriberService));
+        verify(mHal).setVmsSubscriberService(eq(mSubscriberService));
+    }
+
+    @After
+    public void tearDown() {
+        verifyNoMoreInteractions(mBrokerService, mClientManager);
+    }
+
+    @Test
+    public void testAddVmsSubscriberToNotifications() {
+        mSubscriberService.addVmsSubscriberToNotifications(mSubscriberClient);
+        verify(mClientManager).addSubscriber(mSubscriberClient);
+    }
+
+    @Test
+    public void testRemoveVmsSubscriberToNotifications() {
+        mSubscriberService.removeVmsSubscriberToNotifications(mSubscriberClient);
+        verify(mClientManager).removeSubscriber(mSubscriberClient);
+    }
+
+    @Test
+    public void testAddVmsSubscriber() {
+        mSubscriberService.addVmsSubscriber(mSubscriberClient, LAYER);
+        verify(mClientManager).addSubscriber(mSubscriberClient);
+        verify(mBrokerService).addSubscription(mSubscriberClient, LAYER);
+    }
+
+    @Test
+    public void testRemoveVmsSubscriber() {
+        mSubscriberService.removeVmsSubscriber(mSubscriberClient, LAYER);
+        verify(mBrokerService).removeSubscription(mSubscriberClient, LAYER);
+    }
+
+
+    @Test
+    public void testAddVmsSubscriberToPublisher() {
+        mSubscriberService.addVmsSubscriberToPublisher(mSubscriberClient, LAYER, PUBLISHER_ID);
+        verify(mClientManager).addSubscriber(mSubscriberClient);
+        verify(mBrokerService).addSubscription(mSubscriberClient, LAYER, PUBLISHER_ID);
+    }
+
+    @Test
+    public void testRemoveVmsSubscriberToPublisher() {
+        testAddVmsSubscriberToPublisher();
+
+        mSubscriberService.removeVmsSubscriberToPublisher(mSubscriberClient, LAYER, PUBLISHER_ID);
+        verify(mBrokerService).removeSubscription(mSubscriberClient, LAYER, PUBLISHER_ID);
+    }
+
+    @Test
+    public void testAddVmsSubscriberPassive() {
+        mSubscriberService.addVmsSubscriberPassive(mSubscriberClient);
+        verify(mClientManager).addSubscriber(mSubscriberClient);
+        verify(mBrokerService).addSubscription(mSubscriberClient);
+    }
+
+    @Test
+    public void testRemoveVmsSubscriberPassive() {
+        mSubscriberService.removeVmsSubscriberPassive(mSubscriberClient);
+        verify(mBrokerService).removeSubscription(mSubscriberClient);
+    }
+
+    @Test
+    public void testGetPublisherInfo() {
+        when(mBrokerService.getPublisherInfo(PUBLISHER_ID)).thenReturn(PUBLISHER_INFO);
+        assertThat(mSubscriberService.getPublisherInfo(PUBLISHER_ID)).isSameAs(PUBLISHER_INFO);
+        verify(mBrokerService).getPublisherInfo(PUBLISHER_ID);
+    }
+
+    @Test
+    public void testGetAvailableLayers() {
+        when(mBrokerService.getAvailableLayers()).thenReturn(AVAILABLE_LAYERS);
+        assertThat(mSubscriberService.getAvailableLayers()).isSameAs(AVAILABLE_LAYERS);
+        verify(mBrokerService).getAvailableLayers();
+    }
+
+    @Test
+    public void testOnLayersAvailabilityChange() throws Exception {
+        when(mClientManager.getAllSubscribers())
+                .thenReturn(Arrays.asList(mSubscriberClient, mSubscriberClient2));
+        mSubscriberService.onLayersAvailabilityChange(AVAILABLE_LAYERS);
+        verify(mClientManager).getAllSubscribers();
+        verify(mSubscriberClient).onLayersAvailabilityChanged(AVAILABLE_LAYERS);
+        verify(mSubscriberClient2).onLayersAvailabilityChanged(AVAILABLE_LAYERS);
+    }
+}
diff --git a/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceTest.java b/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceTest.java
new file mode 100644
index 0000000..6f7fe18
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/hal/PropertyHalServiceTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.hal;
+
+import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class PropertyHalServiceTest {
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+    @Mock
+    private VehicleHal mVehicleHal;
+
+    private PropertyHalService mPropertyHalService;
+    private static final int[] UNITS_PROPERTY_ID = {
+            VehicleProperty.DISTANCE_DISPLAY_UNITS,
+            VehicleProperty.FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME,
+            VehicleProperty.FUEL_VOLUME_DISPLAY_UNITS,
+            VehicleProperty.TIRE_PRESSURE_DISPLAY_UNITS,
+            VehicleProperty.EV_BATTERY_DISPLAY_UNITS,
+            VehicleProperty.VEHICLE_SPEED_DISPLAY_UNITS};
+
+    @Before
+    public void setUp() {
+        mPropertyHalService = new PropertyHalService(mVehicleHal);
+        mPropertyHalService.init();
+    }
+
+    @After
+    public void tearDown() {
+        mPropertyHalService.release();
+        mPropertyHalService = null;
+    }
+
+    @Test
+    public void checkDisplayUnitsProperty() {
+        for (int propId : UNITS_PROPERTY_ID) {
+            Assert.assertTrue(mPropertyHalService.isDisplayUnitsProperty(propId));
+        }
+    }
+}
diff --git a/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java b/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java
index f42c52a..093ab9b 100644
--- a/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/hal/VmsHalServiceTest.java
@@ -15,9 +15,15 @@
  */
 package com.android.car.hal;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.car.vms.IVmsPublisherClient;
@@ -30,13 +36,20 @@
 import android.car.vms.VmsLayerDependency;
 import android.car.vms.VmsLayersOffering;
 import android.car.vms.VmsSubscriptionState;
+import android.content.Context;
+import android.content.res.Resources;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropConfig;
 import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
 import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
+import android.hardware.automotive.vehicle.V2_0.VehiclePropertyGroup;
 import android.hardware.automotive.vehicle.V2_0.VmsMessageType;
 import android.os.Binder;
 import android.os.IBinder;
 
+import com.android.car.R;
+import com.android.car.test.utils.TemporaryFile;
+import com.android.car.vms.VmsClientManager;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -47,13 +60,15 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
 public class VmsHalServiceTest {
     private static final int LAYER_TYPE = 1;
@@ -69,17 +84,17 @@
     @Rule
     public MockitoRule mockito = MockitoJUnit.rule();
     @Mock
+    private Context mContext;
+    @Mock
+    private Resources mResources;
+    @Mock
     private VehicleHal mVehicleHal;
     @Mock
+    private VmsClientManager mClientManager;
+    @Mock
     private IVmsPublisherService mPublisherService;
     @Mock
     private IVmsSubscriberService mSubscriberService;
-    @Mock
-    private Consumer<IBinder> mPublisherOnHalConnected;
-    @Mock
-    private Runnable mPublisherOnHalDisconnected;
-    @Mock
-    private Consumer<IVmsSubscriberClient> mSubscriberOnHalDisconnected;
 
     private IBinder mToken;
     private VmsHalService mHalService;
@@ -88,10 +103,15 @@
 
     @Before
     public void setUp() throws Exception {
-        mHalService = new VmsHalService(mVehicleHal, () -> (long) CORE_ID);
-        mHalService.setPublisherConnectionCallbacks(
-                mPublisherOnHalConnected, mPublisherOnHalDisconnected);
-        mHalService.setVmsSubscriberService(mSubscriberService, mSubscriberOnHalDisconnected);
+        initHalService(true);
+    }
+
+    private void initHalService(boolean propagatePropertyException) throws Exception {
+        when(mContext.getResources()).thenReturn(mResources);
+        mHalService = new VmsHalService(mContext, mVehicleHal, () -> (long) CORE_ID,
+            propagatePropertyException);
+        mHalService.setClientManager(mClientManager);
+        mHalService.setVmsSubscriberService(mSubscriberService);
 
         VehiclePropConfig propConfig = new VehiclePropConfig();
         propConfig.prop = VehicleProperty.VEHICLE_MAP_SERVICE;
@@ -104,7 +124,7 @@
 
         // Verify START_SESSION message was sent
         InOrder initOrder =
-                Mockito.inOrder(mPublisherOnHalConnected, mSubscriberService, mVehicleHal);
+                Mockito.inOrder(mClientManager, mSubscriberService, mVehicleHal);
         initOrder.verify(mVehicleHal).subscribeProperty(mHalService,
                 VehicleProperty.VEHICLE_MAP_SERVICE);
         initOrder.verify(mVehicleHal).set(createHalMessage(
@@ -118,38 +138,41 @@
         // Send START_SESSION response from client
         sendHalMessage(createHalMessage(
                 VmsMessageType.START_SESSION,  // Message type
-                0,                             // Core ID (unknown)
+                CORE_ID,                       // Core ID
                 CLIENT_ID                      // Client ID
         ));
         waitForHandlerCompletion();
 
         // Verify client is marked as connected
-        ArgumentCaptor<IBinder> publisherCaptor = ArgumentCaptor.forClass(IBinder.class);
-        initOrder.verify(mPublisherOnHalConnected).accept(publisherCaptor.capture());
-        mPublisherClient = IVmsPublisherClient.Stub.asInterface(publisherCaptor.getValue());
+        ArgumentCaptor<IVmsPublisherClient> publisherCaptor =
+                ArgumentCaptor.forClass(IVmsPublisherClient.class);
+        ArgumentCaptor<IVmsSubscriberClient> subscriberCaptor =
+                ArgumentCaptor.forClass(IVmsSubscriberClient.class);
+        initOrder.verify(mClientManager, never()).onHalDisconnected();
+        initOrder.verify(mClientManager)
+                .onHalConnected(publisherCaptor.capture(), subscriberCaptor.capture());
+        mPublisherClient = publisherCaptor.getValue();
+        mSubscriberClient = subscriberCaptor.getValue();
 
         mToken = new Binder();
         mPublisherClient.setVmsPublisherService(mToken, mPublisherService);
 
-        ArgumentCaptor<IVmsSubscriberClient> subscriberCaptor = ArgumentCaptor.forClass(
-                IVmsSubscriberClient.class);
-        initOrder.verify(mSubscriberService).addVmsSubscriberToNotifications(
-                subscriberCaptor.capture());
-        mSubscriberClient = subscriberCaptor.getValue();
-
         initOrder.verify(mSubscriberService).getAvailableLayers();
         initOrder.verify(mVehicleHal).set(createHalMessage(
                 VmsMessageType.AVAILABILITY_CHANGE, // Message type
                 0,                                  // Sequence number
                 0));                                // # of associated layers
 
+
+        waitForHandlerCompletion();
         initOrder.verifyNoMoreInteractions();
-        reset(mPublisherOnHalConnected, mSubscriberService, mVehicleHal);
+        reset(mClientManager, mSubscriberService, mVehicleHal);
     }
 
     @Test
     public void testCoreId_IntegerOverflow() throws Exception {
-        mHalService = new VmsHalService(mVehicleHal, () -> (long) Integer.MAX_VALUE + CORE_ID);
+        mHalService = new VmsHalService(mContext, mVehicleHal,
+                () -> (long) Integer.MAX_VALUE + CORE_ID, true);
 
         VehiclePropConfig propConfig = new VehiclePropConfig();
         propConfig.prop = VehicleProperty.VEHICLE_MAP_SERVICE;
@@ -577,7 +600,7 @@
 
         VehiclePropValue request = createHalMessage(
                 VmsMessageType.START_SESSION,  // Message type
-                0,                             // Core ID (unknown)
+                -1,                            // Core ID (unknown)
                 CLIENT_ID                      // Client ID
         );
 
@@ -588,12 +611,18 @@
         );
 
         sendHalMessage(request);
-        InOrder inOrder = Mockito.inOrder(mVehicleHal);
+
+        InOrder inOrder = Mockito.inOrder(mClientManager, mVehicleHal);
+        inOrder.verify(mClientManager).onHalDisconnected();
         inOrder.verify(mVehicleHal).set(response);
+        inOrder.verify(mClientManager).onHalConnected(mPublisherClient, mSubscriberClient);
+
+        waitForHandlerCompletion();
         inOrder.verify(mVehicleHal).set(createHalMessage(
                 VmsMessageType.AVAILABILITY_CHANGE, // Message type
                 5,                                  // Sequence number
                 0));                                // # of associated layers
+
     }
 
     /**
@@ -943,6 +972,107 @@
         verify(mVehicleHal).set(response);
     }
 
+    @Test
+    public void testPropertySetExceptionNotPropagated_CoreStartSession() throws Exception {
+        doThrow(new RuntimeException()).when(mVehicleHal).set(any());
+        initHalService(false);
+
+        mHalService.init();
+        waitForHandlerCompletion();
+    }
+
+    @Test
+    public void testPropertySetExceptionNotPropagated_ClientStartSession() throws Exception {
+        initHalService(false);
+
+        when(mSubscriberService.getAvailableLayers()).thenReturn(
+                new VmsAvailableLayers(Collections.emptySet(), 0));
+        doThrow(new RuntimeException()).when(mVehicleHal).set(any());
+
+        VehiclePropValue request = createHalMessage(
+                VmsMessageType.START_SESSION,  // Message type
+                -1,                            // Core ID (unknown)
+                CLIENT_ID                      // Client ID
+        );
+
+        sendHalMessage(request);
+        waitForHandlerCompletion();
+    }
+
+    @Test
+    public void testDumpMetrics_DefaultConfig() {
+        mHalService.dumpMetrics(new FileDescriptor());
+        verifyZeroInteractions(mVehicleHal);
+    }
+
+    @Test
+    public void testDumpMetrics_NonVendorProperty() throws Exception {
+        VehiclePropValue vehicleProp = new VehiclePropValue();
+        vehicleProp.value.bytes.addAll(PAYLOAD_AS_LIST);
+        when(mVehicleHal.get(anyInt())).thenReturn(vehicleProp);
+
+        when(mResources.getInteger(
+                R.integer.vmsHalClientMetricsProperty)).thenReturn(
+                VehicleProperty.VEHICLE_MAP_SERVICE);
+        setUp();
+
+        mHalService.dumpMetrics(new FileDescriptor());
+        verifyZeroInteractions(mVehicleHal);
+    }
+
+    @Test
+    public void testDumpMetrics_VendorProperty() throws Exception {
+        int metricsPropertyId = VehiclePropertyGroup.VENDOR | 1;
+        when(mResources.getInteger(
+                R.integer.vmsHalClientMetricsProperty)).thenReturn(
+                metricsPropertyId);
+        setUp();
+
+        VehiclePropValue metricsProperty = new VehiclePropValue();
+        metricsProperty.value.bytes.addAll(PAYLOAD_AS_LIST);
+        when(mVehicleHal.get(metricsPropertyId)).thenReturn(metricsProperty);
+
+        try (TemporaryFile dumpsysFile = new TemporaryFile("VmsHalServiceTest")) {
+            FileOutputStream outputStream = new FileOutputStream(dumpsysFile.getFile());
+            mHalService.dumpMetrics(outputStream.getFD());
+
+            verify(mVehicleHal).get(metricsPropertyId);
+            FileInputStream inputStream = new FileInputStream(dumpsysFile.getFile());
+            byte[] dumpsysOutput = new byte[PAYLOAD.length];
+            assertEquals(PAYLOAD.length, inputStream.read(dumpsysOutput));
+            assertArrayEquals(PAYLOAD, dumpsysOutput);
+        }
+    }
+
+    @Test
+    public void testDumpMetrics_VendorProperty_Timeout() throws Exception {
+        int metricsPropertyId = VehiclePropertyGroup.VENDOR | 1;
+        when(mResources.getInteger(
+                R.integer.vmsHalClientMetricsProperty)).thenReturn(
+                metricsPropertyId);
+        setUp();
+
+        when(mVehicleHal.get(metricsPropertyId))
+                .thenThrow(new PropertyTimeoutException(metricsPropertyId));
+
+        mHalService.dumpMetrics(new FileDescriptor());
+        verify(mVehicleHal).get(metricsPropertyId);
+    }
+
+    @Test
+    public void testDumpMetrics_VendorProperty_Unavailable() throws Exception {
+        int metricsPropertyId = VehiclePropertyGroup.VENDOR | 1;
+        when(mResources.getInteger(
+                R.integer.vmsHalClientMetricsProperty)).thenReturn(
+                metricsPropertyId);
+        setUp();
+
+        when(mVehicleHal.get(metricsPropertyId)).thenReturn(null);
+
+        mHalService.dumpMetrics(new FileDescriptor());
+        verify(mVehicleHal).get(metricsPropertyId);
+    }
+
     private static VehiclePropValue createHalMessage(Integer... message) {
         VehiclePropValue result = new VehiclePropValue();
         result.prop = VehicleProperty.VEHICLE_MAP_SERVICE;
diff --git a/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java b/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
new file mode 100644
index 0000000..9bdcaa6
--- /dev/null
+++ b/tests/carservice_unit_test/src/com/android/car/stats/CarStatsServiceTest.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.car.stats;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import android.car.vms.VmsLayer;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.car.stats.VmsClientLogger.ConnectionState;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+@SmallTest
+@RunWith(JUnit4.class)
+public class CarStatsServiceTest {
+    private static final int CLIENT_UID = 10101;
+    private static final int CLIENT_UID2 = 10102;
+    private static final String CLIENT_PACKAGE = "test.package";
+    private static final String CLIENT_PACKAGE2 = "test.package2";
+    private static final VmsLayer LAYER = new VmsLayer(1, 2, 3);
+    private static final VmsLayer LAYER2 = new VmsLayer(2, 3, 4);
+    private static final VmsLayer LAYER3 = new VmsLayer(3, 4, 5);
+
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Mock
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private CarStatsService mCarStatsService;
+    private StringWriter mDumpsysOutput;
+    private PrintWriter mDumpsysWriter;
+
+    @Before
+    public void setUp() {
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.getNameForUid(CLIENT_UID)).thenReturn(CLIENT_PACKAGE);
+        when(mPackageManager.getNameForUid(CLIENT_UID2)).thenReturn(CLIENT_PACKAGE2);
+
+        mCarStatsService = new CarStatsService(mContext);
+        mDumpsysOutput = new StringWriter();
+        mDumpsysWriter = new PrintWriter(mDumpsysOutput);
+    }
+
+    @Test
+    public void testEmptyStats() {
+        mCarStatsService.dump(null, mDumpsysWriter, new String[0]);
+        assertEquals(
+                "uid,packageName,attempts,connected,disconnected,terminated,errors\n"
+                        + "\nuid,layerType,layerChannel,layerVersion,"
+                        + "txBytes,txPackets,rxBytes,rxPackets,droppedBytes,droppedPackets\n",
+                mDumpsysOutput.toString());
+    }
+
+    @Test
+    public void testLogConnectionState_Connecting() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTING);
+        validateConnectionStats("10101,test.package,1,0,0,0,0");
+    }
+
+    @Test
+    public void testLogConnectionState_Connected() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTED);
+        validateConnectionStats("10101,test.package,0,1,0,0,0");
+    }
+
+    @Test
+    public void testLogConnectionState_Disconnected() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.DISCONNECTED);
+        validateConnectionStats("10101,test.package,0,0,1,0,0");
+    }
+
+    @Test
+    public void testLogConnectionState_Terminated() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.TERMINATED);
+        validateConnectionStats("10101,test.package,0,0,0,1,0");
+    }
+
+    @Test
+    public void testLogConnectionState_ConnectionError() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTION_ERROR);
+        validateConnectionStats("10101,test.package,0,0,0,0,1");
+    }
+
+    @Test
+    public void testLogConnectionState_UnknownUID() {
+        mCarStatsService.getVmsClientLogger(-1)
+                .logConnectionState(ConnectionState.CONNECTING);
+        testEmptyStats();
+    }
+
+    @Test
+    public void testLogConnectionState_MultipleClients_MultipleStates() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTING);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.DISCONNECTED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logConnectionState(ConnectionState.CONNECTED);
+
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTING);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.TERMINATED);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTING);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logConnectionState(ConnectionState.CONNECTION_ERROR);
+        validateConnectionStats(
+                "10101,test.package,1,2,1,0,0\n"
+                + "10102,test.package2,2,1,0,1,1");
+    }
+
+    @Test
+    public void testLogPacketSent() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 5);
+        validateClientStats("10101,1,2,3,5,1,0,0,0,0");
+    }
+
+    @Test
+    public void testLogPacketSent_MultiplePackets() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 1);
+
+        validateClientStats("10101,1,2,3,6,3,0,0,0,0");
+    }
+
+    @Test
+    public void testLogPacketSent_MultipleLayers() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER3, 1);
+
+        validateClientStats(
+                "10101,1,2,3,3,1,0,0,0,0\n"
+                        + "10101,2,3,4,2,1,0,0,0,0\n"
+                        + "10101,3,4,5,1,1,0,0,0,0");
+    }
+
+    @Test
+    public void testLogPacketSent_MultipleClients() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketSent(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketSent(LAYER2, 1);
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "10101,1,2,3,3,1,0,0,0,0\n"
+                        + "10102,1,2,3,2,1,0,0,0,0\n"
+                        + "10102,2,3,4,1,1,0,0,0,0\n");
+    }
+
+    @Test
+    public void testLogPacketReceived() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 5);
+        validateClientStats("10101,1,2,3,0,0,5,1,0,0");
+    }
+
+    @Test
+    public void testLogPacketReceived_MultiplePackets() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 1);
+
+        validateClientStats("10101,1,2,3,0,0,6,3,0,0");
+    }
+
+    @Test
+    public void testLogPacketReceived_MultipleLayers() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER3, 1);
+
+        validateClientStats(
+                "10101,1,2,3,0,0,3,1,0,0\n"
+                        + "10101,2,3,4,0,0,2,1,0,0\n"
+                        + "10101,3,4,5,0,0,1,1,0,0");
+    }
+
+    @Test
+    public void testLogPacketReceived_MultipleClients() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER2, 1);
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "10101,1,2,3,0,0,3,1,0,0\n"
+                        + "10102,1,2,3,0,0,2,1,0,0\n"
+                        + "10102,2,3,4,0,0,1,1,0,0\n");
+    }
+
+    @Test
+    public void testLogPacketDropped() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 5);
+        validateClientStats("10101,1,2,3,0,0,0,0,5,1");
+    }
+
+    @Test
+    public void testLogPacketDropped_MultiplePackets() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 1);
+
+        validateClientStats("10101,1,2,3,0,0,0,0,6,3");
+    }
+
+    @Test
+    public void testLogPacketDropped_MultipleLayers() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER3, 1);
+
+        validateClientStats(
+                "10101,1,2,3,0,0,0,0,3,1\n"
+                        + "10101,2,3,4,0,0,0,0,2,1\n"
+                        + "10101,3,4,5,0,0,0,0,1,1");
+    }
+
+    @Test
+    public void testLogPacketDropped_MultipleClients() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketDropped(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketDropped(LAYER2, 1);
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "10101,1,2,3,0,0,0,0,3,1\n"
+                        + "10102,1,2,3,0,0,0,0,2,1\n"
+                        + "10102,2,3,4,0,0,0,0,1,1\n");
+    }
+
+    @Test
+    public void testLogPackets_MultipleClients_MultipleLayers_MultipleOperations() {
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketSent(LAYER, 3);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID)
+                .logPacketDropped(LAYER, 1);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketReceived(LAYER, 2);
+        mCarStatsService.getVmsClientLogger(CLIENT_UID2)
+                .logPacketSent(LAYER2, 2);
+        mCarStatsService.getVmsClientLogger(-1)
+                .logPacketDropped(LAYER2, 12);
+
+
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n"
+                        + "10102,test.package2,0,0,0,0,0\n",
+                "-1,2,3,4,0,0,0,0,12,1\n"
+                        + "10101,1,2,3,3,1,2,1,1,1\n"
+                        + "10102,1,2,3,0,0,6,3,0,0\n"
+                        + "10102,2,3,4,2,1,0,0,0,0\n");
+    }
+
+
+    private void validateConnectionStats(String vmsConnectionStats) {
+        validateDumpsys(vmsConnectionStats + "\n", "");
+    }
+
+    private void validateClientStats(String vmsClientStats) {
+        validateDumpsys(
+                "10101,test.package,0,0,0,0,0\n",
+                vmsClientStats + "\n");
+    }
+
+    private void validateDumpsys(String vmsConnectionStats, String vmsClientStats) {
+        mCarStatsService.dump(null, mDumpsysWriter, new String[0]);
+        assertEquals(
+                "uid,packageName,attempts,connected,disconnected,terminated,errors\n"
+                        + vmsConnectionStats
+                        + "\n"
+                        + "uid,layerType,layerChannel,layerVersion,"
+                        + "txBytes,txPackets,rxBytes,rxPackets,droppedBytes,droppedPackets\n"
+                        + vmsClientStats,
+                mDumpsysOutput.toString());
+    }
+}
diff --git a/tests/carservice_unit_test/src/com/android/car/trust/BLEMessagePayloadStreamTest.java b/tests/carservice_unit_test/src/com/android/car/trust/BLEMessagePayloadStreamTest.java
index b65bce6..a99b1d7 100644
--- a/tests/carservice_unit_test/src/com/android/car/trust/BLEMessagePayloadStreamTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/trust/BLEMessagePayloadStreamTest.java
@@ -43,7 +43,7 @@
     private static final byte[] TEST_MESSAGE_PAYLOAD = "testMessage".getBytes();
     private static final int TEST_SINGLE_MESSAGE_SIZE =
             TEST_MESSAGE_PAYLOAD.length + BLEMessageV1Factory.getProtoHeaderSize(
-                    OPERATION_TYPE, IS_MESSAGE_ENCRYPTED);
+                    OPERATION_TYPE, TEST_MESSAGE_PAYLOAD.length, IS_MESSAGE_ENCRYPTED);
 
     private BLEMessagePayloadStream mBLEMessagePayloadStream;
     private List<BLEMessage> mBleMessages;
diff --git a/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java b/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
index f21413e..e1c9d9a 100644
--- a/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/vms/VmsClientManagerTest.java
@@ -17,13 +17,18 @@
 package com.android.car.vms;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atMost;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -32,24 +37,34 @@
 import static org.mockito.Mockito.when;
 
 import android.car.Car;
-import android.car.userlib.CarUserManagerHelper;
+import android.car.vms.IVmsPublisherClient;
+import android.car.vms.IVmsPublisherService;
+import android.car.vms.IVmsSubscriberClient;
+import android.car.vms.VmsAvailableLayers;
+import android.car.vms.VmsLayer;
+import android.car.vms.VmsSubscriptionState;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import androidx.test.filters.SmallTest;
 
+import com.android.car.VmsPublisherService;
 import com.android.car.hal.VmsHalService;
+import com.android.car.stats.CarStatsService;
+import com.android.car.stats.VmsClientLogger;
+import com.android.car.stats.VmsClientLogger.ConnectionState;
 import com.android.car.user.CarUserService;
 
 import org.junit.After;
@@ -59,15 +74,11 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import java.util.function.Consumer;
-
 @SmallTest
 public class VmsClientManagerTest {
-    private static final String HAL_CLIENT_NAME = "VmsHalClient";
     private static final String SYSTEM_CLIENT = "com.google.android.apps.vms.test/.VmsSystemClient";
     private static final ComponentName SYSTEM_CLIENT_COMPONENT =
             ComponentName.unflattenFromString(SYSTEM_CLIENT);
@@ -77,10 +88,22 @@
     private static final String USER_CLIENT = "com.google.android.apps.vms.test/.VmsUserClient";
     private static final ComponentName USER_CLIENT_COMPONENT =
             ComponentName.unflattenFromString(USER_CLIENT);
+    private static final int USER_ID = 10;
     private static final String USER_CLIENT_NAME =
             "com.google.android.apps.vms.test/com.google.android.apps.vms.test.VmsUserClient U=10";
-    private static final String USER_CLIENT_NAME_U11 =
-            "com.google.android.apps.vms.test/com.google.android.apps.vms.test.VmsUserClient U=11";
+    private static final int USER_ID_U11 = 11;
+
+    private static final String TEST_PACKAGE = "test.package1";
+    private static final String HAL_CLIENT_NAME = "HalClient";
+    private static final String UNKNOWN_PACKAGE = "UnknownPackage";
+
+    private static final int TEST_APP_ID = 12345;
+    private static final int TEST_SYSTEM_UID = 12345;
+    private static final int TEST_USER_UID = 1012345;
+    private static final int TEST_USER_UID_U11 = 1112345;
+
+    private static final long MILLIS_BEFORE_REBIND = 100;
+
     @Rule
     public MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Mock
@@ -89,37 +112,86 @@
     private PackageManager mPackageManager;
     @Mock
     private Resources mResources;
-
+    @Mock
+    private CarStatsService mStatsService;
     @Mock
     private UserManager mUserManager;
     @Mock
     private CarUserService mUserService;
+
     @Mock
-    private CarUserManagerHelper mUserManagerHelper;
-    private int mUserId;
+    private VmsBrokerService mBrokerService;
 
     @Mock
     private VmsHalService mHal;
-    private Consumer<IBinder> mHalClientConnected;
-    private Runnable mHalClientDisconnected;
 
     @Mock
-    private VmsClientManager.ConnectionListener mConnectionListener;
-    private VmsClientManager mClientManager;
+    private Handler mHandler;
+
+    @Captor
+    private ArgumentCaptor<Runnable> mRebindCaptor;
+
+    @Mock
+    private VmsPublisherService mPublisherService;
+
+    @Mock
+    private IVmsSubscriberClient mSubscriberClient1;
+    @Mock
+    private Binder mSubscriberBinder1;
+
+    @Captor
+    private ArgumentCaptor<IBinder.DeathRecipient> mDeathRecipient;
+
+    @Mock
+    private IVmsSubscriberClient mSubscriberClient2;
+    @Mock
+    private Binder mSubscriberBinder2;
 
     @Captor
     private ArgumentCaptor<ServiceConnection> mConnectionCaptor;
 
+    @Mock
+    private VmsClientLogger mSystemClientLog;
+    @Mock
+    private VmsClientLogger mUserClientLog;
+    @Mock
+    private VmsClientLogger mUserClientLog2;
+    @Mock
+    private VmsClientLogger mHalClientLog;
+
+    private VmsClientManager mClientManager;
+
+    private int mForegroundUserId;
+    private int mCallingAppUid;
+
+    private ServiceInfo mSystemServiceInfo;
+    private ServiceInfo mUserServiceInfo;
+
     @Before
     public void setUp() throws Exception {
         resetContext();
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
-        when(mPackageManager.getServiceInfo(any(), anyInt())).thenReturn(serviceInfo);
+        mSystemServiceInfo = new ServiceInfo();
+        mSystemServiceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
+        mSystemServiceInfo.applicationInfo = new ApplicationInfo();
+        mSystemServiceInfo.applicationInfo.uid = TEST_APP_ID;
+        when(mPackageManager.getServiceInfo(eq(SYSTEM_CLIENT_COMPONENT), anyInt()))
+                .thenReturn(mSystemServiceInfo);
+        when(mStatsService.getVmsClientLogger(TEST_SYSTEM_UID)).thenReturn(mSystemClientLog);
+
+        mUserServiceInfo = new ServiceInfo();
+        mUserServiceInfo.permission = Car.PERMISSION_BIND_VMS_CLIENT;
+        mUserServiceInfo.applicationInfo = new ApplicationInfo();
+        mUserServiceInfo.applicationInfo.uid = TEST_APP_ID;
+        when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
+                .thenReturn(mUserServiceInfo);
+        when(mStatsService.getVmsClientLogger(TEST_USER_UID)).thenReturn(mUserClientLog);
+        when(mStatsService.getVmsClientLogger(TEST_USER_UID_U11)).thenReturn(mUserClientLog2);
+
+        when(mStatsService.getVmsClientLogger(Process.myUid())).thenReturn(mHalClientLog);
 
         when(mResources.getInteger(
                 com.android.car.R.integer.millisecondsBeforeRebindToVmsPublisher)).thenReturn(
-                5);
+                (int) MILLIS_BEFORE_REBIND);
         when(mResources.getStringArray(
                 com.android.car.R.array.vmsPublisherSystemClients)).thenReturn(
                 new String[]{ SYSTEM_CLIENT });
@@ -127,33 +199,29 @@
                 com.android.car.R.array.vmsPublisherUserClients)).thenReturn(
                 new String[]{ USER_CLIENT });
 
-        mUserId = 10;
-        when(mUserManagerHelper.getCurrentForegroundUserId()).thenAnswer((invocation) -> mUserId);
         when(mContext.getSystemService(eq(Context.USER_SERVICE))).thenReturn(mUserManager);
-        when(mUserManager.isUserUnlocked(any())).thenReturn(false);
 
-        mClientManager = new VmsClientManager(mContext, mUserService, mUserManagerHelper, mHal);
-        mClientManager.registerConnectionListener(mConnectionListener);
+        mClientManager = new VmsClientManager(mContext, mStatsService, mUserService,
+                mBrokerService, mHal, mHandler, () -> mCallingAppUid);
+        verify(mHal).setClientManager(mClientManager);
+        mClientManager.setPublisherService(mPublisherService);
 
-        @SuppressWarnings("unchecked")
-        ArgumentCaptor<Consumer<IBinder>> onClientConnectedCaptor =
-                ArgumentCaptor.forClass(Consumer.class);
-        ArgumentCaptor<Runnable> onClientDisconnectedCaptor =
-                ArgumentCaptor.forClass(Runnable.class);
-        verify(mHal).setPublisherConnectionCallbacks(
-                onClientConnectedCaptor.capture(), onClientDisconnectedCaptor.capture());
-        mHalClientConnected = onClientConnectedCaptor.getValue();
-        mHalClientDisconnected = onClientDisconnectedCaptor.getValue();
+        notifyUserSwitched(USER_ID, false);
+        mCallingAppUid = UserHandle.getUid(USER_ID, 0);
+
+        when(mSubscriberClient1.asBinder()).thenReturn(mSubscriberBinder1);
+        when(mSubscriberClient2.asBinder()).thenReturn(mSubscriberBinder2);
+
+        when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn(TEST_PACKAGE);
     }
 
     @After
-    public void tearDown() throws Exception {
-        Thread.sleep(10); // Time to allow for delayed rebinds to settle
+    public void tearDown() {
         verify(mContext, atLeast(0)).getSystemService(eq(Context.USER_SERVICE));
         verify(mContext, atLeast(0)).getResources();
         verify(mContext, atLeast(0)).getPackageManager();
-        verifyNoMoreInteractions(mContext);
-        verifyNoMoreInteractions(mHal);
+        verifyNoMoreInteractions(mContext, mBrokerService, mHal, mPublisherService, mHandler);
+        verifyNoMoreInteractions(mSystemClientLog, mUserClientLog, mUserClientLog2, mHalClientLog);
     }
 
     @Test
@@ -162,15 +230,8 @@
 
         // Verify registration of system user unlock listener
         verify(mUserService).runOnUser0Unlock(mClientManager.mSystemUserUnlockedListener);
-
-        // Verify registration of user switch receiver
-        ArgumentCaptor<IntentFilter> userFilterCaptor = ArgumentCaptor.forClass(IntentFilter.class);
-        verify(mContext).registerReceiverAsUser(eq(mClientManager.mUserSwitchReceiver),
-                eq(UserHandle.ALL), userFilterCaptor.capture(), isNull(), isNull());
-        IntentFilter userEventFilter = userFilterCaptor.getValue();
-        assertEquals(2, userEventFilter.countActions());
-        assertTrue(userEventFilter.hasAction(Intent.ACTION_USER_SWITCHED));
-        assertTrue(userEventFilter.hasAction(Intent.ACTION_USER_UNLOCKED));
+        // Verify user callback is added
+        verify(mUserService).addUserCallback(eq(mClientManager.mUserCallback));
     }
 
     @Test
@@ -178,38 +239,7 @@
         mClientManager.release();
 
         // Verify user switch receiver is unregistered
-        verify(mContext).unregisterReceiver(mClientManager.mUserSwitchReceiver);
-    }
-
-    @Test
-    public void testRegisterConnectionListener() {
-        VmsClientManager.ConnectionListener listener =
-                Mockito.mock(VmsClientManager.ConnectionListener.class);
-        mClientManager.registerConnectionListener(listener);
-    }
-
-    @Test
-    public void testRegisterConnectionListener_AfterHalClientConnected() {
-        IBinder halClient = bindHalClient();
-
-        VmsClientManager.ConnectionListener listener =
-                Mockito.mock(VmsClientManager.ConnectionListener.class);
-        mClientManager.registerConnectionListener(listener);
-        verify(listener).onClientConnected(HAL_CLIENT_NAME, halClient);
-    }
-
-    @Test
-    public void testRegisterConnectionListener_AfterClientsConnected() {
-        IBinder halClient = bindHalClient();
-        IBinder systemBinder = bindSystemClient();
-        IBinder userBinder = bindUserClient();
-
-        VmsClientManager.ConnectionListener listener =
-                Mockito.mock(VmsClientManager.ConnectionListener.class);
-        mClientManager.registerConnectionListener(listener);
-        verify(listener).onClientConnected(HAL_CLIENT_NAME, halClient);
-        verify(listener).onClientConnected(eq(SYSTEM_CLIENT_NAME), eq(systemBinder));
-        verify(listener).onClientConnected(eq(USER_CLIENT_NAME), eq(userBinder));
+        verify(mUserService).removeUserCallback(mClientManager.mUserCallback);
     }
 
     @Test
@@ -233,14 +263,12 @@
 
     @Test
     public void testSystemUserUnlocked_WrongPermission() throws Exception {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
-        when(mPackageManager.getServiceInfo(eq(SYSTEM_CLIENT_COMPONENT), anyInt()))
-                .thenReturn(serviceInfo);
+        mSystemServiceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
         notifySystemUserUnlocked();
 
         // Process will not be bound
         verifySystemBind(0);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -251,6 +279,7 @@
 
         // Failure state will trigger another attempt on event
         verifySystemBind(2);
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -262,22 +291,39 @@
 
         // Failure state will trigger another attempt on event
         verifySystemBind(2);
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
     public void testUserUnlocked() {
-        notifyUserUnlocked();
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         // Multiple events should only trigger a single bind, when successful
         verifyUserBind(1);
     }
 
     @Test
+    public void testUserUnlocked_ForegroundUserNotUnlocked() {
+        notifyUserUnlocked(USER_ID, false);
+
+        // Process will not be bound
+        verifyUserBind(0);
+    }
+
+    @Test
+    public void testUserUnlocked_OtherUserUnlocked() {
+        notifyUserUnlocked(USER_ID_U11, true);
+
+        // Process will not be bound
+        verifyUserBind(0);
+    }
+
+    @Test
     public void testUserUnlocked_ClientNotFound() throws Exception {
         when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
                 .thenThrow(new PackageManager.NameNotFoundException());
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
 
         // Process will not be bound
         verifyUserBind(0);
@@ -285,47 +331,48 @@
 
     @Test
     public void testUserUnlocked_WrongPermission() throws Exception {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
-        when(mPackageManager.getServiceInfo(eq(USER_CLIENT_COMPONENT), anyInt()))
-                .thenReturn(serviceInfo);
-        notifyUserUnlocked();
+        mUserServiceInfo.permission = Car.PERMISSION_VMS_PUBLISHER;
+        notifyUserUnlocked(USER_ID, true);
 
         // Process will not be bound
         verifyUserBind(0);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
     public void testUserUnlocked_BindFailed() {
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), any()))
                 .thenReturn(false);
-        notifyUserUnlocked();
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         // Failure state will trigger another attempt
         verifyUserBind(2);
+        verify(mUserClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
     public void testUserUnlocked_UserBindFailed() {
-        when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.of(mUserId))))
+        when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.of(USER_ID))))
                 .thenReturn(false);
-        notifyUserUnlocked();
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         // Failure state will trigger another attempt
         verifyUserBind(2);
+        verify(mUserClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
     public void testUserUnlocked_BindException() {
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), any()))
                 .thenThrow(new SecurityException());
-        notifyUserUnlocked();
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         // Failure state will trigger another attempt
         verifyUserBind(2);
+        verify(mUserClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
     }
 
     @Test
@@ -334,11 +381,12 @@
                 .thenReturn(false);
         notifySystemUserUnlocked();
         verifySystemBind(1);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
         resetContext();
 
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.SYSTEM)))
                 .thenReturn(true);
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifySystemBind(1);
         verifyUserBind(1);
     }
@@ -349,14 +397,16 @@
                 .thenReturn(false);
         notifySystemUserUnlocked();
         verifySystemBind(1);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
         resetContext();
 
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.SYSTEM)))
                 .thenReturn(false);
-        notifyUserUnlocked();
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         verifySystemBind(2); // Failure state will trigger another attempt
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
         verifyUserBind(1);
     }
 
@@ -366,79 +416,59 @@
                 .thenThrow(new SecurityException());
         notifySystemUserUnlocked();
         verifySystemBind(1);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTION_ERROR);
         resetContext();
 
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), eq(UserHandle.SYSTEM)))
                 .thenThrow(new SecurityException());
-        notifyUserUnlocked();
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         verifySystemBind(2); // Failure state will trigger another attempt
+        verify(mSystemClientLog, times(2)).logConnectionState(ConnectionState.CONNECTION_ERROR);
         verifyUserBind(1);
     }
 
     @Test
     public void testUserSwitched() {
-        notifyUserSwitched();
+        notifyUserSwitched(USER_ID, true);
+        notifyUserSwitched(USER_ID, true);
 
-        // Clients are not bound on user switch alone
-        verifyUserBind(0);
+        // Multiple events should only trigger a single bind, when successful
+        verifyUserBind(1);
     }
 
     @Test
     public void testUserSwitchedAndUnlocked() {
-        notifyUserSwitched();
-        notifyUserUnlocked();
+        notifyUserSwitched(USER_ID, true);
+        notifyUserUnlocked(USER_ID, true);
 
         // Multiple events should only trigger a single bind, when successful
         verifyUserBind(1);
     }
 
     @Test
-    public void testUserSwitchedAlreadyUnlocked() {
-        when(mUserManager.isUserUnlocked(mUserId)).thenReturn(true);
-        notifyUserSwitched();
+    public void testUserSwitched_ForegroundUserNotUnlocked() {
+        notifyUserSwitched(USER_ID, false);
 
-        // Multiple events should only trigger a single bind, when successful
-        verifyUserBind(1);
-    }
-
-    @Test
-    public void testUserSwitchedToSystemUser() {
-        mUserId = UserHandle.USER_SYSTEM;
-        notifyUserSwitched();
-
-        // User processes will not be bound for system user
+        // Process will not be bound
         verifyUserBind(0);
     }
 
     @Test
-    public void testUnregisterConnectionListener() {
-        mClientManager.unregisterConnectionListener(mConnectionListener);
-        notifySystemUserUnlocked();
-        verifySystemBind(1);
+    public void testUserSwitchedToSystemUser() {
+        notifyUserSwitched(UserHandle.USER_SYSTEM, true);
 
-        ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
-        verifyZeroInteractions(mConnectionListener);
-    }
-
-    @Test
-    public void testHalClientConnected() {
-        IBinder binder = bindHalClient();
-        verify(mConnectionListener).onClientConnected(eq(HAL_CLIENT_NAME), eq(binder));
-    }
-
-    private IBinder bindHalClient() {
-        IBinder binder = new Binder();
-        mHalClientConnected.accept(binder);
-        return binder;
+        // Neither user nor system processes will be bound for system user intent
+        verifySystemBind(0);
+        verifyUserBind(0);
     }
 
     @Test
     public void testOnSystemServiceConnected() {
         IBinder binder = bindSystemClient();
-        verify(mConnectionListener).onClientConnected(eq(SYSTEM_CLIENT_NAME), eq(binder));
+        verifyOnClientConnected(SYSTEM_CLIENT_NAME, binder);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
     }
 
     private IBinder bindSystemClient() {
@@ -446,7 +476,7 @@
         verifySystemBind(1);
         resetContext();
 
-        IBinder binder = new Binder();
+        IBinder binder = createPublisherBinder();
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, binder);
         return binder;
@@ -455,137 +485,260 @@
     @Test
     public void testOnUserServiceConnected() {
         IBinder binder = bindUserClient();
-        verify(mConnectionListener).onClientConnected(eq(USER_CLIENT_NAME), eq(binder));
+        verifyOnClientConnected(USER_CLIENT_NAME, binder);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
     }
 
     private IBinder bindUserClient() {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         resetContext();
 
-        IBinder binder = new Binder();
+        IBinder binder = createPublisherBinder();
         ServiceConnection connection = mConnectionCaptor.getValue();
         connection.onServiceConnected(null, binder);
         return binder;
     }
 
     @Test
-    public void testOnHalClientDisconnected() throws Exception {
-        bindHalClient();
-        mHalClientDisconnected.run();
-
-        verify(mConnectionListener).onClientDisconnected(eq(HAL_CLIENT_NAME));
-    }
-
-    @Test
     public void testOnSystemServiceDisconnected() throws Exception {
         notifySystemUserUnlocked();
         verifySystemBind(1);
         resetContext();
 
         ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
+        connection.onServiceConnected(null, createPublisherBinder());
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
         connection.onServiceDisconnected(null);
+        verify(mPublisherService).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
+        verify(mSystemClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
+        verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
-        verify(mConnectionListener).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
-
-        Thread.sleep(10);
         verifySystemBind(1);
     }
 
     @Test
-    public void testOnSystemServiceDisconnected_ServiceNotConnected() throws Exception {
+    public void testOnSystemServiceDisconnected_ServiceReboundByAndroid() throws Exception {
         notifySystemUserUnlocked();
         verifySystemBind(1);
         resetContext();
 
         ServiceConnection connection = mConnectionCaptor.getValue();
+        IBinder binder = createPublisherBinder();
+        connection.onServiceConnected(null, binder);
+        verifyOnClientConnected(SYSTEM_CLIENT_NAME, binder);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService, mSystemClientLog);
+
         connection.onServiceDisconnected(null);
+        verify(mPublisherService).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
+        verify(mSystemClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
+        binder = createPublisherBinder();
+        connection.onServiceConnected(null, binder);
+        verifyOnClientConnected(SYSTEM_CLIENT_NAME, binder);
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
+
+        verifyAndRunRebindTask();
+        // No more interactions (verified by tearDown)
+    }
+
+
+    @Test
+    public void testOnSystemServiceBindingDied() throws Exception {
+        notifySystemUserUnlocked();
+        verifySystemBind(1);
+        resetContext();
+
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        connection.onServiceConnected(null, createPublisherBinder());
+        verify(mSystemClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
+        connection.onBindingDied(null);
+        verify(mPublisherService).onClientDisconnected(eq(SYSTEM_CLIENT_NAME));
+        verify(mSystemClientLog).logConnectionState(ConnectionState.DISCONNECTED);
+
+        verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
-        verifyZeroInteractions(mConnectionListener);
+        verifySystemBind(1);
+    }
 
-        Thread.sleep(10);
+    @Test
+    public void testOnSystemServiceBindingDied_ServiceNotConnected() throws Exception {
+        notifySystemUserUnlocked();
+        verifySystemBind(1);
+        resetContext();
+
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        connection.onBindingDied(null);
+
+        verifyZeroInteractions(mPublisherService);
+
+        verifyAndRunRebindTask();
+        verify(mContext).unbindService(connection);
         verifySystemBind(1);
     }
 
     @Test
     public void testOnUserServiceDisconnected() throws Exception {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         resetContext();
 
         ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
+        connection.onServiceConnected(null, createPublisherBinder());
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
         connection.onServiceDisconnected(null);
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
+        verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
-        verify(mConnectionListener).onClientDisconnected(eq(USER_CLIENT_NAME));
-
-        Thread.sleep(10);
         verifyUserBind(1);
     }
 
     @Test
-    public void testOnUserServiceDisconnected_ServiceNotConnected() throws Exception {
-        notifyUserUnlocked();
+    public void testOnUserServiceDisconnected_ServiceReboundByAndroid() throws Exception {
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         resetContext();
 
         ServiceConnection connection = mConnectionCaptor.getValue();
+        IBinder binder = createPublisherBinder();
+        connection.onServiceConnected(null, binder);
+        verifyOnClientConnected(USER_CLIENT_NAME, binder);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService, mUserClientLog);
+
         connection.onServiceDisconnected(null);
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.DISCONNECTED);
 
+        binder = createPublisherBinder();
+        connection.onServiceConnected(null, binder);
+        verifyOnClientConnected(USER_CLIENT_NAME, binder);
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
+
+        verifyAndRunRebindTask();
+        // No more interactions (verified by tearDown)
+    }
+
+    @Test
+    public void testOnUserServiceBindingDied() throws Exception {
+        notifyUserUnlocked(USER_ID, true);
+        verifyUserBind(1);
+        resetContext();
+
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        connection.onServiceConnected(null, createPublisherBinder());
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
+        connection.onBindingDied(null);
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.DISCONNECTED);
+
+        verifyAndRunRebindTask();
         verify(mContext).unbindService(connection);
-        verifyZeroInteractions(mConnectionListener);
+        verifyUserBind(1);
+    }
 
-        Thread.sleep(10);
+    @Test
+    public void testOnUserServiceBindingDied_ServiceNotConnected() throws Exception {
+        notifyUserUnlocked(USER_ID, true);
+        verifyUserBind(1);
+        resetContext();
+
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        connection.onBindingDied(null);
+
+        verifyZeroInteractions(mPublisherService);
+
+        verifyAndRunRebindTask();
+        verify(mContext).unbindService(connection);
         verifyUserBind(1);
     }
 
     @Test
     public void testOnUserSwitched_UserChange() {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
-        ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
         resetContext();
-        reset(mConnectionListener);
 
-        mUserId = 11;
-        notifyUserSwitched();
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        connection.onServiceConnected(null, createPublisherBinder());
+        verify(mUserClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
+        notifyUserSwitched(USER_ID_U11, true);
 
         verify(mContext).unbindService(connection);
-        verify(mConnectionListener).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
+        verifyUserBind(1);
+    }
+
+    @Test
+    public void testOnUserSwitched_UserChange_ForegroundUserNotUnlocked() {
+        notifyUserUnlocked(USER_ID, true);
+        verifyUserBind(1);
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        connection.onServiceConnected(null, createPublisherBinder());
+        resetContext();
+        reset(mPublisherService);
+
+        notifyUserSwitched(USER_ID_U11, false);
+
+        verify(mContext).unbindService(connection);
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(0);
     }
 
     @Test
     public void testOnUserSwitched_UserChange_ToSystemUser() {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
+        connection.onServiceConnected(null, createPublisherBinder());
         resetContext();
-        reset(mConnectionListener);
+        reset(mPublisherService);
 
-        mUserId = UserHandle.USER_SYSTEM;
-        notifyUserSwitched();
+        notifyUserSwitched(UserHandle.USER_SYSTEM, true);
 
         verify(mContext).unbindService(connection);
-        verify(mConnectionListener).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(0);
     }
 
     @Test
     public void testOnUserSwitched_UserChange_ServiceNotConnected() {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         ServiceConnection connection = mConnectionCaptor.getValue();
         resetContext();
 
-        mUserId = 11;
-        notifyUserSwitched();
+        notifyUserSwitched(USER_ID_U11, true);
+
+        verify(mContext).unbindService(connection);
+        verifyUserBind(1);
+    }
+
+    @Test
+    public void testOnUserSwitched_UserChange_ServiceNotConnected_ForegroundUserNotUnlocked() {
+        notifyUserUnlocked(USER_ID, true);
+        verifyUserBind(1);
+        ServiceConnection connection = mConnectionCaptor.getValue();
+        resetContext();
+
+        notifyUserSwitched(USER_ID_U11, false);
 
         verify(mContext).unbindService(connection);
         verifyUserBind(0);
@@ -593,18 +746,19 @@
 
     @Test
     public void testOnUserUnlocked_UserChange() {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
+        connection.onServiceConnected(null, createPublisherBinder());
         resetContext();
-        reset(mConnectionListener);
+        reset(mPublisherService);
 
-        mUserId = 11;
-        notifyUserUnlocked();
+        notifyUserSwitched(USER_ID_U11, false);
+        notifyUserUnlocked(USER_ID_U11, true);
 
         verify(mContext).unbindService(connection);
-        verify(mConnectionListener).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         verifyUserBind(1);
     }
 
@@ -612,38 +766,265 @@
     public void testOnUserUnlocked_UserChange_ToSystemUser() {
         notifySystemUserUnlocked();
         verifySystemBind(1);
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         ServiceConnection connection = mConnectionCaptor.getValue();
-        connection.onServiceConnected(null, new Binder());
+        connection.onServiceConnected(null, createPublisherBinder());
         resetContext();
-        reset(mConnectionListener);
+        reset(mPublisherService);
 
-        mUserId = UserHandle.USER_SYSTEM;
-        notifyUserUnlocked();
+        notifyUserSwitched(USER_ID_U11, false);
+        notifyUserUnlocked(UserHandle.USER_SYSTEM, true);
 
         verify(mContext).unbindService(connection);
-        verify(mConnectionListener).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mPublisherService).onClientDisconnected(eq(USER_CLIENT_NAME));
+        verify(mUserClientLog).logConnectionState(ConnectionState.TERMINATED);
         // User processes will not be bound for system user
         verifyUserBind(0);
     }
 
     @Test
     public void testOnUserUnlocked_UserChange_ServiceNotConnected() {
-        notifyUserUnlocked();
+        notifyUserUnlocked(USER_ID, true);
         verifyUserBind(1);
         ServiceConnection connection = mConnectionCaptor.getValue();
         resetContext();
 
-        mUserId = 11;
-        notifyUserUnlocked();
+        notifyUserSwitched(USER_ID_U11, false);
+        notifyUserUnlocked(USER_ID_U11, true);
 
         verify(mContext).unbindService(connection);
         verifyUserBind(1);
     }
 
+    @Test
+    public void testAddSubscriber() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient2));
+    }
+
+    @Test
+    public void testAddSubscriber_SystemUser() {
+        mCallingAppUid = UserHandle.getUid(UserHandle.USER_SYSTEM, 0);
+        when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn(TEST_PACKAGE);
+
+        mClientManager.addSubscriber(mSubscriberClient1);
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient2));
+    }
+
+    @Test
+    public void testAddSubscriber_NotForegroundUser() {
+        mCallingAppUid = UserHandle.getUid(USER_ID_U11, 0);
+
+        try {
+            mClientManager.addSubscriber(mSubscriberClient1);
+            fail("Expected client to be rejected");
+        } catch (SecurityException expected) {
+            // expected
+        }
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
+    }
+
+    @Test
+    public void testAddSubscriber_MultipleCalls() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+        mClientManager.addSubscriber(mSubscriberClient1);
+        verify(mPackageManager, atMost(1)).getNameForUid(anyInt());
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient2));
+    }
+
+    @Test
+    public void testAddSubscriber_MultipleClients_SamePackage() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+        mClientManager.addSubscriber(mSubscriberClient2);
+        verify(mPackageManager, atMost(2)).getNameForUid(anyInt());
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
+    }
+
+    @Test
+    public void testAddSubscriber_MultipleClients_ForegroundAndSystemUsers_SamePackage() {
+        int clientUid1 = mCallingAppUid;
+        mClientManager.addSubscriber(mSubscriberClient1);
+
+        mCallingAppUid = UserHandle.getUid(UserHandle.USER_SYSTEM, 0);
+        when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn(TEST_PACKAGE);
+        mClientManager.addSubscriber(mSubscriberClient2);
+
+        verify(mPackageManager, atMost(2)).getNameForUid(anyInt());
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(clientUid1, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
+    }
+
+
+    @Test
+    public void testAddSubscriber_MultipleClients_MultiplePackages() {
+        int clientUid1 = mCallingAppUid;
+        mClientManager.addSubscriber(mSubscriberClient1);
+
+        mCallingAppUid = UserHandle.getUid(mForegroundUserId, 1);
+        when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn("test.package2");
+        mClientManager.addSubscriber(mSubscriberClient2);
+
+        verify(mPackageManager, times(2)).getNameForUid(anyInt());
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(clientUid1, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals("test.package2", mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
+    }
+
+    @Test
+    public void testRemoveSubscriber() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+        mClientManager.removeSubscriber(mSubscriberClient1);
+        verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
+    }
+
+    @Test
+    public void testRemoveSubscriber_NotRegistered() {
+        mClientManager.removeSubscriber(mSubscriberClient1);
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
+    }
+
+    @Test
+    public void testRemoveSubscriber_OnDeath() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+
+        verify(mSubscriberBinder1).linkToDeath(mDeathRecipient.capture(), eq(0));
+        mDeathRecipient.getValue().binderDied();
+
+        verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
+    }
+
+    @Test
+    public void testOnUserSwitch_RemoveSubscriber() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+
+        notifyUserSwitched(USER_ID_U11, false);
+        verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertTrue(mClientManager.getAllSubscribers().isEmpty());
+    }
+
+    @Test
+    public void testOnUserSwitch_RemoveSubscriber_AddNewSubscriber() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+
+        notifyUserSwitched(USER_ID_U11, false);
+        verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
+
+        mCallingAppUid = UserHandle.getUid(USER_ID_U11, 0);
+        when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn(TEST_PACKAGE);
+        mClientManager.addSubscriber(mSubscriberClient2);
+
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(-1, mClientManager.getSubscriberUid(mSubscriberClient1));
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+        assertEquals(mCallingAppUid, mClientManager.getSubscriberUid(mSubscriberClient2));
+        assertFalse(mClientManager.getAllSubscribers().contains(mSubscriberClient1));
+        assertTrue(mClientManager.getAllSubscribers().contains(mSubscriberClient2));
+    }
+
+    @Test
+    public void testOnUserSwitch_RemoveSubscriber_RetainSystemClient() {
+        mClientManager.addSubscriber(mSubscriberClient1);
+
+        mCallingAppUid = UserHandle.getUid(UserHandle.USER_SYSTEM, 0);
+        when(mPackageManager.getNameForUid(mCallingAppUid)).thenReturn(TEST_PACKAGE);
+
+        mClientManager.addSubscriber(mSubscriberClient2);
+
+        notifyUserSwitched(USER_ID_U11, false);
+
+        verify(mBrokerService).removeDeadSubscriber(mSubscriberClient1);
+        verify(mBrokerService, never()).removeDeadSubscriber(mSubscriberClient2);
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(mSubscriberClient1));
+        assertEquals(TEST_PACKAGE, mClientManager.getPackageName(mSubscriberClient2));
+    }
+
+    @Test
+    public void testOnUserSwitch_RemoveSubscriber_RetainHalClient() {
+        IVmsPublisherClient publisherClient = createPublisherClient();
+        IVmsSubscriberClient subscriberClient = createSubscriberClient();
+        mClientManager.onHalConnected(publisherClient, subscriberClient);
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
+        notifyUserSwitched(USER_ID_U11, false);
+
+        verify(mBrokerService, never()).removeDeadSubscriber(subscriberClient);
+        assertEquals(HAL_CLIENT_NAME, mClientManager.getPackageName(subscriberClient));
+    }
+
+    @Test
+    public void testHalClientConnected() {
+        IVmsPublisherClient publisherClient = createPublisherClient();
+        IVmsSubscriberClient subscriberClient = createSubscriberClient();
+        mClientManager.onHalConnected(publisherClient, subscriberClient);
+        verify(mPublisherService).onClientConnected(eq(HAL_CLIENT_NAME), same(publisherClient));
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
+        assertTrue(mClientManager.getAllSubscribers().contains(subscriberClient));
+        assertEquals(HAL_CLIENT_NAME, mClientManager.getPackageName(subscriberClient));
+    }
+
+    @Test
+    public void testHalClientConnected_AfterAddSubscriber() {
+        IVmsPublisherClient publisherClient = createPublisherClient();
+        IVmsSubscriberClient subscriberClient = createSubscriberClient();
+        mClientManager.addSubscriber(subscriberClient);
+
+        mClientManager.onHalConnected(publisherClient, subscriberClient);
+        verify(mPublisherService).onClientConnected(eq(HAL_CLIENT_NAME), same(publisherClient));
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
+        assertTrue(mClientManager.getAllSubscribers().contains(subscriberClient));
+        assertEquals(HAL_CLIENT_NAME, mClientManager.getPackageName(subscriberClient));
+    }
+
+    @Test
+    public void testOnHalClientDisconnected() {
+        IVmsPublisherClient publisherClient = createPublisherClient();
+        IVmsSubscriberClient subscriberClient = createSubscriberClient();
+        mClientManager.onHalConnected(publisherClient, subscriberClient);
+        verify(mHalClientLog).logConnectionState(ConnectionState.CONNECTED);
+        reset(mPublisherService);
+
+        mClientManager.onHalDisconnected();
+        verify(mPublisherService).onClientDisconnected(eq(HAL_CLIENT_NAME));
+        verify(mBrokerService).removeDeadSubscriber(eq(subscriberClient));
+        verify(mHalClientLog).logConnectionState(ConnectionState.DISCONNECTED);
+        assertFalse(mClientManager.getAllSubscribers().contains(subscriberClient));
+        assertEquals(UNKNOWN_PACKAGE, mClientManager.getPackageName(subscriberClient));
+    }
+
+    @Test
+    public void testOnHalClientDisconnected_NotConnected() {
+        mClientManager.onHalDisconnected();
+        verify(mPublisherService, never()).onClientDisconnected(eq(HAL_CLIENT_NAME));
+        assertTrue(mClientManager.getAllSubscribers().isEmpty());
+    }
+
     private void resetContext() {
-        reset(mContext);
+        reset(mContext, mSystemClientLog, mUserClientLog);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.bindServiceAsUser(any(), any(), anyInt(), any(), any())).thenReturn(true);
         when(mContext.getResources()).thenReturn(mResources);
@@ -653,22 +1034,31 @@
         mClientManager.mSystemUserUnlockedListener.run();
     }
 
-    private void notifyUserSwitched() {
-        mClientManager.mUserSwitchReceiver.onReceive(mContext,
-                new Intent(Intent.ACTION_USER_SWITCHED));
+    private void notifyUserSwitched(int foregroundUserId, boolean isForegroundUserUnlocked) {
+        when(mUserManager.isUserUnlockingOrUnlocked(foregroundUserId))
+                .thenReturn(isForegroundUserUnlocked);
+        mForegroundUserId = foregroundUserId; // Member variable used by verifyUserBind()
+        mClientManager.mUserCallback.onSwitchUser(foregroundUserId);
     }
 
-    private void notifyUserUnlocked() {
-        mClientManager.mUserSwitchReceiver.onReceive(mContext,
-                new Intent(Intent.ACTION_USER_UNLOCKED));
+    private void notifyUserUnlocked(int foregroundUserId, boolean isForegroundUserUnlocked) {
+        when(mUserManager.isUserUnlockingOrUnlocked(foregroundUserId))
+                .thenReturn(isForegroundUserUnlocked);
+        mClientManager.mUserCallback.onUserLockChanged(foregroundUserId, isForegroundUserUnlocked);
     }
 
     private void verifySystemBind(int times) {
+        verify(mSystemClientLog, times(times)).logConnectionState(ConnectionState.CONNECTING);
         verifyBind(times, SYSTEM_CLIENT_COMPONENT, UserHandle.SYSTEM);
     }
 
     private void verifyUserBind(int times) {
-        verifyBind(times, USER_CLIENT_COMPONENT, UserHandle.of(mUserId));
+        if (mForegroundUserId == USER_ID) {
+            verify(mUserClientLog, times(times)).logConnectionState(ConnectionState.CONNECTING);
+        } else if (mForegroundUserId == USER_ID_U11) {
+            verify(mUserClientLog2, times(times)).logConnectionState(ConnectionState.CONNECTING);
+        }
+        verifyBind(times, USER_CLIENT_COMPONENT, UserHandle.of(mForegroundUserId));
     }
 
     private void verifyBind(int times, ComponentName componentName, UserHandle user) {
@@ -679,4 +1069,48 @@
                 mConnectionCaptor.capture(),
                 eq(Context.BIND_AUTO_CREATE), any(Handler.class), eq(user));
     }
+
+    private void verifyAndRunRebindTask() {
+        verify(mHandler).postDelayed(mRebindCaptor.capture(), eq(MILLIS_BEFORE_REBIND));
+        mRebindCaptor.getValue().run();
+    }
+
+    private void verifyOnClientConnected(String publisherName, IBinder binder) {
+        ArgumentCaptor<IVmsPublisherClient> clientCaptor =
+                ArgumentCaptor.forClass(IVmsPublisherClient.class);
+        verify(mPublisherService).onClientConnected(eq(publisherName), clientCaptor.capture());
+        assertSame(binder, clientCaptor.getValue().asBinder());
+    }
+
+    private IBinder createPublisherBinder() {
+        return createPublisherClient().asBinder();
+    }
+
+    private IVmsPublisherClient createPublisherClient() {
+        return new IVmsPublisherClient.Stub() {
+            @Override
+            public void setVmsPublisherService(IBinder token, IVmsPublisherService service) {
+                throw new RuntimeException("Unexpected call");
+            }
+
+            @Override
+            public void onVmsSubscriptionChange(VmsSubscriptionState subscriptionState) {
+                throw new RuntimeException("Unexpected call");
+            }
+        };
+    }
+
+    private IVmsSubscriberClient createSubscriberClient() {
+        return new IVmsSubscriberClient.Stub() {
+            @Override
+            public void onVmsMessageReceived(VmsLayer layer, byte[] payload) {
+                throw new RuntimeException("Unexpected call");
+            }
+
+            @Override
+            public void onLayersAvailabilityChanged(VmsAvailableLayers availableLayers) {
+                throw new RuntimeException("Unexpected call");
+            }
+        };
+    }
 }
diff --git a/tests/fixed_activity_mode_test/fixed_activity_mode_test.sh b/tests/fixed_activity_mode_test/fixed_activity_mode_test.sh
new file mode 100755
index 0000000..8beb1f4
--- /dev/null
+++ b/tests/fixed_activity_mode_test/fixed_activity_mode_test.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+if [ -z "$ANDROID_PRODUCT_OUT" ]; then
+    echo "ANDROID_PRODUCT_OUT not set"
+    exit
+fi
+DISP_ID=1
+if [[ $# -eq 1 ]]; then
+  echo "$1"
+  DISP_ID=$1
+fi
+echo "Use display:$DISP_ID"
+
+adb root
+# Check always crashing one
+echo "Start AlwaysCrashingActivity in fixed mode"
+adb shell dumpsys car_service start-fixed-activity-mode $DISP_ID com.google.android.car.kitchensink com.google.android.car.kitchensink.AlwaysCrashingActivity
+sleep 1
+read -p "AlwaysCrashingAvtivity should not be tried any more. Press Enter"
+# package update
+echo "Will try package update:"
+adb install -r -g $ANDROID_PRODUCT_OUT/system/priv-app/EmbeddedKitchenSinkApp/EmbeddedKitchenSinkApp.apk
+read -p "AlwaysCrashingAvtivity should have been retried. Press Enter"
+# suspend-resume
+echo "Check retry for suspend - resume"
+adb shell setprop android.car.garagemodeduration 1
+adb shell dumpsys car_service suspend
+adb shell dumpsys car_service resume
+read -p "AlwaysCrashingAvtivity should have been retried. Press Enter"
+# starting other Activity
+echo "Switch to no crash Activity"
+adb shell dumpsys car_service start-fixed-activity-mode $DISP_ID com.google.android.car.kitchensink com.google.android.car.kitchensink.NoCrashActivity
+read -p "NoCrashAvtivity should have been shown. Press Enter"
+# stating other non-fixed Activity
+adb shell am start-activity --display $DISP_ID -n com.google.android.car.kitchensink/.EmptyActivity
+read -p "NoCrashAvtivity should be shown after showing EmptyActivity. Press Enter"
+# package update
+echo "Will try package update:"
+adb install -r -g $ANDROID_PRODUCT_OUT/system/priv-app/EmbeddedKitchenSinkApp/EmbeddedKitchenSinkApp.apk
+read -p "NoCrashActivity should be shown. Press Enter"
+# stop the mode
+echo "Stop fixed activity mode"
+adb shell dumpsys car_service stop-fixed-activity-mode $DISP_ID
+adb shell am start-activity --display $DISP_ID -n com.google.android.car.kitchensink/.EmptyActivity
+read -p "EmptyActivity should be shown. Press Enter"
diff --git a/tools/perf/app-launch-test/app_launch_perf_test.sh b/tools/perf/app-launch-test/app_launch_perf_test.sh
new file mode 100755
index 0000000..df9ffea
--- /dev/null
+++ b/tools/perf/app-launch-test/app_launch_perf_test.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Analyze the output from Android Auto app launch test application.
+
+# ITERATION_COUNT decides how many times the test is repeated.
+readonly ITERATION_COUNT=2
+# SCALE decides the precision of fractional part in bc.
+readonly SCALE=9
+
+####################################################
+# Calculate arithmetic mean and standard deviation.
+# Globals:
+#   None
+# Arguments:
+#   A sequence of numbers
+# Returns:
+#   Count, average and stddev in space-saparated string
+####################################################
+function calc_stat() {
+  local sum=0
+  local count=0
+  local mean=0
+  local diff_sqrd_sum=0
+  local stddev=0
+
+  # Calculate the mean.
+  for val in "$@"; do
+    sum=$(echo "scale=${SCALE};${sum} + ${val}" | bc)
+    ((count++))
+  done
+  mean=$(echo "scale=${SCALE};${sum} / ${count}" | bc)
+
+  # Calculate standard deviation.
+  for val in "$@"; do
+    diff_sqrd_sum=$(echo "scale=${SCALE};${diff_sqrd_sum} + (${mean} - ${val}) ^ 2" | bc)
+  done
+  stddev=$(echo "scale=${SCALE};sqrt(${diff_sqrd_sum} / ${count})" | bc)
+
+  echo "${count} ${mean} ${stddev}"
+}
+
+####################################################
+# Execute app launch performance test.
+# Globals:
+#   None
+# Arguments:
+#   Type of app launch, cold or hot
+#   Whether to press home button, boolean
+#   Whether to drop cache, boolean
+#   Whether to kill app, boolean
+# Outputs:
+#   Writes the analysis result to stdout
+####################################################
+function run_app_launch_test() {
+  local stat=
+  local package_pattern="INSTRUMENTATION_STATUS: $1_startup_([a-z]+(\.[a-z]+)+)=([0-9]+)"
+  local cmd="adb shell am instrument -w -r -e iterations ${ITERATION_COUNT}\
+    -e listener android.device.collectors.AppStartupListener\
+    -e class 'android.platform.test.scenario.dial.OpenAppMicrobenchmark,android.platform.test.scenario.googleplay.OpenAppMicrobenchmark,android.platform.test.scenario.maps.OpenAppMicrobenchmark,android.platform.test.scenario.radio.OpenAppMicrobenchmark,android.platform.test.scenario.settings.OpenAppMicrobenchmark'\
+    -e favor-shell-commands true -e log false -e suite-timeout_msec 36000000\
+    -e durationMs 30000 -e press-home $2 -e newRunListenerMode true\
+    -e timeout_msec 300000 -e drop-cache $3 -e kill-app $4 android.platform.test.scenario/android.support.test.runner.AndroidJUnitRunner"
+  # Example output from ${cmd}
+  #
+  #   INSTRUMENTATION_STATUS: class=android.platform.test.scenario.maps.OpenAppMicrobenchmark
+  #   INSTRUMENTATION_STATUS: current=1
+  #   INSTRUMENTATION_STATUS: id=AndroidJUnitRunner
+  #   INSTRUMENTATION_STATUS: numtests=25
+  #   INSTRUMENTATION_STATUS: stream=
+  #   android.platform.test.scenario.maps.OpenAppMicrobenchmark:
+  #   INSTRUMENTATION_STATUS: test=testOpen
+  #   INSTRUMENTATION_STATUS_CODE: 1
+  #   INSTRUMENTATION_STATUS: cold_startup_com.google.android.apps.maps=2286
+  #   INSTRUMENTATION_STATUS: cold_startup_count_com.google.android.apps.maps=1
+  #   INSTRUMENTATION_STATUS: cold_startup_total_count=1
+  #   INSTRUMENTATION_STATUS_CODE: 2
+  #   INSTRUMENTATION_STATUS: class=android.platform.test.scenario.maps.OpenAppMicrobenchmark
+  #   INSTRUMENTATION_STATUS: current=1
+  #   INSTRUMENTATION_STATUS: id=AndroidJUnitRunner
+  #   INSTRUMENTATION_STATUS: numtests=25
+  #   INSTRUMENTATION_STATUS: stream=.
+  #   INSTRUMENTATION_STATUS: test=testOpen
+  #   INSTRUMENTATION_STATUS_CODE: 0
+
+  declare -A app_launch_map
+  printf "Testing $1 start performance....\n"
+
+  while IFS= read -r line; do
+    if [[ ${line} =~ ${package_pattern} ]]; then
+      APP_PACKAGE="${BASH_REMATCH[1]}"
+      LAUNCH_TIME=${BASH_REMATCH[3]}
+      app_launch_map[${APP_PACKAGE}]+="${LAUNCH_TIME} "
+    fi
+  done < <(${cmd})
+
+  for key in "${!app_launch_map[@]}"; do
+    stat=($(calc_stat ${app_launch_map[${key}]}))
+    printf "[${key}]\n"
+    printf "  Count: ${stat[0]}\n"
+    printf "  Average: ${stat[1]}\n"
+    printf "  StdDev: ${stat[2]}\n"
+    printf "\n"
+  done
+}
+
+# We test two types of app launch performance: cold and hot.
+# Cold start is to launch an app without cache support as if it is executed for the first time.
+# Hot start is to make an app go into the foreground while the app is running in the background.
+run_app_launch_test cold false true true
+echo ""
+run_app_launch_test hot true false false
diff --git a/tools/perf/janky-frame-test/janky-frame-test.sh b/tools/perf/janky-frame-test/janky-frame-test.sh
new file mode 100755
index 0000000..e4f4652
--- /dev/null
+++ b/tools/perf/janky-frame-test/janky-frame-test.sh
@@ -0,0 +1,140 @@
+#!/bin/bash
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Analyze dumpsys output and show the janky frame count.
+
+readonly NON_MAP_ACTIVITY=com.android.car.carlauncher/.AppGridActivity
+readonly MAP_PACKAGE=com.google.android.apps.maps
+readonly MAP_ACTIVITY=${MAP_PACKAGE}/com.google.android.maps.MapsActivity
+readonly CAR_ACTIVITY=com.android.car.carlauncher/.CarLauncher
+
+####################################################
+# Analyze dumpsys and returns total/janky frame counts.
+# Globals:
+#   None
+# Arguments:
+#   PID of map activity of interest
+# Returns:
+#   Total and janky frame count in space-saparated string
+####################################################
+function retrieve_frame() {
+  local start_pattern="Graphics info for pid ([0-9]+)"
+  local start_pattern_found=false
+  local total_frame_pattern="Total frames rendered: ([0-9]+)"
+  local janky_frame_pattern="Janky frames: ([0-9]+)"
+  local total_frame=0
+  local janky_frame=0
+
+  while IFS= read -r line; do
+    # Maps runs under two different users (u0 and u10).
+    # To get information about the map under the user of interest,
+    # the PID is extracted and compared.
+    if [[ ${line} =~ ${start_pattern} ]]; then
+      if [ ${BASH_REMATCH[1]} = "$1" ]; then
+        start_pattern_found=true
+      else
+        start_pattern_found=false
+      fi
+    fi
+    if [[ ${start_pattern_found} = "true" ]]; then
+      if [[ ${line} =~ ${total_frame_pattern} ]]; then
+        total_frame=${BASH_REMATCH[1]}
+      fi
+      if [[ ${line} =~ ${janky_frame_pattern} ]]; then
+        janky_frame=${BASH_REMATCH[1]}
+      fi
+    fi
+  done < <(adb shell dumpsys gfxinfo ${MAP_PACKAGE})
+
+  echo "${total_frame} ${janky_frame}"
+}
+
+echo "Testing...."
+
+# Launch full-screen map.
+# Starting full-screen map directly doesn't work due to some reasons.
+# We need to kill the map when no map is shown and re-start map activity.
+adb shell am start -n ${NON_MAP_ACTIVITY} &> /dev/null
+# Wait until non-map activity is fully started.
+sleep 2
+adb shell am force-stop ${MAP_PACKAGE} &> /dev/null
+adb shell am start -n ${MAP_ACTIVITY} &> /dev/null
+# Wait until map activity is fully started.
+sleep 7
+
+# Get PID of map under user 10.
+readonly PS_INFO=($(adb shell ps -ef | fgrep ${MAP_PACKAGE} | fgrep u10))
+readonly MAP_PID=${PS_INFO[1]}
+
+if [[ -z ${MAP_PID} ]]; then
+  echo "Map is not found. Test terminates."
+  exit 1
+fi
+
+RET_VAL=($(retrieve_frame ${MAP_PID}))
+readonly OLD_TOTAL_FRAME=${RET_VAL[0]}
+readonly OLD_JANKY_FRAME=${RET_VAL[1]}
+
+# Get screen size.
+readonly SIZE_PATTERN="Physical size: ([0-9]+)x([0-9]+)"
+readonly WM_SIZE=$(adb shell wm size)
+if [[ ${WM_SIZE} =~ ${SIZE_PATTERN} ]]; then
+  SCREEN_WIDTH=${BASH_REMATCH[1]}
+  SCREEN_HEIGHT=${BASH_REMATCH[2]}
+else
+  echo "Test terminates due to failing to get screen size."
+  exit 1
+fi
+
+readonly LEFT_POS=$(awk -v width=${SCREEN_WIDTH} 'BEGIN {printf "%d", width * 0.2}')
+readonly RIGHT_POS=$(awk -v width=${SCREEN_WIDTH} 'BEGIN {printf "%d", width * 0.8}')
+readonly VERTICAL_MID_POS=$(awk -v height=${SCREEN_HEIGHT} 'BEGIN {printf "%d", height * 0.5}')
+readonly SWIPE_DURATION=100
+
+# Send input signal to scroll map.
+COUNTER=0
+while [[ $COUNTER -lt 10 ]]; do
+  adb shell input swipe ${LEFT_POS} ${VERTICAL_MID_POS} ${RIGHT_POS} ${VERTICAL_MID_POS} ${SWIPE_DURATION}
+  sleep 0.5
+  ((COUNTER++))
+done
+
+COUNTER=0
+while [[ $COUNTER -lt 10 ]]; do
+  adb shell input swipe ${RIGHT_POS} ${VERTICAL_MID_POS} ${LEFT_POS} ${VERTICAL_MID_POS} ${SWIPE_DURATION}
+  sleep 0.5
+  ((COUNTER++))
+done
+
+# Make sure that map drawing is finished.
+sleep 3
+
+RET_VAL=($(retrieve_frame ${MAP_PID}))
+readonly CUR_TOTAL_FRAME=${RET_VAL[0]}
+readonly CUR_JANKY_FRAME=${RET_VAL[1]}
+
+if [[ ${CUR_TOTAL_FRAME} = ${OLD_TOTAL_FRAME} ]]; then
+  echo "Map has not been updated. Test failed."
+  exit 1
+fi
+
+readonly TOTAL_COUNT=$((CUR_TOTAL_FRAME - OLD_TOTAL_FRAME))
+readonly JANKY_COUNT=$((CUR_JANKY_FRAME - OLD_JANKY_FRAME))
+
+echo "Janky frame count: ${JANKY_COUNT} out of ${TOTAL_COUNT}"
+
+# Let car launcher take the screen.
+adb shell am start -n ${CAR_ACTIVITY} &> /dev/null
diff --git a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
index 0745945..2a992cf 100644
--- a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
@@ -231,17 +231,15 @@
      */
     @SystemApi
     public int getInitialUser() {
-        List<Integer> allUsers = userInfoListToUserIdList(getAllPersistentUsers());
+        List<Integer> allUsers = userInfoListToUserIdList(getAllUsers());
 
         int bootUserOverride = mTestableFrameworkWrapper.getBootUserOverrideId(BOOT_USER_NOT_FOUND);
 
         // If an override user is present and a real user, return it
         if (bootUserOverride != BOOT_USER_NOT_FOUND
                 && allUsers.contains(bootUserOverride)) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Boot user id override found for initial user, user id: "
-                        + bootUserOverride);
-            }
+            Log.i(TAG, "Boot user id override found for initial user, user id: "
+                    + bootUserOverride);
             return bootUserOverride;
         }
 
@@ -249,19 +247,15 @@
         int lastActiveUser = getLastActiveUser();
         if (lastActiveUser != UserHandle.USER_SYSTEM
                 && allUsers.contains(lastActiveUser)) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "Last active user loaded for initial user, user id: "
-                        + lastActiveUser);
-            }
+            Log.i(TAG, "Last active user loaded for initial user, user id: "
+                    + lastActiveUser);
             return lastActiveUser;
         }
 
         // If all else fails, return the smallest user id
         int returnId = Collections.min(allUsers);
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, "Saved ids were invalid. Returning smallest user id, user id: "
-                    + returnId);
-        }
+        Log.i(TAG, "Saved ids were invalid. Returning smallest user id, user id: "
+                + returnId);
         return returnId;
     }