Merge branch android10-qpr3-release

Change-Id: I13c0a98889c16e390719b1454c3403ab2727c483
diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index c88ffdb..912944c 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -79,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-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 aa2a607..086e5c8 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -56,6 +56,7 @@
 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;
@@ -1250,12 +1251,19 @@
             return;
         } else if (mContext instanceof Service) {
             Service service = (Service) mContext;
-            throw new IllegalStateException("Car service has crashed, client not handle it:"
-                    + service.getPackageName() + "," + service.getClass().getSimpleName(),
-                    mConstructionStack);
+            killClient(service.getPackageName() + "," + service.getClass().getSimpleName());
+        } else {
+            killClient(/* clientInfo= */ null);
         }
-        throw new IllegalStateException("Car service crashed, client not handling it.",
+    }
+
+    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 */
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 be194b8..1557e6e 100644
--- a/car-lib/src/android/car/drivingstate/CarUxRestrictionsManager.java
+++ b/car-lib/src/android/car/drivingstate/CarUxRestrictionsManager.java
@@ -16,7 +16,6 @@
 
 package android.car.drivingstate;
 
-import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
@@ -32,11 +31,10 @@
 
 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
@@ -53,31 +51,7 @@
      *
      * @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;
-
-    /** @hide */
-    @IntDef(prefix = { "UX_RESTRICTION_MODE_" }, value = {
-            UX_RESTRICTION_MODE_BASELINE,
-            UX_RESTRICTION_MODE_PASSENGER
-    })
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface UxRestrictionMode {}
+    public static final String UX_RESTRICTION_MODE_BASELINE = "baseline";
 
     private int mDisplayId = Display.INVALID_DISPLAY;
     private final ICarUxRestrictionsManager mUxRService;
@@ -187,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)
@@ -225,10 +198,22 @@
     /**
      * 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) {
@@ -239,11 +224,16 @@
     /**
      * 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) {
@@ -259,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)
@@ -278,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
@@ -295,7 +283,6 @@
      * Gets the current configurations.
      *
      * @return current configurations that is in effect.
-     *
      * @hide
      */
     @RequiresPermission(value = Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION)
@@ -308,20 +295,6 @@
     }
 
     /**
-     * @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);
-        }
-    }
-
-    /**
      * Class that implements the listener interface and gets called back from the
      * {@link com.android.car.CarDrivingStateService} across the binder interface.
      */
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/property/CarPropertyManager.java b/car-lib/src/android/car/hardware/property/CarPropertyManager.java
index e3651da..be4766b 100644
--- a/car-lib/src/android/car/hardware/property/CarPropertyManager.java
+++ b/car-lib/src/android/car/hardware/property/CarPropertyManager.java
@@ -538,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());
@@ -550,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/settings/CarSettings.java b/car-lib/src/android/car/settings/CarSettings.java
index d81b7ad..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";
     }
 
     /**
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-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_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/overlay/frameworks/base/core/res/res/values/config.xml
index 1d5fd14..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>
 
@@ -97,4 +96,6 @@
     <!-- 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/packages/CarSystemUI/res/values/config.xml b/car_product/overlay/frameworks/base/packages/CarSystemUI/res/values/config.xml
index 7fd5d38..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
@@ -115,6 +115,7 @@
         <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/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/test/kitchensink_app.te b/car_product/sepolicy/test/kitchensink_app.te
index fc0d7e6..dcdb1e4 100644
--- a/car_product/sepolicy/test/kitchensink_app.te
+++ b/car_product/sepolicy/test/kitchensink_app.te
@@ -27,6 +27,7 @@
     power_service
     sensorservice_service
     surfaceflinger_service
+    telecom_service
     uimode_service
     wifi_service
 }:service_manager find;
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index e2db410..59ce65d 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -546,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 7a4eee1..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>
@@ -126,4 +128,5 @@
     <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 5d6ec14..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>
@@ -126,4 +128,5 @@
     <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 5e2eac6..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>
@@ -126,4 +128,5 @@
     <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 350c318..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>
@@ -126,4 +128,5 @@
     <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 d52d15d..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>
@@ -126,4 +128,5 @@
     <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 d70056a..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>
@@ -126,4 +128,5 @@
     <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 08f699b..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>
@@ -126,4 +128,5 @@
     <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 5bf284f..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>
@@ -126,4 +128,5 @@
     <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 d64120c..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>
@@ -126,4 +128,5 @@
     <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 4277d9b..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>
@@ -126,4 +128,5 @@
     <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 9b2ec4f..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,7 +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 prova del cotxe"</string>
-    <string name="car_permission_desc_car_test_service" msgid="7426844534110145843">"Controla el mode de prova del cotxe"</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 6a2f1a4..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>
@@ -126,4 +128,5 @@
     <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 3a94d5a..045fb09 100644
--- a/service/res/values-da/strings.xml
+++ b/service/res/values-da/strings.xml
@@ -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>
@@ -126,4 +128,5 @@
     <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 796dd17..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>
@@ -126,4 +128,5 @@
     <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 93fdcf0..0a61aff 100644
--- a/service/res/values-el/strings.xml
+++ b/service/res/values-el/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>
@@ -126,4 +128,5 @@
     <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 58b38f6..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>
@@ -126,4 +128,5 @@
     <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 58b38f6..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>
@@ -126,4 +128,5 @@
     <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 58b38f6..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>
@@ -126,4 +128,5 @@
     <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 58b38f6..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>
@@ -126,4 +128,5 @@
     <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 8c9e131..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>
@@ -126,4 +128,5 @@
     <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 ff328e3..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>
@@ -126,4 +128,5 @@
     <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 6c8b42d..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>
@@ -126,4 +128,5 @@
     <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 36eea91..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>
@@ -126,4 +128,5 @@
     <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 4d10a58..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>
@@ -126,4 +128,5 @@
     <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 a736960..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>
@@ -126,4 +128,5 @@
     <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 7d67b4f..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>
@@ -126,4 +128,5 @@
     <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 7c6f0fb..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>
@@ -126,4 +128,5 @@
     <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 3c181ef..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>
@@ -126,4 +128,5 @@
     <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 7feaf3a..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>
@@ -126,4 +128,5 @@
     <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 df9d99b..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>
@@ -126,4 +128,5 @@
     <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 081d940..4352d7d 100644
--- a/service/res/values-hi/strings.xml
+++ b/service/res/values-hi/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>
@@ -126,4 +128,5 @@
     <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 207d925..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>
@@ -126,4 +128,5 @@
     <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 34eb972..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>
@@ -126,4 +128,5 @@
     <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 d591c85..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>
@@ -126,4 +128,5 @@
     <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 8794814..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>
@@ -126,4 +128,5 @@
     <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 6bd0672..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>
@@ -126,4 +128,5 @@
     <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 1dda293..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\'auto"</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>
@@ -126,4 +128,5 @@
     <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 8d3910e..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>
@@ -126,4 +128,5 @@
     <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 63ae60e..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>
@@ -126,4 +128,5 @@
     <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 1011a28..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>
@@ -126,4 +128,5 @@
     <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 1389760..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>
@@ -126,4 +128,5 @@
     <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 89710f0..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>
@@ -126,4 +128,5 @@
     <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 7c094ba..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>
@@ -126,4 +128,5 @@
     <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 f29464e..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>
@@ -126,4 +128,5 @@
     <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 4be6876..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>
@@ -126,4 +128,5 @@
     <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 06f8641..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>
@@ -126,4 +128,5 @@
     <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 5dc7ef2..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>
@@ -126,4 +128,5 @@
     <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 a05caca..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>
@@ -126,4 +128,5 @@
     <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 43e6bc8..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>
@@ -126,4 +128,5 @@
     <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 3324957..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>
@@ -126,4 +128,5 @@
     <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 4328cde..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>
@@ -126,4 +128,5 @@
     <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 d68519c..b04502c 100644
--- a/service/res/values-mr/strings.xml
+++ b/service/res/values-mr/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>
@@ -126,4 +128,5 @@
     <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 72f33aa..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>
@@ -126,4 +128,5 @@
     <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 3ae8e76..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>
@@ -126,4 +128,5 @@
     <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 b2baf19..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>
@@ -126,4 +128,5 @@
     <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 fd02e94..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>
@@ -126,4 +128,5 @@
     <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 dd08c12..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>
@@ -126,4 +128,5 @@
     <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 3ba7710..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>
@@ -126,4 +128,5 @@
     <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 371cbb1..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>
@@ -126,4 +128,5 @@
     <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 4404c81..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>
@@ -126,4 +128,5 @@
     <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 f0fbbb4..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>
@@ -126,4 +128,5 @@
     <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 2a4144b..5688116 100644
--- a/service/res/values-pt/strings.xml
+++ b/service/res/values-pt/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">"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>
@@ -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>
@@ -126,4 +128,5 @@
     <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 8120ab0..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>
@@ -126,4 +128,5 @@
     <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 c099594..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>
@@ -126,4 +128,5 @@
     <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 3342d0e..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>
@@ -126,4 +128,5 @@
     <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 fd1bb36..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>
@@ -126,4 +128,5 @@
     <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 52cc97b..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>
@@ -126,4 +128,5 @@
     <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 98bef25..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>
@@ -126,4 +128,5 @@
     <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 4293559..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>
@@ -126,4 +128,5 @@
     <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 059bbde..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>
@@ -126,4 +128,5 @@
     <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 e050923..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>
@@ -126,4 +128,5 @@
     <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 6544611..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>
@@ -126,4 +128,5 @@
     <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 389d2e9..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>
@@ -126,4 +128,5 @@
     <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 f82fce0..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>
@@ -126,4 +128,5 @@
     <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 5a198b5..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>
@@ -126,4 +128,5 @@
     <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 d2eb5ab..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>
@@ -126,4 +128,5 @@
     <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 42e7732..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>
@@ -126,4 +128,5 @@
     <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 df438b8..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>
@@ -126,4 +128,5 @@
     <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 eaaa1a7..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>
@@ -126,4 +128,5 @@
     <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 e6a4b55..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>
@@ -126,4 +128,5 @@
     <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 6543fe5..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>
@@ -126,4 +128,5 @@
     <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 84866f3..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>
@@ -126,4 +128,5 @@
     <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 6f07e95..62239ae 100644
--- a/service/res/values-zh-rTW/strings.xml
+++ b/service/res/values-zh-rTW/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>
@@ -126,4 +128,5 @@
     <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 32a7653..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>
@@ -126,4 +128,5 @@
     <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 56a12a5..afd8555 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -237,7 +237,8 @@
          There are 3 supported configurations:
          0 - never play on change
          1 - always play
-         2 - adaptive, play based on last remembered playback state -->
+         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>
@@ -245,4 +246,12 @@
     <!-- 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 1589180..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>
 
@@ -267,4 +271,7 @@
     <!-- 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/CarBluetoothService.java b/service/src/com/android/car/CarBluetoothService.java
index 54d15a1..92f79ed 100644
--- a/service/src/com/android/car/CarBluetoothService.java
+++ b/service/src/com/android/car/CarBluetoothService.java
@@ -222,6 +222,8 @@
                 } 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());
                 }
             }
         }
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/CarMediaService.java b/service/src/com/android/car/CarMediaService.java
index f3c9b79..9f57179 100644
--- a/service/src/com/android/car/CarMediaService.java
+++ b/service/src/com/android/car/CarMediaService.java
@@ -82,8 +82,10 @@
     // 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 last stored playback state to determine whether to resume playback
-    private static final int AUTOPLAY_CONFIG_ADAPTIVE = 2;
+    // 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;
@@ -98,6 +100,7 @@
     private SessionChangedListener mSessionsListener;
     private int mPlayOnMediaSourceChangedConfig;
     private int mPlayOnBootConfig;
+    private int mCurrentPlaybackState;
 
     private boolean mPendingInit;
     private int mCurrentUser;
@@ -527,8 +530,6 @@
         mActiveUserMediaController = null;
         mPreviousMediaComponent = mPrimaryMediaComponent;
         mPrimaryMediaComponent = componentName;
-        updateActiveMediaController(mMediaSessionManager
-                .getActiveSessionsForUser(null, ActivityManager.getCurrentUser()));
 
         if (mPrimaryMediaComponent != null && !TextUtils.isEmpty(
                 mPrimaryMediaComponent.flattenToString())) {
@@ -542,6 +543,12 @@
 
         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()));
     }
 
     private void notifyListeners() {
@@ -718,6 +725,7 @@
             return;
         }
         int state = playbackState != null ? playbackState.getState() : PlaybackState.STATE_NONE;
+        mCurrentPlaybackState = state;
         String key = getPlaybackStateKey();
         mSharedPrefs.edit().putInt(key, state).apply();
     }
@@ -768,12 +776,14 @@
                 return false;
             case AUTOPLAY_CONFIG_ALWAYS:
                 return true;
-            case AUTOPLAY_CONFIG_ADAPTIVE:
+            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;
diff --git a/service/src/com/android/car/CarPowerManagementService.java b/service/src/com/android/car/CarPowerManagementService.java
index a1f067b..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;
@@ -100,8 +112,12 @@
     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;
@@ -128,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,
@@ -144,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
@@ -170,6 +183,13 @@
         }
     }
 
+    @VisibleForTesting
+    protected HandlerThread getHandlerThread() {
+        synchronized (mLock) {
+            return mHandlerThread;
+        }
+    }
+
     @Override
     public void init() {
         synchronized (mLock) {
@@ -219,7 +239,10 @@
         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
@@ -233,10 +256,13 @@
     }
 
     @VisibleForTesting
-    protected void clearIsBootingOrResuming() {
+    void setStateForTesting(boolean isBooting, boolean isResuming) {
         synchronized (mLock) {
-            mIsBooting = false;
-            mIsResuming = false;
+            Log.d(CarLog.TAG_POWER, "setStateForTesting():"
+                    + " booting(" + mIsBooting + ">" + isBooting + ")"
+                    + " resuming(" + mIsResuming + ">" + isResuming + ")");
+            mIsBooting = isBooting;
+            mIsResuming = isResuming;
         }
     }
 
@@ -320,7 +346,33 @@
         }
     }
 
+    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() {
+        // 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.
@@ -332,10 +384,9 @@
                 mIsBooting = false;
                 mIsResuming = false;
                 Log.i(CarLog.TAG_POWER, "User switch disallowed while booting");
-            } else if (mIsResuming) {
+            } else {
                 // The system is resuming after a suspension. Optionally disable user switching.
-                allowUserSwitch = !mContext.getResources()
-                        .getBoolean(R.bool.config_disableUserSwitchDuringResume);
+                allowUserSwitch = !mDisableUserSwitchDuringResume;
                 mIsBooting = false;
                 mIsResuming = false;
                 if (!allowUserSwitch) {
@@ -344,17 +395,110 @@
             }
         }
 
-        if (allowUserSwitch) {
-            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);
-            }
-        }
         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) {
@@ -415,8 +559,21 @@
             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
@@ -993,18 +1150,23 @@
     }
 
     /**
-     * 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() {
+    @VisibleForTesting
+    void forceSuspendAndMaybeReboot(boolean shouldReboot) {
         synchronized (mSimulationWaitObject) {
             mInSimulatedDeepSleepMode = true;
             mWakeFromSimulatedSleep = false;
         }
         PowerHandler handler;
         synchronized (mLock) {
+            mRebootAfterGarageMode = shouldReboot;
             mPendingPowerStates.addFirst(new CpmsState(CpmsState.SIMULATE_SLEEP,
                                                        CarPowerStateListener.SHUTDOWN_PREPARE));
             handler = mHandler;
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 bb49ff2..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;
@@ -70,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;
@@ -78,6 +82,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -86,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.
@@ -104,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
@@ -127,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")
@@ -183,8 +198,7 @@
      *
      * <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>
@@ -434,24 +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) {
+    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 == mode) {
+        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());
@@ -459,8 +473,8 @@
     }
 
     @Override
-    @CarUxRestrictionsManager.UxRestrictionMode
-    public synchronized int getRestrictionMode() {
+    @NonNull
+    public synchronized String getRestrictionMode() {
         ICarImpl.assertPermission(mContext, Car.PERMISSION_CAR_UX_RESTRICTIONS_CONFIGURATION);
 
         return mRestrictionMode;
@@ -483,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);
@@ -504,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);
@@ -520,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.
@@ -940,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 0c50da9..483dd7f 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -35,15 +35,18 @@
 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;
@@ -185,6 +188,7 @@
         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);
@@ -556,6 +560,7 @@
         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";
@@ -564,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) {
@@ -578,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]");
@@ -605,6 +612,12 @@
             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) {
@@ -712,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:
@@ -737,6 +750,15 @@
                 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);
@@ -787,6 +809,60 @@
             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) {
@@ -833,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/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/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
index d3e3c6f..abb1eca 100644
--- a/service/src/com/android/car/am/FixedActivityService.java
+++ b/service/src/com/android/car/am/FixedActivityService.java
@@ -28,6 +28,7 @@
 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;
@@ -38,6 +39,7 @@
 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;
@@ -50,6 +52,8 @@
 
 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;
 
@@ -122,6 +126,8 @@
 
     private final IActivityManager mAm;
 
+    private final DisplayManager mDm;
+
     private final UserManager mUm;
 
     private final CarUserService.UserCallback mUserCallback = new CarUserService.UserCallback() {
@@ -240,6 +246,9 @@
             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")
@@ -262,6 +271,7 @@
         mContext = context;
         mAm = ActivityManager.getService();
         mUm = context.getSystemService(UserManager.class);
+        mDm = context.getSystemService(DisplayManager.class);
         mHandlerThread.start();
     }
 
@@ -377,8 +387,38 @@
                 }
                 return false;
             }
-            for (int i = 0; i < mRunningActivities.size(); i++) {
-                mRunningActivities.valueAt(i).isVisible = 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);
@@ -407,6 +447,7 @@
                     activityInfo.taskId = INVALID_TASK_ID;
                 }
             }
+
             for (int i = 0; i < mRunningActivities.size(); i++) {
                 RunningActivityInfo activityInfo = mRunningActivities.valueAt(i);
                 long timeSinceLastLaunchMs = now - activityInfo.lastLaunchTimeMs;
@@ -417,7 +458,6 @@
                     continue;
                 }
                 if (!isComponentAvailable(activityInfo.intent.getComponent(),
-                        activityInfo.userId) || !isUserAllowedToLaunchActivity(
                         activityInfo.userId)) {
                     continue;
                 }
@@ -556,6 +596,10 @@
         }
         boolean startMonitoringEvents = false;
         synchronized (mLock) {
+            Presentation p = mBlockingPresentations.removeReturnOld(displayId);
+            if (p != null) {
+                p.dismiss();
+            }
             if (mRunningActivities.size() == 0) {
                 startMonitoringEvents = true;
             }
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 35a9809..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,25 +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<>();
-        final List<JobSnapshot> allJobs = mJobScheduler.getAllJobSnapshots();
-        if (allJobs != null && startedJobs != null) {
-            for (JobSnapshot snap : allJobs) {
-                if (startedJobs.contains(snap.getJobInfo())
-                        && snap.getJobInfo().isRequireDeviceIdle()) {
-                    currentPendingJobs.add(snap.getJobInfo().toString());
-                    count++;
+        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/pm/ActivityBlockingActivity.java b/service/src/com/android/car/pm/ActivityBlockingActivity.java
index 9756523..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,26 +49,35 @@
     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.
@@ -110,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) {
@@ -137,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);
@@ -147,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) {
@@ -195,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
@@ -208,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/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/trust/CarBleTrustAgent.java b/service/src/com/android/car/trust/CarBleTrustAgent.java
index d3790ff..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)) {
diff --git a/service/src/com/android/car/user/CarUserNoticeService.java b/service/src/com/android/car/user/CarUserNoticeService.java
index 22640e2..045d960 100644
--- a/service/src/com/android/car/user/CarUserNoticeService.java
+++ b/service/src/com/android/car/user/CarUserNoticeService.java
@@ -102,6 +102,10 @@
     @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) {
@@ -214,6 +218,12 @@
         mServiceIntent.setComponent(ComponentName.unflattenFromString(componentName));
     }
 
+    public void ignoreUserNotice(int userId) {
+        synchronized (mLock) {
+            mIgnoreUserId = userId;
+        }
+    }
+
     private boolean checkKeyguardLockedWithPolling() {
         mMainHandler.removeCallbacks(mKeyguardPollingRunnable);
         IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
@@ -274,6 +284,11 @@
                 return;
             }
             userId = mUserId;
+            if (mIgnoreUserId == userId) {
+                return;
+            } else {
+                mIgnoreUserId = UserHandle.USER_NULL;
+            }
         }
         if (userId == UserHandle.USER_NULL) {
             return;
@@ -391,7 +406,8 @@
                     + ", mUiShown:" + mUiShown
                     + ", mServiceBound:" + mServiceBound
                     + ", mKeyguardPollingCounter:" + mKeyguardPollingCounter
-                    + " Setting enabled:" + isNoticeScreenEnabledInSetting(mUserId));
+                    + ", 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 90b5f1d..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);
             }
         }
diff --git a/tests/BugReportApp/AndroidManifest.xml b/tests/BugReportApp/AndroidManifest.xml
index d0b4cf3..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="11"
-          android:versionName="1.7.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"/>
diff --git a/tests/BugReportApp/README.md b/tests/BugReportApp/README.md
index 7ed9375..476efe4 100644
--- a/tests/BugReportApp/README.md
+++ b/tests/BugReportApp/README.md
@@ -44,7 +44,6 @@
 
 ### System Properties
 
-- `android.car.bugreport.enableautoupload` - please see Config#ENABLE_AUTO_UPLOAD to learn more.
 - `android.car.bugreport.force_enable` - set it `true` to enable bugreport app on **all builds**.
 
 ### Upload configuration
@@ -67,23 +66,28 @@
 
 ### 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/values-it/strings.xml b/tests/BugReportApp/res/values-it/strings.xml
index 2e283ad..3fdff3d 100644
--- a/tests/BugReportApp/res/values-it/strings.xml
+++ b/tests/BugReportApp/res/values-it/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="app_name" msgid="2596316479611335185">"BugReport"</string>
+    <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>
diff --git a/tests/BugReportApp/res/values-or/strings.xml b/tests/BugReportApp/res/values-or/strings.xml
index 93784d5..7b90a1b 100644
--- a/tests/BugReportApp/res/values-or/strings.xml
+++ b/tests/BugReportApp/res/values-or/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="app_name" msgid="2596316479611335185">"ବଗ୍ ରିପୋର୍ଟ୍ କରନ୍ତୁ"</string>
+    <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>
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 f63d937..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;
@@ -129,9 +130,8 @@
             holder.mMoveButton.setEnabled(false);
             holder.mMoveButton.setVisibility(View.GONE);
         }
-        // Always enable upload to GCS button, because the app is enabled only for userdebug,
-        // and sometimes Config might not be properly set.
-        if (enableUserActionButtons) {
+        // 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);
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 a66ce0f..20fe5f9 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportActivity.java
@@ -103,7 +103,10 @@
     private Button mSubmitButton;
 
     private boolean mBound;
+    /** Audio message recording process started (including waiting for permission). */
     private boolean mAudioRecordingStarted;
+    /** Audio recording using MIC is running (permission given). */
+    private boolean mAudioRecordingIsRunning;
     private boolean mIsNewBugReport;
     private boolean mIsOnActivityStartedWithBugReportServiceBoundCalled;
     private boolean mIsSubmitButtonClicked;
@@ -134,26 +137,6 @@
         }
     };
 
-    private final ServiceConnection mCarServiceConnection = 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);
-                // 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);
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-        }
-    };
-
     /**
      * Builds an intent that starts {@link BugReportActivity} to add audio message to the existing
      * bug report.
@@ -199,6 +182,7 @@
         }
         // Reset variables for the next onStart().
         mAudioRecordingStarted = false;
+        mAudioRecordingIsRunning = false;
         mIsSubmitButtonClicked = false;
         mIsOnActivityStartedWithBugReportServiceBoundCalled = false;
         mMetaBugReport = null;
@@ -223,6 +207,10 @@
     }
 
     private void onCarDrivingStateChanged(CarDrivingStateEvent event) {
+        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) {
@@ -256,8 +244,8 @@
         // We need to minimize system state change when performing SILENT bug report.
         mConfig = new Config();
         mConfig.start();
-        mCar = Car.createCar(this, mCarServiceConnection);
-        mCar.connect();
+        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);
@@ -283,6 +271,27 @@
         }
     }
 
+    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);
@@ -411,7 +420,10 @@
      * 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();
@@ -427,6 +439,7 @@
                 this, mMetaBugReport, Status.STATUS_USER_CANCELLED, "");
         Log.i(TAG, "Bug report " + mMetaBugReport.getTimestamp() + " is cancelled");
         mAudioRecordingStarted = false;
+        mAudioRecordingIsRunning = false;
     }
 
     private void buttonCancelClick(View view) {
@@ -507,8 +520,13 @@
                 + 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();
     }
 
@@ -550,6 +568,7 @@
 
         mRecorder.start();
         mVoiceRecordingView.setRecorder(mRecorder);
+        mAudioRecordingIsRunning = true;
 
         // Messages with token mRecorder are cleared when the activity finishes or recording stops.
         mHandler.postDelayed(() -> {
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 343a52d..5503706 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/BugReportInfoActivity.java
@@ -41,6 +41,7 @@
 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;
@@ -50,6 +51,9 @@
 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.
@@ -259,13 +263,7 @@
                 copyFileToUsb(
                         new File(mBugReport.getFilePath()).getName(), sourceUri, parentDocumentUri);
             } else {
-                Uri sourceBugReport = BugStorageProvider.buildUriWithSegment(
-                        mBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_BUGREPORT_FILE);
-                copyFileToUsb(
-                        mBugReport.getBugReportFileName(), sourceBugReport, parentDocumentUri);
-                Uri sourceAudio = BugStorageProvider.buildUriWithSegment(
-                        mBugReport.getId(), BugStorageProvider.URL_SEGMENT_OPEN_AUDIO_FILE);
-                copyFileToUsb(mBugReport.getAudioFileName(), sourceAudio, parentDocumentUri);
+                mergeFilesAndCopyToUsb(parentDocumentUri);
             }
             Log.d(TAG, "Deleting local bug report files.");
             BugStorageUtils.deleteBugReportFiles(mActivity, mBugReport.getId());
@@ -274,6 +272,45 @@
                     "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);
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 3f89660..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;
@@ -89,6 +93,9 @@
     // 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.
@@ -124,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);
 
@@ -143,7 +151,7 @@
      * finishes. We need to clear it otherwise when bugreport fails, it will show "bugreport start"
      * toast, which will confuse users.
      */
-    private Handler mHandlerToast;
+    private Handler mHandlerStartedToast;
 
     /** A listener that's notified when bugreport progress changes. */
     interface BugReportProgressListener {
@@ -196,16 +204,9 @@
                 NotificationManager.IMPORTANCE_HIGH));
         mSingleThreadExecutor = Executors.newSingleThreadScheduledExecutor();
         mHandler = new BugReportHandler();
-        mHandlerToast = new Handler();
+        mHandlerStartedToast = new Handler();
         mConfig = new Config();
         mConfig.start();
-        // Synchronously connect to the car service.
-        mCar = Car.createCar(this);
-        try {
-            mBugreportManager = (CarBugreportManager) mCar.getCarManager(Car.CAR_BUGREPORT_SERVICE);
-        } catch (CarNotConnectedException | NoClassDefFoundError e) {
-            throw new IllegalStateException("Failed to get CarBugreportManager.", e);
-        }
     }
 
     @Override
@@ -213,7 +214,7 @@
         if (DEBUG) {
             Log.d(TAG, "Service destroyed");
         }
-        mCar.disconnect();
+        disconnectFromCarService();
     }
 
     @Override
@@ -243,7 +244,7 @@
         collectBugReport();
 
         // Show a short lived "bugreport started" toast message after a short delay.
-        mHandlerToast.postDelayed(() -> {
+        mHandlerStartedToast.postDelayed(() -> {
             Toast.makeText(this,
                     getText(R.string.toast_bug_report_started), Toast.LENGTH_LONG).show();
         }, BUGREPORT_STARTED_TOAST_DELAY_MILLIS);
@@ -252,6 +253,24 @@
         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()) {
@@ -266,6 +285,7 @@
                 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)
@@ -305,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);
@@ -347,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);
         }
     }
 
@@ -363,22 +404,10 @@
         }
         mCallback = new CarBugreportManager.CarBugreportManagerCallback() {
             @Override
-            public void onError(int errorCode) {
+            public void onError(@CarBugreportErrorCode int errorCode) {
                 Log.e(TAG, "CarBugreportManager failed: " + errorCode);
-                // 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, "CarBugreportManager failed: " + errorCode);
-                mIsCollectingBugReport.set(false);
-                mHandler.post(() -> {
-                    mNotificationManager.cancel(BUGREPORT_IN_PROGRESS_NOTIF_ID);
-                    stopForeground(true);
-                });
-                mHandlerToast.removeCallbacksAndMessages(null);
+                disconnectFromCarService();
+                handleBugReportManagerError(errorCode);
             }
 
             @Override
@@ -390,14 +419,58 @@
             @Override
             public void onFinished() {
                 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 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}.
@@ -439,7 +512,6 @@
             File bugReportTempDir = FileUtils.createTempDir(this, mMetaBugReport.getTimestamp());
             zipDirectoryToOutputStream(bugReportTempDir,
                     BugStorageUtils.openBugReportFileToWrite(this, mMetaBugReport));
-            mIsCollectingBugReport.set(false);
         } catch (IOException e) {
             Log.e(TAG, "Failed to zip files", e);
             BugStorageUtils.setBugReportStatus(this, mMetaBugReport, Status.STATUS_WRITE_FAILED,
@@ -464,7 +536,9 @@
             mNotificationManager.cancel(BUGREPORT_IN_PROGRESS_NOTIF_ID);
             stopForeground(true);
         });
-        mHandlerToast.removeCallbacksAndMessages(null);
+        mHandlerStartedToast.removeCallbacksAndMessages(null);
+        mMetaBugReport = null;
+        mIsCollectingBugReport.set(false);
     }
 
     private void playNotificationSound() {
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java b/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
index 70f65bf..b253caf 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/Config.java
@@ -23,6 +23,8 @@
 
 import com.android.internal.annotations.GuardedBy;
 
+import com.google.common.collect.ImmutableSet;
+
 import java.io.PrintWriter;
 
 /**
@@ -40,8 +42,6 @@
 final class Config {
     private static final String TAG = Config.class.getSimpleName();
 
-    private static final String HAWK = "hawk";
-
     /**
      * Namespace for all Android Automotive related features.
      *
@@ -66,14 +66,12 @@
      */
     private static final String PROP_FORCE_ENABLE = "android.car.bugreport.force_enable";
 
-    /**
-     * Temporary flag to retain the old behavior.
-     *
-     * Default is {@code true}.
-     *
-     * TODO(b/143183993): Disable auto-upload to GCS after testing DeviceConfig.
+    /*
+     * 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 String ENABLE_AUTO_UPLOAD = "android.car.bugreport.enableautoupload";
+    private static final ImmutableSet<String> ENABLE_FORCE_UPLOAD_TO_GCS_FOR_DEVICES =
+            ImmutableSet.of("hawk");
 
     private final Object mLock = new Object();
 
@@ -99,10 +97,6 @@
 
     /** If new bugreports should be scheduled for uploading. */
     boolean getAutoUpload() {
-        if (isTempForceAutoUploadGcsEnabled()) {
-            Log.d(TAG, "Enabling auto-upload because ENABLE_AUTO_UPLOAD is true");
-            return true;
-        }
         // 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();
@@ -111,22 +105,17 @@
     /**
      * Returns {@link true} if bugreport upload destination is GCS.
      */
-    boolean isUploadDestinationGcs() {
+    private boolean isUploadDestinationGcs() {
         if (isTempForceAutoUploadGcsEnabled()) {
             Log.d(TAG, "Setting upload dest to GCS ENABLE_AUTO_UPLOAD is true");
             return true;
         }
-        // TODO(b/146214182): Enable uploading to GCS if the device is hawk.
-        if (HAWK.equals(Build.DEVICE) && Build.IS_DEBUGGABLE) {
-            return true;
-        }
-        // NOTE: enable it only for userdebug builds, unless it's force enabled using a system
-        //       property.
+        // NOTE: enable it only for userdebug/eng builds.
         return UPLOAD_DESTINATION_GCS.equals(getUploadDestination()) && Build.IS_DEBUGGABLE;
     }
 
     private static boolean isTempForceAutoUploadGcsEnabled() {
-        return SystemProperties.getBoolean(ENABLE_AUTO_UPLOAD, /* def= */ true);
+        return ENABLE_FORCE_UPLOAD_TO_GCS_FOR_DEVICES.contains(Build.DEVICE);
     }
 
     /**
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 32dc804..0e92010 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/SimpleUploaderAsyncTask.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/SimpleUploaderAsyncTask.java
@@ -124,6 +124,10 @@
         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);
diff --git a/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java b/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java
index e33b706..6c50d18 100644
--- a/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java
+++ b/tests/BugReportApp/src/com/google/android/car/bugreport/ZipUtils.java
@@ -75,7 +75,8 @@
         }
     }
 
-    private static void writeInputStreamToZipStream(
+    /** 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);
diff --git a/tests/BugReportApp/utils/bugreport_app_tester.py b/tests/BugReportApp/utils/bugreport_app_tester.py
index baf8ada..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.
 
@@ -349,7 +352,7 @@
             _bugreport_status_to_str(meta_bugreport.status))
 
   def _wait_for_bugreport_to_complete(self, bugreport_id):
-    """Waits until status changes to WRITE_PENDING.
+    """Waits until status changes to UPLOAD_PENDING.
 
     It means dumpstate (bugreport) is completed (or failed).
 
@@ -370,8 +373,7 @@
   def _wait_for_bugreport_to_upload(self, bugreport_id):
     """Waits bugreport to be uploaded and returns None if succeeds.
 
-    NOTE: If "android.car.bugreport.disableautoupload" system property is set,
-    the App will not upload.
+    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(
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/res/values-af/strings.xml b/tests/CarDeveloperOptions/res/values-af/strings.xml
index 04b260c..6b63259 100644
--- a/tests/CarDeveloperOptions/res/values-af/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-af/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-am/strings.xml
index 3cce2b5..8cc3ee5 100644
--- a/tests/CarDeveloperOptions/res/values-am/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-am/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-ar/strings.xml
index d4e022d..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>
@@ -363,7 +363,7 @@
     <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,9 +391,9 @@
     <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_what_to_show_category" msgid="3133378945821488654">"ما يتم عرضه"</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>
@@ -522,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>
@@ -537,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_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>
@@ -787,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>
@@ -806,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>
@@ -827,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>
@@ -840,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>
@@ -878,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>
@@ -896,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>
@@ -927,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>
@@ -950,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>
@@ -1042,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>
@@ -1126,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>
@@ -1137,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>
@@ -1172,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>
@@ -1187,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>
@@ -1265,7 +1265,7 @@
     <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>
@@ -1285,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>
@@ -1355,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>
@@ -1396,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>
@@ -1438,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>
@@ -1461,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>
@@ -1634,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>
@@ -1647,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>
@@ -1660,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>
@@ -1672,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>
@@ -1685,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>
@@ -1809,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>
@@ -1937,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>
@@ -2068,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>
@@ -2133,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>
@@ -2279,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>
@@ -2346,7 +2346,7 @@
     <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>
@@ -2356,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>
@@ -2366,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>
@@ -2577,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>
@@ -2597,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>
@@ -2643,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>
@@ -2698,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>
@@ -2742,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>
@@ -2769,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>
@@ -2813,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>
@@ -2864,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>
@@ -2913,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>
@@ -2933,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>
@@ -3054,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>
@@ -3076,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>
@@ -3226,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>
@@ -3239,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>
@@ -3328,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>
@@ -3388,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>
@@ -3633,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>
@@ -3716,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>
@@ -3742,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>
@@ -3898,8 +3898,8 @@
     <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="memory_settings_title" msgid="7867148522014070721">"الذاكرة"</string>
@@ -4018,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>
@@ -4119,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>
@@ -4212,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>
@@ -4243,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>
@@ -4257,7 +4257,7 @@
     <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>
-    <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>
@@ -4317,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>
@@ -4418,7 +4418,7 @@
     <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>
@@ -4474,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>
@@ -4542,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>
@@ -4578,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>
diff --git a/tests/CarDeveloperOptions/res/values-as/strings.xml b/tests/CarDeveloperOptions/res/values-as/strings.xml
index 4db912e..774a801 100644
--- a/tests/CarDeveloperOptions/res/values-as/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-as/strings.xml
@@ -2613,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>
@@ -4273,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/strings.xml b/tests/CarDeveloperOptions/res/values-az/strings.xml
index e590198..0011fd3 100644
--- a/tests/CarDeveloperOptions/res/values-az/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-az/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
index ed75885..be6b529 100644
--- a/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-b+sr+Latn/strings.xml
@@ -4350,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/strings.xml b/tests/CarDeveloperOptions/res/values-be/strings.xml
index a2be40b..74871d2 100644
--- a/tests/CarDeveloperOptions/res/values-be/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-be/strings.xml
@@ -4428,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/strings.xml b/tests/CarDeveloperOptions/res/values-bg/strings.xml
index 2ce7865..b34c516 100644
--- a/tests/CarDeveloperOptions/res/values-bg/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bg/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-bn/strings.xml
index 2895334..63d2cc7 100644
--- a/tests/CarDeveloperOptions/res/values-bn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bn/strings.xml
@@ -2614,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>
@@ -3628,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>
@@ -4262,7 +4262,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>
@@ -4274,6 +4274,8 @@
     <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/strings.xml b/tests/CarDeveloperOptions/res/values-bs/strings.xml
index ecd3eb3..ab18137 100644
--- a/tests/CarDeveloperOptions/res/values-bs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-bs/strings.xml
@@ -3640,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>
@@ -4350,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>
diff --git a/tests/CarDeveloperOptions/res/values-ca/strings.xml b/tests/CarDeveloperOptions/res/values-ca/strings.xml
index 5a02bd0..257d6b2 100644
--- a/tests/CarDeveloperOptions/res/values-ca/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ca/strings.xml
@@ -503,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>
@@ -644,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>
@@ -1147,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>
@@ -1241,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>
@@ -1642,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">
@@ -1769,13 +1769,13 @@
     <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>
@@ -1797,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>
@@ -1968,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>
@@ -2558,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>
@@ -2592,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>
@@ -2794,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>
@@ -2834,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">
@@ -2854,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>
@@ -2883,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>
@@ -3037,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>
@@ -3088,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>
@@ -3275,16 +3275,16 @@
     <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>
@@ -3315,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>
@@ -3356,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>
@@ -3555,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>
@@ -3792,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>
@@ -3853,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>
@@ -3875,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>
@@ -3894,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>
@@ -4076,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>
@@ -4192,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>
@@ -4204,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-cs/strings.xml
index 3cb50ee..d3caaf0 100644
--- a/tests/CarDeveloperOptions/res/values-cs/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-cs/strings.xml
@@ -4426,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>
diff --git a/tests/CarDeveloperOptions/res/values-da/strings.xml b/tests/CarDeveloperOptions/res/values-da/strings.xml
index 1f25a35..beadd32 100644
--- a/tests/CarDeveloperOptions/res/values-da/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-da/strings.xml
@@ -2329,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">
@@ -2413,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>
@@ -3705,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>
@@ -3788,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>
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-de/strings.xml b/tests/CarDeveloperOptions/res/values-de/strings.xml
index f709d1b..61c564f 100644
--- a/tests/CarDeveloperOptions/res/values-de/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-de/strings.xml
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-el/strings.xml b/tests/CarDeveloperOptions/res/values-el/strings.xml
index 9aedafe..0641a09 100644
--- a/tests/CarDeveloperOptions/res/values-el/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-el/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-en-rAU/strings.xml
index 43cac53..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>
@@ -1609,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>
@@ -1939,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>
@@ -3026,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>
@@ -3035,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>
@@ -4231,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-en-rCA/strings.xml
index c05e416..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>
@@ -1609,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>
@@ -1939,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>
@@ -3026,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>
@@ -3035,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>
@@ -4231,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-en-rGB/strings.xml
index 43cac53..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>
@@ -1609,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>
@@ -1939,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>
@@ -3026,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>
@@ -3035,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>
@@ -4231,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-en-rIN/strings.xml
index 43cac53..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>
@@ -1609,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>
@@ -1939,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>
@@ -3026,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>
@@ -3035,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>
@@ -4231,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>
@@ -4274,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-rUS/strings.xml b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
index 227b67d..215453a 100644
--- a/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-es-rUS/strings.xml
@@ -3797,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>
@@ -4136,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>
@@ -4272,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
index d728216..5b52eee 100644
--- a/tests/CarDeveloperOptions/res/values-es/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-es/arrays.xml
@@ -257,7 +257,7 @@
     <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 la alarma"</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>
@@ -324,7 +324,7 @@
     <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 la alarma"</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>
diff --git a/tests/CarDeveloperOptions/res/values-es/strings.xml b/tests/CarDeveloperOptions/res/values-es/strings.xml
index 6a02aa3..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>
@@ -535,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>
@@ -761,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>
@@ -880,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>
@@ -1067,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>
@@ -1125,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>
@@ -2486,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>
@@ -2528,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>
@@ -3132,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>
@@ -3292,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>
@@ -3637,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-et/strings.xml
index 104f04f..627f509 100644
--- a/tests/CarDeveloperOptions/res/values-et/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-et/strings.xml
@@ -1781,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>
@@ -1793,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>
@@ -2388,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>
@@ -4274,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/arrays.xml b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
index 7454bad..03259f7 100644
--- a/tests/CarDeveloperOptions/res/values-eu/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/arrays.xml
@@ -192,7 +192,7 @@
     <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="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>
diff --git a/tests/CarDeveloperOptions/res/values-eu/strings.xml b/tests/CarDeveloperOptions/res/values-eu/strings.xml
index 4cd4e91..f385ddf 100644
--- a/tests/CarDeveloperOptions/res/values-eu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-eu/strings.xml
@@ -93,14 +93,14 @@
     <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>
@@ -763,9 +763,9 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="423463405499392444">"Aukerak…"</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>
@@ -838,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>
@@ -888,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>
@@ -928,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>
@@ -958,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>
@@ -988,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>
@@ -1065,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>
@@ -1094,7 +1094,7 @@
   <string-array name="wifi_calling_mode_choices_v2">
     <item msgid="9149346657812979257">"Wifia"</item>
     <item msgid="4421333712484542489">"Datu-konexioa"</item>
-    <item msgid="6007360612667098926">"Wi-Fi sarea soilik"</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>
@@ -1788,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="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>
@@ -2047,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>
@@ -2156,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>
@@ -2392,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>
@@ -2547,7 +2547,7 @@
     <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_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>
@@ -2556,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>
@@ -2591,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>
@@ -2647,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>
@@ -2712,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>
@@ -3113,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>
@@ -3302,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>
@@ -3585,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>
@@ -3645,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>
@@ -4040,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>
@@ -4274,6 +4274,8 @@
     <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>
@@ -4326,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>
@@ -4451,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/arrays.xml b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
index 4ba291d..dd1ef51 100644
--- a/tests/CarDeveloperOptions/res/values-fa/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fa/arrays.xml
@@ -265,7 +265,7 @@
     <item msgid="1496205959751719491">"کنترل مکان پرقدرت"</item>
     <item msgid="3776296279910987380">"دریافت آمار استفاده"</item>
     <item msgid="8827100324471975602">"صدادار/بی‌صدا کردن میکروفن"</item>
-    <item msgid="6880736730520126864">"نمایش تست"</item>
+    <item msgid="6880736730520126864">"نمایش پنجره خبری"</item>
     <item msgid="4933375960222609935">"فرستادن رسانه"</item>
     <item msgid="8357907018938895462">"فعال کردن VPN"</item>
     <item msgid="8143812849911310973">"نوشتن تصویرزمینه"</item>
diff --git a/tests/CarDeveloperOptions/res/values-fa/strings.xml b/tests/CarDeveloperOptions/res/values-fa/strings.xml
index d4458e2..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>
@@ -509,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>
@@ -1439,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>
@@ -1461,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>
@@ -2503,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>
@@ -3368,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>
@@ -3799,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-fi/strings.xml
index fdea4a5..64e8db2 100644
--- a/tests/CarDeveloperOptions/res/values-fi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fi/strings.xml
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
index e2641e5..4f4a8c2 100644
--- a/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr-rCA/strings.xml
@@ -4274,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
index fb365ad..27ba552 100644
--- a/tests/CarDeveloperOptions/res/values-fr/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-fr/arrays.xml
@@ -256,7 +256,7 @@
     <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="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>
@@ -323,7 +323,7 @@
     <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 des contenus multimédias"</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>
diff --git a/tests/CarDeveloperOptions/res/values-fr/strings.xml b/tests/CarDeveloperOptions/res/values-fr/strings.xml
index 575356f..f243009 100644
--- a/tests/CarDeveloperOptions/res/values-fr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-fr/strings.xml
@@ -3129,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-gl/strings.xml
index 765ede2..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>
@@ -761,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>
@@ -830,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>
@@ -880,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>
@@ -890,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>
@@ -1319,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>
@@ -1368,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>
@@ -1452,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>
@@ -1460,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>
@@ -1568,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>
@@ -1856,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>
@@ -2536,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>
@@ -2617,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>
@@ -2866,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>
@@ -4275,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/strings.xml b/tests/CarDeveloperOptions/res/values-gu/strings.xml
index 0bb0d81..41d4146 100644
--- a/tests/CarDeveloperOptions/res/values-gu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-gu/strings.xml
@@ -2614,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-hi/strings.xml
index 9b508c1..b1c1375 100644
--- a/tests/CarDeveloperOptions/res/values-hi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hi/strings.xml
@@ -1067,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>
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-hr/strings.xml b/tests/CarDeveloperOptions/res/values-hr/strings.xml
index 03a2a51..a7eefb7 100644
--- a/tests/CarDeveloperOptions/res/values-hr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hr/strings.xml
@@ -4350,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/strings.xml b/tests/CarDeveloperOptions/res/values-hu/strings.xml
index ddc4db9..2e2b8de 100644
--- a/tests/CarDeveloperOptions/res/values-hu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hu/strings.xml
@@ -2909,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-hy/strings.xml
index 9cacd72..cb33ff1 100644
--- a/tests/CarDeveloperOptions/res/values-hy/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-hy/strings.xml
@@ -1385,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>
@@ -4238,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>
@@ -4274,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>
@@ -4446,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/strings.xml b/tests/CarDeveloperOptions/res/values-in/strings.xml
index c0bca0f..d5638a0 100644
--- a/tests/CarDeveloperOptions/res/values-in/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-in/strings.xml
@@ -746,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>
@@ -779,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>
@@ -788,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>
@@ -853,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>
@@ -1055,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>
@@ -1616,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>
@@ -1635,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>
@@ -2773,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>
@@ -2794,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>
@@ -3043,7 +3043,7 @@
     <string name="app_default_dashboard_title" msgid="6575301028225232193">"Aplikasi default"</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>
@@ -3762,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>
@@ -4274,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>
@@ -4456,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/strings.xml b/tests/CarDeveloperOptions/res/values-is/strings.xml
index 63d7d0f..5abef77 100644
--- a/tests/CarDeveloperOptions/res/values-is/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-is/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-it/strings.xml
index 84e1fce..89d101a 100644
--- a/tests/CarDeveloperOptions/res/values-it/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-it/strings.xml
@@ -4152,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>
@@ -4238,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>
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-iw/strings.xml b/tests/CarDeveloperOptions/res/values-iw/strings.xml
index 18ff59d..3b30e25 100644
--- a/tests/CarDeveloperOptions/res/values-iw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-iw/strings.xml
@@ -4428,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/strings.xml b/tests/CarDeveloperOptions/res/values-ja/strings.xml
index e7dc4b8..ff4be74 100644
--- a/tests/CarDeveloperOptions/res/values-ja/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ja/strings.xml
@@ -921,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>
@@ -1064,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>
@@ -2486,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-ka/strings.xml
index e260017..9536e8f 100644
--- a/tests/CarDeveloperOptions/res/values-ka/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ka/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-kk/strings.xml
index 701d84c..f301c5e 100644
--- a/tests/CarDeveloperOptions/res/values-kk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kk/strings.xml
@@ -3031,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>
@@ -3589,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>
@@ -4238,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-km/strings.xml
index 702c651..c54c6a9 100644
--- a/tests/CarDeveloperOptions/res/values-km/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-km/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-kn/strings.xml
index 79cd4d879..af78069 100644
--- a/tests/CarDeveloperOptions/res/values-kn/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-kn/strings.xml
@@ -2614,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>
@@ -3628,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-ko/strings.xml
index 89234f6..b8657ba 100644
--- a/tests/CarDeveloperOptions/res/values-ko/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ko/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-ky/strings.xml
index 3056588..4d00850 100644
--- a/tests/CarDeveloperOptions/res/values-ky/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ky/strings.xml
@@ -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>
@@ -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>
@@ -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>
@@ -488,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>
@@ -500,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>
@@ -508,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>
@@ -598,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>
@@ -635,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>
@@ -765,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>
@@ -827,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>
@@ -892,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>
@@ -940,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>
@@ -1064,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>
@@ -1134,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>
@@ -1304,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>
@@ -1393,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>
@@ -1453,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>
@@ -1576,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>
@@ -1594,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>
@@ -1686,7 +1686,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>
@@ -1766,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>
@@ -1875,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>
@@ -2303,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>
@@ -2317,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>
@@ -2495,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>
@@ -2556,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>
@@ -2594,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>
@@ -2812,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>
@@ -2886,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>
@@ -2894,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>
@@ -3109,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>
@@ -3186,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>
@@ -3195,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>
@@ -3292,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>
@@ -3322,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>
@@ -3356,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>
@@ -3367,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>
@@ -3405,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>
@@ -3538,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>
@@ -3559,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>
@@ -3706,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>
@@ -3784,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>
@@ -3863,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>
@@ -3973,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>
@@ -3990,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>
@@ -4202,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>
@@ -4273,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>
@@ -4335,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>
@@ -4371,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>
@@ -4410,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>
diff --git a/tests/CarDeveloperOptions/res/values-lo/strings.xml b/tests/CarDeveloperOptions/res/values-lo/strings.xml
index 355e3bf..380f9ea 100644
--- a/tests/CarDeveloperOptions/res/values-lo/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lo/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-lt/strings.xml
index 7ca812e..4d5754b 100644
--- a/tests/CarDeveloperOptions/res/values-lt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lt/strings.xml
@@ -4426,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/strings.xml b/tests/CarDeveloperOptions/res/values-lv/strings.xml
index 52d6224..9eef33e 100644
--- a/tests/CarDeveloperOptions/res/values-lv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-lv/strings.xml
@@ -4350,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-mk/arrays.xml b/tests/CarDeveloperOptions/res/values-mk/arrays.xml
index 626ab54..872a655 100644
--- a/tests/CarDeveloperOptions/res/values-mk/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/arrays.xml
@@ -72,7 +72,7 @@
     <!-- 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="8986775481492954015">"Минатите 30 дена"</item>
     <item msgid="3211287705232736964">"Пост. цикл. на корист...."</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
diff --git a/tests/CarDeveloperOptions/res/values-mk/strings.xml b/tests/CarDeveloperOptions/res/values-mk/strings.xml
index 1479f8e..b95427b 100644
--- a/tests/CarDeveloperOptions/res/values-mk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mk/strings.xml
@@ -1687,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>
@@ -3585,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>
@@ -3645,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>
@@ -4274,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>
@@ -4476,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/strings.xml b/tests/CarDeveloperOptions/res/values-ml/strings.xml
index 2d1e0aa..620e35c 100644
--- a/tests/CarDeveloperOptions/res/values-ml/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ml/strings.xml
@@ -2614,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-mn/strings.xml
index 3f69e39..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>
@@ -3623,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>
@@ -4272,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-mr/strings.xml b/tests/CarDeveloperOptions/res/values-mr/strings.xml
index f589352..674ed48 100644
--- a/tests/CarDeveloperOptions/res/values-mr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-mr/strings.xml
@@ -2615,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>
@@ -4275,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-ms/strings.xml b/tests/CarDeveloperOptions/res/values-ms/strings.xml
index 4142c1b..f21e428 100644
--- a/tests/CarDeveloperOptions/res/values-ms/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ms/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-my/strings.xml
index 11565c3..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>
@@ -742,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>
@@ -2437,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>
@@ -3587,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-nb/strings.xml
index c3c950c..2e57216 100644
--- a/tests/CarDeveloperOptions/res/values-nb/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nb/strings.xml
@@ -1656,7 +1656,7 @@
     <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 etter Wi‑Fi og Bluetooth"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6750542206763112172">"Wi‑Fi-søking"</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>
@@ -4274,6 +4274,8 @@
     <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 krasjdialogboksen"</string>
diff --git a/tests/CarDeveloperOptions/res/values-ne/strings.xml b/tests/CarDeveloperOptions/res/values-ne/strings.xml
index 8a75f40..e7fccc0 100644
--- a/tests/CarDeveloperOptions/res/values-ne/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ne/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-nl/strings.xml
index 49b7de7..8d5a612 100644
--- a/tests/CarDeveloperOptions/res/values-nl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-nl/strings.xml
@@ -3031,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>
@@ -4126,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>
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-or/strings.xml b/tests/CarDeveloperOptions/res/values-or/strings.xml
index 5504e7e..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>
@@ -871,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>
@@ -899,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>
@@ -969,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>
@@ -1348,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>
@@ -2234,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>
@@ -2261,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>
@@ -2527,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>
@@ -2538,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>
@@ -3094,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>
@@ -3754,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>
@@ -3777,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>
@@ -3793,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>
@@ -4261,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>
@@ -4273,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/strings.xml b/tests/CarDeveloperOptions/res/values-pa/strings.xml
index 94ad532..2dde26c 100644
--- a/tests/CarDeveloperOptions/res/values-pa/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pa/strings.xml
@@ -2614,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-pl/strings.xml
index 1527877..947a908 100644
--- a/tests/CarDeveloperOptions/res/values-pl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pl/strings.xml
@@ -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>
@@ -4426,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-rPT/strings.xml b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
index 73f9ec1..bab92d6 100644
--- a/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt-rPT/strings.xml
@@ -1657,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>
@@ -1787,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>
@@ -1839,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>
@@ -2018,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>
@@ -2523,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>
@@ -2921,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>
@@ -3035,7 +3035,7 @@
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="2610085597733526722">"Bluetooth, modo de condução"</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">"Aplicações e notificações"</string>
+    <string name="app_and_notification_dashboard_title" msgid="8448096608058843730">"Apps e notificações"</string>
     <string name="app_and_notification_dashboard_summary" msgid="4165181440955038145">"Assistente, aplicações recentes, aplicações predefinidas"</string>
     <string name="notification_settings_work_profile" msgid="7190550347842400029">"O acesso às notificações não está disponível para aplicações no perfil de trabalho."</string>
     <string name="account_dashboard_title" msgid="4734300939532555885">"Contas"</string>
@@ -3263,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-pt/strings.xml
index 1e549f5..0de3591 100644
--- a/tests/CarDeveloperOptions/res/values-pt/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-pt/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-ro/strings.xml
index c97982d..721a81a 100644
--- a/tests/CarDeveloperOptions/res/values-ro/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ro/strings.xml
@@ -4350,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/strings.xml b/tests/CarDeveloperOptions/res/values-ru/strings.xml
index dc680df..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>
@@ -759,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>
@@ -800,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>
@@ -1110,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>
@@ -1614,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>
@@ -1656,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>
@@ -2556,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>
@@ -3127,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>
@@ -3180,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>
@@ -4204,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>
@@ -4426,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/strings.xml b/tests/CarDeveloperOptions/res/values-si/strings.xml
index dee7151..21e056c 100644
--- a/tests/CarDeveloperOptions/res/values-si/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-si/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-sk/strings.xml
index bb8c05b..8b68658 100644
--- a/tests/CarDeveloperOptions/res/values-sk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sk/strings.xml
@@ -4426,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/strings.xml b/tests/CarDeveloperOptions/res/values-sl/strings.xml
index b01d39e..7151979 100644
--- a/tests/CarDeveloperOptions/res/values-sl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sl/strings.xml
@@ -1861,7 +1861,7 @@
     <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>
@@ -4426,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/strings.xml b/tests/CarDeveloperOptions/res/values-sq/strings.xml
index be57188..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>
@@ -806,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>
@@ -2824,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>
@@ -3423,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-sr/strings.xml
index f509781..699cf07 100644
--- a/tests/CarDeveloperOptions/res/values-sr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sr/strings.xml
@@ -4350,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/strings.xml b/tests/CarDeveloperOptions/res/values-sv/strings.xml
index 3aaa900..df5d7ac 100644
--- a/tests/CarDeveloperOptions/res/values-sv/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sv/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-sw/strings.xml
index 1d87fd8..4eceb54 100644
--- a/tests/CarDeveloperOptions/res/values-sw/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-sw/strings.xml
@@ -574,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>
@@ -2871,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>
@@ -4275,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>
@@ -4500,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/strings.xml b/tests/CarDeveloperOptions/res/values-ta/strings.xml
index 3a13d80..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>
@@ -212,7 +212,7 @@
     <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>
@@ -1236,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>
@@ -2040,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>
@@ -2147,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>
@@ -2614,9 +2614,9 @@
     <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="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>
@@ -2892,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>
@@ -3060,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>
@@ -3198,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>
@@ -3209,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>
@@ -3232,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>
@@ -3261,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>
@@ -3285,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>
@@ -3336,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>
@@ -3441,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>
@@ -3503,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>
@@ -3539,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>
@@ -3557,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>
@@ -4025,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>
@@ -4274,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>
@@ -4461,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/strings.xml b/tests/CarDeveloperOptions/res/values-te/strings.xml
index 221d672..51bb24d 100644
--- a/tests/CarDeveloperOptions/res/values-te/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-te/strings.xml
@@ -2614,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>
@@ -4276,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/arrays.xml b/tests/CarDeveloperOptions/res/values-th/arrays.xml
index 4668660..b0bf1de 100644
--- a/tests/CarDeveloperOptions/res/values-th/arrays.xml
+++ b/tests/CarDeveloperOptions/res/values-th/arrays.xml
@@ -401,7 +401,7 @@
     <item msgid="1008268820118852416">"ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
-    <item msgid="6545683814310036454">"ใช้ที่อยู่ MAC แบบสุ่ม (ค่าเริ่มต้น)"</item>
+    <item msgid="6545683814310036454">"ใช้ MAC แบบสุ่ม (ค่าเริ่มต้น)"</item>
     <item msgid="214234417308375326">"ใช้ที่อยู่ MAC ของอุปกรณ์"</item>
   </string-array>
   <string-array name="wifi_hidden_entries">
diff --git a/tests/CarDeveloperOptions/res/values-th/strings.xml b/tests/CarDeveloperOptions/res/values-th/strings.xml
index 9c24780..eb3a613 100644
--- a/tests/CarDeveloperOptions/res/values-th/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-th/strings.xml
@@ -2897,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>
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-tl/strings.xml
index 4f56454..0a405bc 100644
--- a/tests/CarDeveloperOptions/res/values-tl/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tl/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-tr/strings.xml
index 8def1fe..7e4ef2c 100644
--- a/tests/CarDeveloperOptions/res/values-tr/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-tr/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-uk/strings.xml
index ca54eb1..b166589 100644
--- a/tests/CarDeveloperOptions/res/values-uk/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uk/strings.xml
@@ -4426,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-ur/strings.xml b/tests/CarDeveloperOptions/res/values-ur/strings.xml
index 359f415..fb8ff24 100644
--- a/tests/CarDeveloperOptions/res/values-ur/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-ur/strings.xml
@@ -4272,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/strings.xml b/tests/CarDeveloperOptions/res/values-uz/strings.xml
index 4d1f7d0..6b347a5 100644
--- a/tests/CarDeveloperOptions/res/values-uz/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-uz/strings.xml
@@ -3315,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>
@@ -4294,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/strings.xml b/tests/CarDeveloperOptions/res/values-vi/strings.xml
index 8412870..7024a6f 100644
--- a/tests/CarDeveloperOptions/res/values-vi/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-vi/strings.xml
@@ -2517,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>
@@ -4274,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>
diff --git a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
index b81c6d5..a2c5369 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rCN/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
index 297c527..96b8fef 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rHK/strings.xml
@@ -1068,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>
@@ -1658,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>
@@ -3385,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>
@@ -3641,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>
@@ -3674,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>
@@ -4275,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/strings.xml b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
index c20e2ff..b61af3b 100644
--- a/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zh-rTW/strings.xml
@@ -4274,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/strings.xml b/tests/CarDeveloperOptions/res/values-zu/strings.xml
index 5b59dad..6aec398 100644
--- a/tests/CarDeveloperOptions/res/values-zu/strings.xml
+++ b/tests/CarDeveloperOptions/res/values-zu/strings.xml
@@ -4275,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 a946526..26ffe3d 100644
--- a/tests/CarDeveloperOptions/res/xml/development_settings.xml
+++ b/tests/CarDeveloperOptions/res/xml/development_settings.xml
@@ -159,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/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/DevelopmentSettingsDashboardFragment.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java
index 3253d21..33bd3ca 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/development/DevelopmentSettingsDashboardFragment.java
@@ -479,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/password/PasswordUtils.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java
index 7a4d024..fb7c6ae 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/password/PasswordUtils.java
@@ -89,7 +89,8 @@
                     /* initialPid= */ -1,
                     getCallingAppPackageName(activityToken),
                     userId,
-                    message);
+                    message,
+                    /* force */ false);
         } catch (RemoteException e) {
             Log.v(TAG, "Could not talk to activity manager.", e);
         }
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/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/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index b4a4d1b..e667964 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -52,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;
@@ -162,7 +163,6 @@
             new FragmentMenuEntry("alert window", AlertDialogTestFragment.class),
             new FragmentMenuEntry("assistant", CarAssistantFragment.class),
             new FragmentMenuEntry("audio", AudioTestFragment.class),
-
             new FragmentMenuEntry("bluetooth headset", BluetoothHeadsetFragment.class),
             new FragmentMenuEntry("bluetooth messaging test", MapMceTestFragment.class),
             new FragmentMenuEntry("carapi", CarApiTestFragment.class),
@@ -170,6 +170,7 @@
             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),
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 df9aa7b..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
@@ -116,7 +116,7 @@
             return;
         }
         Log.d(TAG, "Connected to Car Service");
-        mCarAudioManager = (CarAudioManager) mCar.getCarManager(Car.AUDIO_SERVICE);
+        mCarAudioManager = (CarAudioManager) car.getCarManager(Car.AUDIO_SERVICE);
         initVolumeInfo();
     };
 
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/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/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 0aa89f9..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;
@@ -40,7 +48,6 @@
 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;
@@ -59,12 +66,12 @@
 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;
@@ -72,6 +79,9 @@
 @RunWith(AndroidJUnit4.class)
 @MediumTest
 public class CarUxRestrictionsManagerServiceTest {
+
+    private static final String UX_RESTRICTION_MODE_PASSENGER = "passenger";
+
     private CarUxRestrictionsManagerService mService;
 
     @Mock
@@ -115,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());
     }
@@ -162,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.
@@ -466,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_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index ec984f8..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
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 056fe9c..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,18 +222,18 @@
         // 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 {
-        final int wakeupTime = 100;
-        initTest(wakeupTime);
+        initTest();
 
         // Start in the ON state
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
         // Request suspend
         mPowerHal.setCurrentPowerState(
                 new PowerState(
@@ -156,16 +241,16 @@
                         VehicleApPowerStateShutdownParam.CAN_SLEEP));
         // Verify suspend
         assertStateReceivedForShutdownOrSleepWithPostpone(
-                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, wakeupTime);
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
     }
 
+    @Test
     public void testShutdownOnSuspend() throws Exception {
-        final int wakeupTime = 100;
-        initTest(wakeupTime);
+        initTest();
 
         // Start in the ON state
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
         // Tell it to shutdown
         mService.requestShutdownOnNextSuspend();
         // Request suspend
@@ -175,7 +260,7 @@
                         VehicleApPowerStateShutdownParam.CAN_SLEEP));
         // Verify shutdown
         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));
@@ -192,16 +277,16 @@
                         VehicleApPowerStateShutdownParam.CAN_SLEEP));
         // Verify suspend
         assertStateReceivedForShutdownOrSleepWithPostpone(
-                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, wakeupTime);
+                PowerHalService.SET_DEEP_SLEEP_ENTRY, WAIT_TIMEOUT_LONG_MS, mWakeupTime);
     }
 
+    @Test
     public void testShutdownCancel() throws Exception {
-        final int wakeupTime = 100;
-        initTest(wakeupTime);
+        initTest();
 
         // Start in the ON state
         mPowerHal.setCurrentPowerState(new PowerState(VehicleApPowerStateReq.ON, 0));
-        assertTrue(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS));
+        assertThat(mDisplayInterface.waitForDisplayStateChange(WAIT_TIMEOUT_MS)).isTrue();
         // Start shutting down
         mPowerHal.setCurrentPowerState(
                 new PowerState(
@@ -219,28 +304,30 @@
                         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);
     }
 
+    @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));
@@ -249,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.clearIsBootingOrResuming();
+        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() {
@@ -318,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(
@@ -333,7 +671,7 @@
                 continue;
             }
             if (state[0] == lastState) {
-                assertEquals(expectedParamForShutdownOrSuspend, state[1]);
+                assertThat(state[1]).isEqualTo(expectedParamForShutdownOrSuspend);
                 return;
             }
         }
@@ -346,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);
@@ -502,4 +904,10 @@
             }
         }
     }
+
+    @Retention(RUNTIME)
+    @Target({METHOD})
+    public static @interface WakeupTime {
+        int value();
+    }
 }
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/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 72332d9..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,7 +231,7 @@
      */
     @SystemApi
     public int getInitialUser() {
-        List<Integer> allUsers = userInfoListToUserIdList(getAllPersistentUsers());
+        List<Integer> allUsers = userInfoListToUserIdList(getAllUsers());
 
         int bootUserOverride = mTestableFrameworkWrapper.getBootUserOverrideId(BOOT_USER_NOT_FOUND);